[Cvs-annodex] commit (annodex): +AnnodexFirefoxExtension/trunk/Docs/Patches/VLC-0.86.patch

cchiu nobody at lists.annodex.net
Mon Jun 26 07:03:51 UTC 2006


Update of /var/local/lib/svn/annodex (new revision 2342)

Added files:
   AnnodexFirefoxExtension/trunk/Docs/Patches/VLC-0.86.patch

Log Message:
VLC-0.86 patchfile


Added: AnnodexFirefoxExtension/trunk/Docs/Patches/VLC-0.86.patch
===================================================================
--- AnnodexFirefoxExtension/trunk/Docs/Patches/VLC-0.86.patch	2006-06-21 06:32:36 UTC (rev 2341)
+++ AnnodexFirefoxExtension/trunk/Docs/Patches/VLC-0.86.patch	2006-06-26 07:03:51 UTC (rev 2342)
@@ -0,0 +1,1087 @@
+Index: Build
+===================================================================
+--- Build	(revision 0)
++++ Build	(revision 0)
+@@ -0,0 +1,16 @@
++#!/bin/sh
++
++set -e
++
++
++! [ -x ./configure ] && (./bootstrap)
++
++SYSTEM=`uname | tr A-Z a-z | sed -e s'/_.*$//'`
++
++./Configure.$SYSTEM
++
++# build it!
++make
++
++# ( cd mozilla && make )
++
+Index: Configure.cygwin
+===================================================================
+--- Configure.cygwin	(revision 0)
++++ Configure.cygwin	(revision 0)
+@@ -0,0 +1,80 @@
++#!/bin/sh -x
++
++set -e
++
++CC="ccache gcc -mno-cygwin"
++CXX="ccache g++ -mno-cygwin"
++CFLAGS="-g"
++CXXFLAGS="-g"
++CPPFLAGS="-I/usr/win32/include -I/usr/win32/include/ebml -I/usr/win32/gecko-sdk/include"
++LDFLAGS="-L/usr/win32/lib -L/usr/win32/gecko-sdk/lib"
++
++XPIDL=/usr/win32/gecko-sdk/bin/xpidl.exe
++XPIDL_INCL="-Ic:\Cygwin/usr/win32/gecko-sdk/idl"
++
++export CC CXX CPPFLAGS LDFLAGS CFLAGS CXXFLAGS
++
++[ -x ./configure ] || (./bootstrap )
++
++exec ./configure \
++ --disable-a52 \
++ --disable-caca \
++ --disable-cdda \
++ --disable-cddax \
++ --disable-debug \
++ --disable-dshow \
++ --disable-dts \
++ --disable-dvb \
++ --disable-dvbpsi \
++ --disable-dvdnav \
++ --disable-dvdread \
++ --disable-faad \
++ --disable-ffmpeg \
++ --disable-flac \
++ --disable-freetype \
++ --disable-fribidi \
++ --disable-glx \
++ --disable-gtk \
++ --disable-hd1000v \
++ --disable-httpd \
++ --disable-libcddb \
++ --disable-libcdio \
++ --disable-libmpeg2 \
++ --disable-libxml2 \
++ --disable-livedotcom \
++ --disable-mad \
++ --disable-mkv \
++ --disable-mod \
++ --disable-nls \
++ --disable-opengl \
++ --disable-qte \
++ --disable-satellite \
++ --disable-sdl \
++ --disable-skins2 \
++ --disable-sout \
++ --disable-speex \
++ --disable-svg \
++ --disable-tarkin \
++ --disable-toolame \
++ --disable-tremor \
++ --disable-v4l \
++ --disable-vcd \
++ --disable-vcdx \
++ --disable-vlm \
++ --disable-waveout \
++ --disable-wingdi \
++ --disable-wxwindows \
++ --disable-x11 \
++ --disable-x264 \
++ --disable-xvideo \
++ --enable-cmml \
++ --enable-directx \
++ --enable-mostly-builtin \
++ --enable-mozilla --with-mozilla-sdk-path=/usr/win32/gecko-sdk \
++ --enable-ogg \
++ --enable-release \
++ --enable-optimization \
++ --enable-theora \
++ --enable-vorbis \
++ "$@" \
++ 2>&1 | tee configure.output
+Index: Configure.darwin
+===================================================================
+--- Configure.darwin	(revision 0)
++++ Configure.darwin	(revision 0)
+@@ -0,0 +1,17 @@
++#!/bin/sh -x
++
++set -e
++
++CPPFLAGS="-I/{Path of VLC Source}/extras/contrib/include -I/{Path of VLC Source}/extras/contrib/src/gecko-sdk/include"
++LDFLAGS="-L/{Path of VLC Source}/extras/contrib/lib -L/{Path of VLC Source}/extras/contrib/src/gecko-sdk/lib"
++PATH="/bin:/usr/bin:/{Path of VLC Source}/extras/contrib/bin:/{Path of VLC Source}/extras/contrib/src/gecko-sdk/bin"
++PKG_CONFIG_PATH="/{Path of VLC Source}/extras/contrib/lib/pkgconfig"
++export CPPFLAGS LDFLAGS PATH PKG_CONFIG_PATH
++
++XPIDL=/{Path of VLC Source}/extras/contrib/src/gecko-sdk/bin/xpidl
++XPIDL_INCL="-I/{Path of VLC Source}/extras/contrib/src/gecko-sdk/idl"
++export XPIDL XPIDL_INCL
++
++[ -x ./configure ] || ( ./bootstrap )
++
++exec ./configure --disable-a52 --disable-caca --disable-cdda --disable-cddax --disable-cmml --disable-daap --disable-dshow --disable-dts --disable-dvb --disable-dvbpsi --disable-dvdnav --disable-dvdread --disable-faad --disable-ffmpeg --disable-freetype --disable-fribidi --disable-glx --disable-gtk --disable-hd1000v --enable-httpd --disable-libcddb --disable-libcdio --disable-libmpeg2 --disable-debug --disable-libxml2 --disable-livedotcom --disable-mad --disable-mkv --disable-mod --disable-nls --disable-opengl --disable-qte --disable-satellite --disable-sdl --disable-sdl --disable-skins2 --disable-sout --disable-svg --disable-tarkin --disable-toolame --disable-tremor --disable-v4l --disable-vcd --disable-vcdx --disable-vlm --disable-waveout --disable-wingdi --disable-wxwindows --disable-x11 --disable-x264 --disable-xvideo --enable-optimization --enable-flac --enable-mozilla --with-mozilla-sdk-path=/{Path of VLC Source}/extras/contrib/src/gecko-sdk --enable-ogg --enable-speex --enable-theora --enable-vorbis --without-ffmpeg-faac --without-ffmpeg-mp3lame --without-libiconv-prefix
+Index: Configure.linux
+===================================================================
+--- Configure.linux	(revision 0)
++++ Configure.linux	(revision 0)
+@@ -0,0 +1,96 @@
++#!/bin/sh -x
++
++set -e
++
++CFLAGS="-g"
++
++arch=`uname -m`
++case "$arch" in
++  i?86)
++    # be compatible with as many x86 chips as pOSSIBLE
++    CFLAGS="$CFLAGS"
++    ;;
++  ppc)
++    # PowerPC doesn't support mixing PIC and non-PIC code, so make sure
++    # everything's compiled as PIC
++    CFLAGS="$CFLAGS -fPIC"
++esac
++
++DFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lXt"
++
++CPPFLAGS="-I/usr/include -I/usr/include/ebml -I/{Path of VLC Source}/gecko-sdk/include"
++LDFLAGS="-L/usr/lib -L/usr/X11R6/lib -lXt -L/{Path of VLC Source}/gecko-sdk/lib"
++
++XPIDL=/{Path of VLC Source}/gecko-sdk/bin/xpidl
++XPIDL_INCL="-I/{Path of VLC Source}/gecko-sdk/idl"
++
++export CFLAGS CPPFLAGS LDFLAGS XPIDL XPIDL_INCL
++
++[ -x ./configure ] || ( cd ./bootstrap )
++
++exec ./configure \
++ --disable-a52 \
++ --disable-alsa \
++ --disable-caca \
++ --disable-cdda \
++ --disable-cddax \
++ --disable-daap \
++ --disable-debug \
++ --disable-dshow \
++ --disable-dts \
++ --disable-dvb \
++ --disable-dvbpsi \
++ --disable-dvd \
++ --disable-dvdnav \
++ --disable-dvdread \
++ --disable-faad \
++ --disable-ffmpeg \
++ --disable-freetype \
++ --disable-fribidi \
++ --disable-glx \
++ --disable-gtk \
++ --disable-hd1000v \
++ --disable-libcddb \
++ --disable-libcdio \
++ --disable-libmpeg2 \
++ --disable-libxml2 \
++ --disable-livedotcom \
++ --disable-mad \
++ --disable-mkv \
++ --disable-mod \
++ --disable-nls \
++ --disable-opengl \
++ --disable-qte \
++ --disable-satellite \
++ --disable-sdl \
++ --disable-skins2 \
++ --disable-sout \
++ --disable-speex \
++ --disable-svg \
++ --disable-tarkin \
++ --disable-toolame \
++ --disable-tremor \
++ --disable-v4l \
++ --disable-vcd \
++ --disable-vcdx \
++ --disable-vlm \
++ --disable-waveout \
++ --disable-wingdi \
++ --disable-wxwindows \
++ --disable-x264 \
++ --enable-cmml \
++ --enable-flac \
++ --enable-httpd \
++ --enable-mozilla --with-mozilla-sdk-path=/{Path of VLC Source}/gecko-sdk \
++ --enable-ogg \
++ --enable-optimization \
++ --enable-plugins \ 
++ --enable-theora \
++ --enable-vorbis \
++ --enable-x11 \
++ --enable-xvideo \
++ --without-ffmpeg-faac \
++ --without-ffmpeg-mp3lame \
++ --without-libiconv-prefix \
++ "$@" \
++ 2>&1 | tee configure.output
+Index: extras/contrib/config.mak
+===================================================================
+--- extras/contrib/config.mak	(revision 0)
++++ extras/contrib/config.mak	(revision 0)
+@@ -0,0 +1,23 @@
++# Automatically generated by bootstrap.
++# Make changes if you know what you're doing.
++
++BUILD = powerpc-apple-darwin8
++HOST = powerpc-apple-darwin8
++PREFIX = /{Path of VLC Source}/extras/contrib
++SDK_TARGET = 10.4
++HAVE_DARWIN_OS = 1
++ENVP = MACOSX_DEPLOYMENT_TARGET=10.4
++MACOSX_SDK = /Developer/SDKs/MacOSX10.4u.sdk
++PATH = /bin:/usr/bin:/usr/local/bin
++CONTRIB_URL = http://download.videolan.org/pub/videolan/devtools/contrib-macosx.tar.bz2
++CC = 
++CXX = 
++LD = 
++RANLIB = 
++AR = 
++EXTRA_CFLAGS = -D${ENVP} #-isysroot ${MACOSX_SDK}
++EXTRA_CPPFLAGS = -I/include
++EXTRA_LDFLAGS = -Wl,-syslibroot,${MACOSX_SDK}
++EXTRA_PATH = 
++WGET = curl -O
++SVN = /usr/local/bin/svn
+Index: /annodex/src/misc/charset.c
+===================================================================
+--- /annodex/src/misc/charset.c (revision 15939)
++++ /annodex/src/misc/charset.c (working copy)
+@@ -254,8 +254,10 @@
+      * use setlocale here; it would return "C" when it doesn't support the
+      * locale name the user has set. Darwin's setlocale is broken. */
+ #  if HAVE_SETLOCALE && !__APPLE__
++#  if defined LC_ALL
+     psz_locale = setlocale( LC_ALL, NULL );
+ #  endif
++#  endif
+     if( psz_locale == NULL || psz_locale[0] == '\0' )
+     {
+         psz_locale = getenv( "LC_ALL" );
+@@ -570,8 +572,10 @@
+     /* Some systems (like Darwin, SunOS 4 or DJGPP) have only the C locale.
+      * Therefore we don't use setlocale here; it would return "C". */
+ #  if defined (HAVE_SETLOCALE) && !defined ( __APPLE__)
++#  if defined LC_ALL
+     psz_lang = setlocale( LC_ALL, NULL );
+ #  endif
++#  endif
+     if( psz_lang == NULL || psz_lang[0] == '\0' )
+     {
+         psz_lang = getenv( "LC_ALL" );
+Index: /annodex/configure.ac
+===================================================================
+--- /annodex/configure.ac       (revision 15939)
++++ /annodex/configure.ac       (working copy)
+@@ -1,10 +1,10 @@
+ dnl Autoconf settings for vlc
+ 
+-AC_INIT(vlc,0.8.6-svn)
++AC_INIT(vlc,0.8.6-annodex)
+ VERSION_MAJOR="0"
+ VERSION_MINOR="8"
+ VERSION_REVISION="6"
+-VERSION_EXTRA="svn"
++VERSION_EXTRA="annodex"
+ 
+ CONFIGURE_LINE="$0 $*"
+ CODENAME="Janus"
+@@ -2295,7 +2295,7 @@
+   else
+     AC_CHECK_HEADERS(ogg/ogg.h, [
+       AC_CHECK_LIB( ogg, oggpack_read, [
+-        VLC_ADD_PLUGINS([ogg])
++        VLC_ADD_BUILTINS([ogg])
+         if test "${enable_sout}" != "no"; then
+           VLC_ADD_PLUGINS([mux_ogg])
+         fi
+@@ -2781,7 +2781,6 @@
+     fi
+     dnl  Use a custom libffmpeg
+     AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodecaltivec.a)
+-    VLC_ADD_BUILTINS([ffmpegaltivec])
+     VLC_ADD_LDFLAGS([ffmpegaltivec],[-L${real_ffmpeg_tree}/libavcodec -lavcodecaltivec])
+     VLC_ADD_CPPFLAGS([ffmpeg],[-DNO_ALTIVEC_IN_FFMPEG])
+     VLC_ADD_CPPFLAGS([ffmpegaltivec],[-I${real_ffmpeg_tree}/libavcodec -I${real_ffmpeg_tree}/libavformat])
+@@ -2833,10 +2832,8 @@
+     AC_CHECK_HEADERS(faad.h, ,
+       [ AC_MSG_ERROR([Cannot find development headers for libfaad...]) ])
+     AC_CHECK_LIB(faad, faacDecOpen, [
+-      VLC_ADD_PLUGINS([faad])
+       VLC_ADD_LDFLAGS([faad],[-lfaad]) ],
+       AC_CHECK_LIB(faad, NeAACDecOpen, [
+-        VLC_ADD_PLUGINS([faad])
+         VLC_ADD_LDFLAGS([faad],[-lfaad]) ],
+         [ AC_MSG_ERROR([Cannot find libfaad library...]) ]))
+     LDFLAGS="${LDFLAGS_save}"
+@@ -2898,7 +2895,7 @@
+   (test "${SYS}" = "darwin" || test "${enable_quicktime}" = "yes")
+ then
+   if test "${SYS}" = "mingw32"; then
+-    VLC_ADD_BUILTINS([quicktime])
++    : # do nothing
+   else
+   AC_CHECK_HEADERS(QuickTime/QuickTime.h,
+     [ VLC_ADD_BUILTINS([quicktime])
+@@ -2974,7 +2971,6 @@
+       VLC_ADD_LDFLAGS([a52tofloat32],[-L${real_a52_tree}/liba52/.libs])
+       LDFLAGS="${LDFLAGS_save} ${LDFLAGS_a52tofloat32}"
+       AC_CHECK_LIB(a52, a52_free, [
+-        VLC_ADD_BUILTINS([a52tofloat32])
+         VLC_ADD_CPPFLAGS([a52tofloat32],[-DUSE_A52DEC_TREE])
+         VLC_ADD_LDFLAGS([a52tofloat32],[-la52])
+         ],[
+@@ -3050,7 +3046,6 @@
+         VLC_ADD_LDFLAGS([dtstofloat32],[-ldts_pic])
+         ],[
+         AC_CHECK_LIB(dts, dts_free, [
+-          VLC_ADD_BUILTINS([dtstofloat32])
+           VLC_ADD_LDFLAGS([dtstofloat32],[-ldts])
+           ],[
+           if test -f ${real_dts_tree}/libdts/libdts.a
+@@ -3074,7 +3069,6 @@
+         VLC_ADD_LDFLAGS([dtstofloat32],[-ldts_pic])
+       ],[
+         AC_CHECK_LIB(dts, dts_free, [
+-          VLC_ADD_BUILTINS([dtstofloat32])
+           VLC_ADD_LDFLAGS([dtstofloat32],[-ldts])
+         ],[
+           if test "${enable_dts}" = "yes"; then
+@@ -3148,7 +3142,6 @@
+     then
+       dnl  Use a custom libmpeg2
+       AC_MSG_RESULT(${real_libmpeg2_tree}/libmpeg2/.libs/libmpeg2.a)
+-      VLC_ADD_BUILTINS([libmpeg2])
+       VLC_ADD_LDFLAGS([libmpeg2],[-L${real_libmpeg2_tree}/libmpeg2/.libs -lmpeg2])
+       VLC_ADD_CFLAGS([libmpeg2],[-I${real_libmpeg2_tree}/include])
+       eval "`cd ${real_libmpeg2_tree}/include && ln -sf . mpeg2dec 2>/dev/null`"
+@@ -3168,8 +3161,7 @@
+          #endif
+          #endif],
+         [AC_MSG_RESULT([yes])
+-          VLC_ADD_PLUGINS([libmpeg2])
+-          VLC_ADD_LDFLAGS([libmpeg2],[-lmpeg2])],
++        VLC_ADD_LDFLAGS([libmpeg2],[-lmpeg2])],
+         [AC_MSG_RESULT([no])
+           AC_MSG_ERROR([Your libmpeg2 is too old (you need the cvs version): you may get a more recent one from http://libmpeg2.sf.net/. Alternatively you can use --disable-libmpeg2 to disable the libmpeg2 plugin.])])],
+ 
+@@ -3211,7 +3203,7 @@
+     fi
+   else
+     AC_CHECK_HEADERS(vorbis/codec.h, [
+-      VLC_ADD_PLUGINS([vorbis])
++      VLC_ADD_BUILTINS([vorbis])
+       VLC_ADD_LDFLAGS([vorbis],[-lvorbis -logg]) ],[])
+ 
+     AC_CHECK_HEADERS(vorbis/vorbisenc.h, [
+@@ -3267,7 +3259,7 @@
+     AC_CHECK_HEADERS(speex/speex.h, [
+       LDFLAGS="${LDFLAGS_save} ${LDFLAGS_speex}"
+       AC_CHECK_LIB(speex, speex_decode_int, [
+-        VLC_ADD_PLUGINS([speex])
++        VLC_ADD_BUILTINS([speex])
+         VLC_ADD_LDFLAGS([speex],[-lspeex]) ],
+         [ AC_MSG_RESULT([no])
+           AC_MSG_WARN([Your libspeex is too old, please get the development
+@@ -3292,7 +3284,6 @@
+     real_tarkin_tree="`cd ${with_tarkin_tree} 2>/dev/null && pwd`"
+     if test -f "${real_tarkin_tree}/tarkin.o"
+     then
+-      VLC_ADD_BUILTINS([tarkin])
+       VLC_ADD_CPPFLAGS([tarkin],[-I${real_tarkin_tree}])
+       VLC_ADD_LDFLAGS([tarkin],[${real_tarkin_tree}/mem.o ${real_tarkin_tree}/pnm.o ${real_tarkin_tree}/wavelet.o ${real_tarkin_tree}/wavelet_xform.o ${real_tarkin_tree}/wavelet_coeff.o ${real_tarkin_tree}/yuv.o ${real_tarkin_tree}/tarkin.o ${real_tarkin_tree}/info.o -logg])
+       AC_MSG_RESULT(yes)
+@@ -3314,8 +3305,8 @@
+ then
+   AC_CHECK_HEADERS(theora/theora.h, [
+     AC_CHECK_LIB(theora, theora_granule_time, [
+-      if test "${SYS}" = "mingw32"; then
+-        VLC_ADD_PLUGINS([theora])
++      if test "${SYS}" = "mingw32" -o test "${SYS}" = "linux"; then
++       VLC_ADD_BUILTINS([theora])
+       else
+         VLC_ADD_BUILTINS([theora])
+       fi
+@@ -3336,7 +3327,7 @@
+   PKG_CHECK_MODULES(DIRAC,dirac, [
+       VLC_ADD_PLUGINS([dirac])
+       VLC_ADD_CFLAGS([dirac],[$DIRAC_CFLAGS])
+-      VLC_ADD_LDFLAGS([dirac],[$DIRAC_LIBS -lstdc++]) ],[
++      VLC_ADD_LDFLAGS([dirac],[-ldirac_decoder -ldirac_encoder -ldirac_motionest -ldirac_common]) ],[
+       AC_MSG_ERROR([libdirac doesn't appear to be installed on you system.])
+   ])
+ fi
+@@ -3351,7 +3342,6 @@
+   LDFLAGS="${LDFLAGS_save} -lz"
+   AC_CHECK_LIB(png, png_set_rows, [
+     VLC_ADD_LDFLAGS([png],[-lpng -lz])
+-    VLC_ADD_PLUGINS([png])
+     VLC_ADD_PLUGINS([osdmenu])
+     AC_DEFINE(HAVE_LIBPNG, [], [Define if you have the PNG library: libpng])],
+     [],[-lz])
+@@ -3385,7 +3375,6 @@
+       VLC_ADD_LDFLAGS([x264],[-L${real_x264_tree}])
+       LDFLAGS="${LDFLAGS_save} ${LDFLAGS_x264} ${THREAD_LIB}"
+       AC_CHECK_LIB(x264, x264_encoder_open, [
+-        VLC_ADD_BUILTINS([x264])
+         VLC_ADD_LDFLAGS([x264],[-lx264])
+       ],[
+         AC_MSG_ERROR([the specified tree hasn't been compiled])
+@@ -3418,7 +3407,7 @@
+   [  --enable-cmml           CMML support (default enabled)])
+ if test "${enable_cmml}" != "no"
+ then
+-  VLC_ADD_PLUGINS([cmml])
++  VLC_ADD_BUILTINS([cmml])
+ fi
+ 
+ 
+@@ -3489,7 +3478,6 @@
+           VLC_ADD_CPPFLAGS([xvideo],[${X_CFLAGS}])
+           VLC_ADD_LDFLAGS([xvideo],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lXv_pic])
+         ],[
+-          VLC_ADD_BUILTINS([xvideo])
+           VLC_ADD_LDFLAGS([xvideo],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lXv])
+           VLC_ADD_CPPFLAGS([xvideo],[${X_CFLAGS}])
+         ])
+@@ -3716,7 +3704,6 @@
+ 
+   if test "${FREETYPE_CONFIG}" != "no"
+   then
+-    VLC_ADD_PLUGINS([freetype])
+     VLC_ADD_CFLAGS([freetype],[`${FREETYPE_CONFIG} --cflags`])
+     VLC_ADD_LDFLAGS([freetype],[`${FREETYPE_CONFIG} --libs`])
+     AC_CHECK_HEADERS(Carbon/Carbon.h,
+@@ -3906,18 +3893,17 @@
+     if test -z "${with_directx}"
+     then
+       AC_CHECK_HEADERS(ddraw.h,
+-      [ VLC_ADD_PLUGINS([vout_directx aout_directx])
++      [ VLC_ADD_BUILTINS([vout_directx aout_directx])
+         VLC_ADD_LDFLAGS([vout_directx],[-lgdi32])
+         dnl to be moved when dependance is removed
+         AC_CHECK_HEADERS(GL/gl.h, [
+-            VLC_ADD_PLUGINS([glwin32])
+             VLC_ADD_LDFLAGS([glwin32],[-lopengl32 -lgdi32])
+         ]) ])
+     else
+       AC_MSG_CHECKING(for directX headers in ${with_directx})
+       if test -f ${with_directx}/ddraw.h
+       then
+-        VLC_ADD_PLUGINS([vout_directx aout_directx])
++        VLC_ADD_BUILTINS([vout_directx aout_directx])
+         VLC_ADD_CPPFLAGS([vout_directx aout_directx],[-I${with_directx}])
+         VLC_ADD_LDFLAGS([vout_directx],[-lgdi32])
+         AC_MSG_RESULT(yes)
+@@ -4087,7 +4073,7 @@
+   [  --enable-wingdi         Win32 GDI module (default enabled on Win32)])
+ if test "${enable_wingdi}" != "no"; then
+   if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"; then
+-    VLC_ADD_PLUGINS([wingdi])
++    VLC_ADD_BUILTINS([wingdi])
+     VLC_ADD_LDFLAGS([wingdi],[-lgdi32])
+   fi
+   if test "${SYS}" = "mingwce"; then
+@@ -4832,7 +4818,7 @@
+   [  --enable-visual         visualisation plugin (default enabled)])
+ if test "${enable_visual}" != "no"
+ then
+-    VLC_ADD_PLUGINS([visual])
++    :
+ fi
+ 
+ dnl
+@@ -4875,7 +4861,6 @@
+     fi
+     if test -f "${real_goom_tree}/src/.libs/libgoom2.a"; then
+       AC_MSG_RESULT(${real_goom_tree}/src/.libs/libgoom2.a)
+-      VLC_ADD_BUILTINS([goom])
+       VLC_ADD_LDFLAGS([goom],[-L${real_goom_tree}/src/.libs -lgoom2])
+       VLC_ADD_CPPFLAGS([goom],[-I${real_goom_tree}/src -DUSE_GOOM_TREE])
+     else
+@@ -4884,7 +4869,6 @@
+       AC_MSG_CHECKING(for libgoom.a in ${with_goom_tree})
+       if test -f "${real_goom_tree}/libgoom.a"; then
+         AC_MSG_RESULT(${real_goom_tree}/libgoom.a)
+-        VLC_ADD_BUILTINS([goom])
+         VLC_ADD_LDFLAGS([goom],[-L${real_goom_tree} -lgoom])
+         VLC_ADD_CPPFLAGS([goom],[-I${real_goom_tree} -DUSE_GOOM_TREE -DOLD_GOOM])
+       else
+Index: /annodex/modules/demux/ogg.c
+===================================================================
+--- /annodex/modules/demux/ogg.c        (revision 15939)
++++ /annodex/modules/demux/ogg.c        (working copy)
+@@ -291,6 +291,7 @@
+                 }
+                 else if ( p_stream->fmt.i_codec == VLC_FOURCC('c','m','m','l') )
+                 {
++                    Ogg_ReadAnnodexHeader( VLC_OBJECT(p_demux), p_stream, &oggpacket );
+                     p_stream->secondary_header_packets = 0;
+                 }
+             }
+@@ -485,15 +486,15 @@
+     }
+ 
+     if( p_oggpacket->bytes >= 7 &&
+-        ! memcmp ( &p_oggpacket->packet[0], "Annodex", 7 ) )
++        ! memcmp ( &p_oggpacket->packet[0], "fishead", 7 ) )
+     {
+-        /* it's an Annodex packet -- skip it (do nothing) */
++        /* it's an Annodex Header packet -- skip it (do nothing) */
+         return; 
+     }
+     else if( p_oggpacket->bytes >= 7 &&
+-        ! memcmp ( &p_oggpacket->packet[0], "AnxData", 7 ) )
++        ! memcmp ( &p_oggpacket->packet[0], "fisbone", 7 ) )
+     {
+-        /* it's an AnxData packet -- skip it (do nothing) */
++        /* it's an Annodex Data packet -- skip it (do nothing) */
+         return; 
+     }
+ 
+@@ -850,23 +851,20 @@
+                 }
+                 /* Check for Annodex header */
+                 else if( oggpacket.bytes >= 7 &&
+-                         ! memcmp( &oggpacket.packet[0], "Annodex", 7 ) )
++                         ! memcmp( &oggpacket.packet[0], "fishead", 7 ) )
+                 {
+                     Ogg_ReadAnnodexHeader( VLC_OBJECT(p_demux), p_stream,
+                                            &oggpacket );
+-                    /* kill annodex track */
+-                    free( p_stream );
+-                    p_ogg->i_streams--;
+                 }
+                 /* Check for Annodex header */
+                 else if( oggpacket.bytes >= 7 &&
+-                         ! memcmp( &oggpacket.packet[0], "AnxData", 7 ) )
++                         ! memcmp( &oggpacket.packet[0], "fisbone", 7 ) )
+                 {
+                     Ogg_ReadAnnodexHeader( VLC_OBJECT(p_demux), p_stream,
+                                            &oggpacket );
+                 }
+                 else if( oggpacket.bytes >= 142 &&
+-                         !memcmp( &oggpacket.packet[1],
++                         ! memcmp( &oggpacket.packet[1],
+                                    "Direct Show Samples embedded in Ogg", 35 ))
+                 {
+                     /* Old header type */
+@@ -1324,71 +1322,108 @@
+                                    logical_stream_t *p_stream,
+                                    ogg_packet *p_oggpacket )
+ {
+-    if( p_oggpacket->bytes >= 28 &&
+-        !memcmp( &p_oggpacket->packet[0], "Annodex", 7 ) )
+-    {
++     if( p_oggpacket->bytes >= 28 &&
++         !memcmp( &p_oggpacket->packet[0], "fishead", 7 ) )
++     {
++         oggpack_buffer opb;
++ 
++         uint16_t major_version;
++         uint16_t minor_version;
++         uint64_t presentationtime_numerator;
++         uint64_t presentationtime_denominator;
++         uint64_t basetime_numerator;
++         uint64_t basetime_denominator;
++         char content_type_string[20];
++  
++         /* Read in Annodex header fields:
++          * we use UNKNOWN_ES here since it's the skeleton bitstream header only.
++          * Future releases could support NAV_ES (navigation elementary stream) */
++ 
++         p_stream->fmt.i_cat = UNKNOWN_ES;
++         
++         /* the anxs FOURCC was invented here for the skeleton logical bitstream */
++         p_stream->fmt.i_codec = VLC_FOURCC( 'a','n','x','s' );
++ 
++         /* Signal that we want to keep a backup of the skeleton stream headers */
++         p_stream->b_force_backup = 1;
++ 
++         /* Cheat and get additionnal info ;) */
++         oggpack_readinit( &opb, p_oggpacket->packet, p_oggpacket->bytes );
++         oggpack_adv( &opb, 8*8 );                  /* "fishead\0" header */
++ 
++         major_version = oggpack_read( &opb, 2*8 ); /* major version */
++         minor_version = oggpack_read( &opb, 2*8 ); /* minor version */
++ 
++         presentationtime_numerator   = GetQWLE( &p_oggpacket->packet[12] );
++         presentationtime_denominator = GetQWLE( &p_oggpacket->packet[20] );
++ 
++         basetime_numerator   = GetQWLE( &p_oggpacket->packet[28] );
++         basetime_denominator = GetQWLE( &p_oggpacket->packet[36] );
++         
++         sscanf( &p_oggpacket->packet[44], "%20s", content_type_string );
++     }
++     else if( p_oggpacket->bytes >= 42 &&
++              !memcmp( &p_oggpacket->packet[0], "fisbone", 7 ) )
++     {
+         oggpack_buffer opb;
+-
+-        uint16_t major_version;
+-        uint16_t minor_version;
+-        uint64_t timebase_numerator;
+-        uint64_t timebase_denominator;
+-
+-        Ogg_ReadTheoraHeader( p_stream, p_oggpacket );
+-
+-        oggpack_readinit( &opb, p_oggpacket->packet, p_oggpacket->bytes);
+-        oggpack_adv( &opb, 8*8 ); /* "Annodex\0" header */
+-        major_version = oggpack_read( &opb, 2*8 ); /* major version */
+-        minor_version = oggpack_read( &opb, 2*8 ); /* minor version */
+-        timebase_numerator = GetQWLE( &p_oggpacket->packet[16] );
+-        timebase_denominator = GetQWLE( &p_oggpacket->packet[24] );
+-    }
+-    else if( p_oggpacket->bytes >= 42 &&
+-             !memcmp( &p_oggpacket->packet[0], "AnxData", 7 ) )
+-    {
++       uint32_t message_fields_offset;
++       uint32_t serial_no;
+         uint64_t granule_rate_numerator;
+         uint64_t granule_rate_denominator;
++        uint64_t start_granule;
++        uint32_t preroll;
++        uint8_t  granule_shift;
+         char content_type_string[1024];
+-
++  
+         /* Read in Annodex header fields */
+-
+-        granule_rate_numerator = GetQWLE( &p_oggpacket->packet[8] );
+-        granule_rate_denominator = GetQWLE( &p_oggpacket->packet[16] );
+-        p_stream->secondary_header_packets =
+-            GetDWLE( &p_oggpacket->packet[24] );
+-
++        oggpack_readinit( &opb, p_oggpacket->packet, p_oggpacket->bytes );
++        oggpack_adv( &opb, 8*8 );                  /* "fisbone\0" header */
++ 
++        message_fields_offset = GetDWLE( &p_oggpacket->packet[8] );
++        serial_no             = GetDWLE( &p_oggpacket->packet[12] );
++        p_stream->secondary_header_packets
++                              = GetDWLE( &p_oggpacket->packet[16] );
++ 
++        granule_rate_numerator   = GetQWLE( &p_oggpacket->packet[20] );
++        granule_rate_denominator = GetQWLE( &p_oggpacket->packet[28] );
++        start_granule            = GetQWLE( &p_oggpacket->packet[36] );
++        preroll                  = GetDWLE( &p_oggpacket->packet[44] );
++ 
++        /* Granule Shift takes up the first byte of data */
++        uint8_t * bytepacket     = (uint8_t *)&p_oggpacket->packet[48];
++        granule_shift            = bytepacket[0];
++ 
+         /* we are guaranteed that the first header field will be
+          * the content-type (by the Annodex standard) */
+-        content_type_string[0] = '\0';
+-        if( !strncasecmp( (char*)(&p_oggpacket->packet[28]), "Content-Type: ", 14 ) )
++        if( !strncasecmp( (char*)(&p_oggpacket->packet[52]), "Content-Type: ", 14 ) )
+         {
+-            uint8_t *p = memchr( &p_oggpacket->packet[42], '\r',
+-                                 p_oggpacket->bytes - 1 );
++            uint8_t *p = memchr( &p_oggpacket->packet[52], '\r',
++                                  p_oggpacket->bytes - 1 );
+             if( p && p[0] == '\r' && p[1] == '\n' )
+-                sscanf( (char*)(&p_oggpacket->packet[42]), "%1024s\r\n",
++                sscanf( (char*)(&p_oggpacket->packet[52]), "%1024s\r\n",
+                         content_type_string );
+         }
+-
+-        msg_Dbg( p_this, "AnxData packet info: "I64Fd" / "I64Fd", %d, ``%s''",
++ 
++        msg_Dbg( p_this, "Annodex packet info: "I64Fd" / "I64Fd", %d, ``%s''",
+                  granule_rate_numerator, granule_rate_denominator,
+                  p_stream->secondary_header_packets, content_type_string );
+-
++ 
+         p_stream->f_rate = (float) granule_rate_numerator /
+             (float) granule_rate_denominator;
+-
+-        /* What type of file do we have?
+-         * strcmp is safe to use here because we've extracted
+-         * content_type_string from the stream manually */
++ 
++        /* What type of file do we have:
++         * strcmp used as content_type_string extracted manually from stream
++         * (Wave and MPEG Formats are for future implementation) */
++ 
+         if( !strncmp(content_type_string, "audio/x-wav", 11) )
+         {
+-            /* n.b. WAVs are unsupported right now */
+-            p_stream->fmt.i_cat = UNKNOWN_ES;
++            p_stream->fmt.i_cat = AUDIO_ES;
++            p_stream->fmt.i_codec = VLC_FOURCC( 'w','a','v',' ' );
+         }
+         else if( !strncmp(content_type_string, "audio/x-vorbis", 14) )
+         {
+             p_stream->fmt.i_cat = AUDIO_ES;
+             p_stream->fmt.i_codec = VLC_FOURCC( 'v','o','r','b' );
+-
+             p_stream->b_force_backup = 1;
+         }
+         else if( !strncmp(content_type_string, "audio/x-speex", 14) )
+@@ -1414,7 +1449,6 @@
+         }
+         else if( !strncmp(content_type_string, "video/mpeg", 14) )
+         {
+-            /* n.b. MPEG streams are unsupported right now */
+             p_stream->fmt.i_cat = VIDEO_ES;
+             p_stream->fmt.i_codec = VLC_FOURCC( 'm','p','g','v' );
+         }
+Index: /annodex/modules/access/http.c
+===================================================================
+--- /annodex/modules/access/http.c      (revision 15939)
++++ /annodex/modules/access/http.c      (working copy)
+@@ -927,8 +927,14 @@
+     /* Offset */
+     if( p_sys->i_version == 1 )
+     {
+-        net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs,
+-                    "Range: bytes="I64Fd"-\r\n", i_tell );
++        /* only send a Range: request if we want we need an offset that
++         * doesn't start from 0, otherwise the Web server may get
++         * unnecessarily overloaded */
++        if( i_tell != 0 )
++        {
++            net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs,
++                        "Range: bytes="I64Fd"-\r\n", i_tell );
++        }
+     }
+ 
+     /* Authentication */
+Index: /annodex/mozilla/vlcpeer.cpp
+===================================================================
+--- /annodex/mozilla/vlcpeer.cpp        (revision 15939)
++++ /annodex/mozilla/vlcpeer.cpp        (working copy)
+@@ -48,6 +48,7 @@
+ 
+ #include "vlcpeer.h"
+ #include "vlcplugin.h"
++#include "vlcstreaminfo.h"
+ 
+ NS_IMPL_ISUPPORTS2( VlcPeer, VlcIntf, nsIClassInfo )
+ 
+@@ -312,3 +313,21 @@
+     }
+     return NS_OK;
+ }
++
++NS_IMETHODIMP VlcPeer::Get_video_width( PRInt64 *i_video_width )
++{
++    if( p_plugin->i_vlc )
++    {
++        *i_video_width = vlc_get_video_width( p_plugin->i_vlc );
++    }
++    return NS_OK;
++}
++
++NS_IMETHODIMP VlcPeer::Get_video_height( PRInt64 *i_video_height )
++{
++    if( p_plugin->i_vlc )
++    {
++        *i_video_height = vlc_get_video_height( p_plugin->i_vlc );
++    }
++    return NS_OK;
++}
+Index: /annodex/mozilla/vlc.r
+===================================================================
+--- /annodex/mozilla/vlc.r      (revision 15939)
++++ /annodex/mozilla/vlc.r      (working copy)
+@@ -13,9 +13,8 @@
+ resource 'STR#' (126)
+ {
+     {
+-        "Version 0.8.6, Copyright 2006, The VideoLAN Team"
+-        "<BR><A HREF='http://www.videolan.org'>http://www.videolan.org</A>",
+-        "VLC Multimedia Plugin"
++         "VLC Annodex viewer plugin",
++         "VLC Annodex viewer plugin"n"
+     };
+ };
+ 
+@@ -23,28 +22,7 @@
+ resource 'STR#' (127)
+ {
+     {
+-        "MPEG audio",
+-        "MPEG audio",
+-        "MPEG video",
+-        "MPEG video",
+-        "MPEG video",
+-        "MPEG video",
+-        "MPEG-4 video",
+-        "MPEG-4 audio",
+-        "MPEG-4 video",
+-        "MPEG-4 video",
+-        "AVI video",
+-/*        "QuickTime video", */
+-        "Ogg stream",
+-        "Ogg stream",
+-        "VLC plugin",
+-        "ASF stream",
+-        "ASF stream",
+-        "",
+-        "",
+-        "Google VLC Plugin",
+-        "WAV audio",
+-        "WAV audio"
++         "VLC Annodex viewer plugin<br><br>VideoLAN WWW: <a href=""http://www.videolan.org/"">http://www.videolan.org/</a><br>Annodex WWW: <a href=""http://www.annodex.net/"">http://www.annodex.net/</a>"
+     };
+ };
+ 
+@@ -52,28 +30,7 @@
+ resource 'STR#' (128,"MIME Type")
+ {
+     {
+-        "audio/mpeg", "mp2,mp3,mpga,mpega",
+-        "audio/x-mpeg", "mp2,mp3,mpga,mpega",
+-        "video/mpeg", "mpg,mpeg,mpe",
+-        "video/x-mpeg", "mpg,mpeg,mpe",
+-        "video/mpeg-system", "mpg,mpeg,vob",
+-        "video/x-mpeg-system", "mpg,mpeg,vob",
+-        "video/mpeg4", "mp4,mpg4",
+-        "audio/mpeg4", "mp4,mpg4",
+-        "application/mpeg4-iod", "mp4,mpg4",
+-        "application/mpeg4-muxcodetable", "mp4,mpg4",
+-        "video/x-msvideo", "avi",
+-/*        "video/quicktime", "mov, qt", */
+-        "application/ogg", "ogg",
+-        "application/x-ogg", "ogg",
+-        "application/x-vlc-plugin", "vlc",
+-        "video/x-ms-asf-plugin", "",
+-        "video/x-ms-asf", "",
+-        "application/x-mplayer2", "",
+-        "video/x-ms-wmv", "",
+-        "video/x-google-vlc-plugin", "",
+-        "audio/wav", "wav",
+-        "audio/x-wav", "wav",
++         "application/x-annodex-vlc-viewer-plugin", ""
+     };
+ };
+ 
+Index: /annodex/mozilla/Makefile.am
+===================================================================
+--- /annodex/mozilla/Makefile.am        (revision 15939)
++++ /annodex/mozilla/Makefile.am        (working copy)
+@@ -7,13 +7,20 @@
+ MOSTLYCLEANFILES = $(npvlc_DATA) $(vlcintf_xpt_DATA)
+ CLEANFILES = stamp-pic $(BUILT_SOURCES)
+ EXTRA_DIST = $(DIST_sources) vlcintf.idl npvlc_rc.rc vlc.r
++VLCIDL_FILE = "$(srcdir)/vlcintf.idl"
+ 
++# For MacOS and Linux users, you may leave the default values.
++# For Cygwin users, you need to make the following changes for the location:
++# VLCIDL_FILE = "{drive}:\{Path of VLC Source}/mozilla/vlcintf.idl"
++
+ SOURCES_mozilla_common = \
+        vlcshell.cpp \
+        vlcplugin.cpp \
+        vlcplugin.h \
+        vlcpeer.cpp \
+        vlcpeer.h \
++       vlcstreaminfo.c \
++       vlcstreaminfo.h \
+        vlcruntime.cpp \
+        vlcruntime.h \
+        support/classinfo.h
+@@ -176,13 +183,14 @@
+        @if test -f "$@.exe"; then mv -f "$@.exe" "$@"; fi
+ 
+ vlcintf_xptdir = $(libdir)/mozilla/components
++
+ vlcintf.xpt: vlcintf.idl
+        $(XPIDL) $(XPIDL_INCL) \
+-         -m typelib -o vlcintf $(srcdir)/vlcintf.idl
++         -m typelib -o vlcintf $(VLCIDL_FILE)
+ 
+ vlcintf.h: vlcintf.idl
+        $(XPIDL) $(XPIDL_INCL) \
+-         -m header -o vlcintf $(srcdir)/vlcintf.idl
++         -m header -o vlcintf $(VLCIDL_FILE)
+ 
+ ###############################################################################
+ # Stamp rules
+Index: /annodex/mozilla/npvlc_rc.rc
+===================================================================
+--- /annodex/mozilla/npvlc_rc.rc        (revision 15939)
++++ /annodex/mozilla/npvlc_rc.rc        (working copy)
+@@ -31,17 +31,17 @@
+     BEGIN
+         BLOCK "040904e4"
+         BEGIN
+-            VALUE "ProductName", "VLC multimedia plugin\0"
++            VALUE "ProductName", "VLC Annodex viewer plugin\0"
+             VALUE "ProductVersion", STRINGIFY( VERSION )
+-            VALUE "OriginalFilename", "npvlc.dll\0"
++            VALUE "OriginalFilename", "npanxvlc.dll\0"
+             VALUE "FileVersion", STRINGIFY( VERSION )
+-            VALUE "FileDescription", "VLC multimedia plugin Version "STRINGIFY( VERSION )"<br><br>VideoLAN WWW: <a href=""http://www.videolan.org/"">http://www.videolan.org/</a>\0"
+-            VALUE "InternalName", "npvlc\0"
+-            VALUE "CompanyName", "VideoLAN Team\0"
+-            VALUE "LegalCopyright", "Copyright VideoLAN \251 1996-2006\0"
+-            VALUE "MIMEType", "audio/mpeg|audio/x-mpeg|video/mpeg|video/x-mpeg|video/mpeg-system|video/x-mpeg-system|video/mpeg4|audio/mpeg4|application/mpeg4-iod|application/mpeg4-muxcodetable|video/x-msvideo|video/quicktime|application/x-ogg|application/ogg|application/x-vlc-plugin|video/x-ms-asf-plugin|video/x-ms-asf|application/x-mplayer2|video/x-ms-wmv|application/x-google-vlc-plugin|audio/wav|audio/x-wav\0"
+-            VALUE "FileExtents", "mp2,mp3,mpga,mpega|mp2,mp3,mpga,mpega|mpg,mpeg,mpe|mpg,mpeg,mpe|mpg,mpeg,vob|mpg,mpeg,vob|mp4,mpg4|mp4,mpg4|mp4,mpg4|mp4,mpg4|avi|mov,qt|ogg|ogg|||wav|wav\0"
+-            VALUE "FileOpenName", "MPEG audio|MPEG audio|MPEG video|MPEG video|MPEG video|MPEG video|MPEG-4 video|MPEG-4 audio|MPEG-4 video|MPEG-4 video|AVI video|QuickTime video|Ogg stream|Ogg stream|VLC plugin|||||Google VLC plugin|WAV audio|WAV audio\0"
++            VALUE "FileDescription", "VLC Annodex viewer plugin Version "STRINGIFY( VERSION )" \0"
++            VALUE "InternalName", "npanxvlc\0"
++            VALUE "CompanyName", "VideoLAN Team and CSIRO Australia\0"
++            VALUE "LegalCopyright", "Copyright VideoLAN \251 1996-2005, portions Copyright \251 Commonwealth Scientific and Industrial Research Organisation (CSIRO) Australia 2004-2005\0"
++            VALUE "MIMEType", "application/x-annodex-vlc-viewer-plugin\0"
++            VALUE "FileExtents", "\0"
++            VALUE "FileOpenName", "VLC Annodex viewer plugin\0"
+         END
+     END
+     BLOCK "VarFileInfo"
+Index: /annodex/mozilla/vlcplugin.h
+===================================================================
+--- /annodex/mozilla/vlcplugin.h        (revision 15939)
++++ /annodex/mozilla/vlcplugin.h        (working copy)
+@@ -98,44 +98,14 @@
+ /*******************************************************************************
+  * Plugin properties.
+  ******************************************************************************/
+-#define PLUGIN_NAME         "VLC multimedia plugin"
++#define PLUGIN_NAME         "VLC Annodex viewer plugin"
+ #define PLUGIN_DESCRIPTION \
+     "VLC multimedia plugin <br>" \
+     " <br>" \
+     "version %s <br>" \
+-    "VideoLAN WWW: <a href=\"http://www.videolan.org/\">http://www.videolan.org/</a>"
++    "VideoLAN WWW: <a href=\"http://www.videolan.org/\">http://www.videolan.org/</a><br>Annodex WWW: <a href=\"http://www.annodex.net/\">http://www.annodex.net/</a>"
+ 
+ #define PLUGIN_MIMETYPES \
+-    /* MPEG-1 and MPEG-2 */ \
+-    "audio/mpeg:mp2,mp3,mpga,mpega:MPEG audio;" \
+-    "audio/x-mpeg:mp2,mp3,mpga,mpega:MPEG audio;" \
+-    "video/mpeg:mpg,mpeg,mpe:MPEG video;" \
+-    "video/x-mpeg:mpg,mpeg,mpe:MPEG video;" \
+-    "video/mpeg-system:mpg,mpeg,mpe,vob:MPEG video;" \
+-    "video/x-mpeg-system:mpg,mpeg,mpe,vob:MPEG video;" \
+-    /* MPEG-4 */ \
+-    "video/mpeg4:mp4,mpg4:MPEG-4 video;" \
+-    "audio/mpeg4:mp4,mpg4:MPEG-4 audio;" \
+-    "application/mpeg4-iod:mp4,mpg4:MPEG-4 video;" \
+-    "application/mpeg4-muxcodetable:mp4,mpg4:MPEG-4 video;" \
+-    /* AVI */ \
+-    "video/x-msvideo:avi:AVI video;" \
+-    /* QuickTime */ \
+-    "video/quicktime:mov,qt:QuickTime video;" \
+-    /* Ogg */ \
+-    "application/x-ogg:ogg:Ogg stream;" \
+-    "application/ogg:ogg:Ogg stream;" \
+-    /* explicit plugin call */ \
+-    "application/x-vlc-plugin::VLC plugin;" \
+-    /* windows media */ \
+-    "video/x-ms-asf-plugin:asf,asx:Windows Media Video;" \
+-    "video/x-ms-asf:asf,asx:Windows Media Video;" \
+-    "application/x-mplayer2::Windows Media;" \
+-    "video/x-ms-wmv:wmv:Windows Media;" \
+-    /* Google VLC mime */ \
+-    "application/x-google-vlc-plugin::Google VLC plugin" \
+-    /* Misc */ \
+-    "audio/wav::WAV audio" \
+-    "audio/x-wav::WAV audio" \
++    "application/x-annodex-vlc-viewer-plugin::Annodex Media View"
+ 
+ #endif
+Index: /annodex/mozilla/vlcintf.idl
+===================================================================
+--- /annodex/mozilla/vlcintf.idl        (revision 15939)
++++ /annodex/mozilla/vlcintf.idl        (working copy)
+@@ -37,6 +37,10 @@
+     PRInt64 get_position();
+     PRInt64 get_time();
+ 
++    /* Stream information accessors */
++    PRInt64 get_video_width();
++    PRInt64 get_video_height();
++
+     void seek( in PRInt64 i_secs, in PRInt64 b_relative);
+ };
+ 
+Index: /annodex/mozilla/vlcshell.cpp
+===================================================================
+--- /annodex/mozilla/vlcshell.cpp       (revision 15939)
++++ /annodex/mozilla/vlcshell.cpp       (working copy)
+@@ -326,33 +326,17 @@
+         };
+ 
+ #elif defined(XP_WIN)
+-        char *ppsz_argv[] = { NULL, "-vv" };
+-        HKEY h_key;
+-        DWORD i_type, i_data = MAX_PATH + 1;
+-        char p_data[MAX_PATH + 1];
+-        if( RegOpenKeyEx( HKEY_LOCAL_MACHINE, "Software\\VideoLAN\\VLC",
+-                          0, KEY_READ, &h_key ) == ERROR_SUCCESS )
++        char *ppsz_argv[] =
+         {
+-             if( RegQueryValueEx( h_key, "InstallDir", 0, &i_type,
+-                                  (LPBYTE)p_data, &i_data ) == ERROR_SUCCESS )
+-             {
+-                 if( i_type == REG_SZ )
+-                 {
+-                     strcat( p_data, "\\vlc" );
+-                     ppsz_argv[0] = p_data;
+-                 }
+-             }
+-             RegCloseKey( h_key );
+-        }
++            "vlc",
++            "-vvvv"
++        };
+ 
+-        if( !ppsz_argv[0] ) ppsz_argv[0] = "vlc";
+-
+ #else /* XP_MACOSX */
+         char *ppsz_argv[] =
+         {
+-            "vlc"
++            "vlc",
+             "-vvvv"
+-            /*, "--plugin-path", ""*/
+         };
+ 
+ #endif /* XP_MACOSX */
+@@ -552,7 +536,7 @@
+ #if USE_LIBVLC
+ 
+ #ifdef XP_MACOSX
+-    value.i_int = (int)(((NP_Port*) (window->window))->port);
++    value.i_int = (int) ((NP_Port*) (window->window))->port;
+     VLC_VariableSet( p_plugin->i_vlc, "drawable", value );
+ 
+     valueportx.i_int = ((NP_Port*) (window->window))->portx;
+@@ -581,7 +565,10 @@
+     p_plugin->window = window;
+ 
+     valueredraw.i_int = 1;
+-    VLC_VariableSet( p_plugin->i_vlc, "drawableredraw", valueredraw );
++    if ( VLC_VariableSet( p_plugin->i_vlc, "drawableredraw", valueredraw ) != VLC_SUCCESS )
++    {
++       fprintf( stderr, "Setting drawableredraw failed" );
++    }
+ 
+ #else /* XP_MACOSX */
+     /* FIXME: this cast sucks */
+@@ -916,6 +903,11 @@
+     GC gc;
+     XGCValues gcv;
+ 
++    if( event != NULL && event->type == ConfigureNotify )
++    {
++        fprintf(stderr, "resize ConfigureNotify\n");
++    }
++
+     gcv.foreground = BlackPixel( p_plugin->p_display, 0 );
+     gc = XCreateGC( p_plugin->p_display, p_plugin->window, GCForeground, &gcv );
+ 


-- 
cchiu



More information about the cvs-annodex mailing list