Update win32 MSVC build:

  * internal names cleanup
  * http input plugin uses http_helper.c
  * fix change in audio_directx
  * MSVC stoped compile xineui because of 'this', mysterious
  * change non-constand array lengths to malloc/free,
    it good for such old compilers as my MSVC 6.0
  * change lprintf macro for MSVC to compile again
    (I don't know, how use variable number of macro arguments  in MSVC...)
  * merge compiling of xine-utils and xine-engine

CVS patchset: 5902
CVS date: 2003/12/13 11:35:07

14 files changed, 239 insertions, 238 deletions

diff --git a/ChangeLog b/ChangeLog
index 99eed55a7..8d2a5c24d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,7 +13,7 @@ xine-lib (1-rc3)
   * realaudio demuxer improvements including support for 14.4 codec and reading
     meta info
   * post plugin for ffmpeg libpostprocess (pp)
-  * updated win32 port
+  * updated win32 MSVC port
   * default to menu button 1, if an invalid button is set
     (fixes main menu of "Alice in Wonderland" RC2)
   * fix yuy2 output on mga_vid vidix driver
diff --git a/src/audio_out/audio_directx_out.c b/src/audio_out/audio_directx_out.c
index c4de81cff..98dc0aca1 100755
--- a/src/audio_out/audio_directx_out.c
+++ b/src/audio_out/audio_directx_out.c
@@ -20,7 +20,7 @@
  * audio_directx_out.c, direct sound audio output plugin for xine
  * by Matthew Grooms <elon@altavista.com>
  *
- * $Id: audio_directx_out.c,v 1.6 2003/12/05 15:54:56 f1rmb Exp $
+ * $Id: audio_directx_out.c,v 1.7 2003/12/13 11:35:07 valtri Exp $
  */
 
 typedef unsigned char boolean;
@@ -782,7 +782,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
   lprintf("open_plugin(%08x, %08x) Enter\n", (unsigned long)class_gen, (unsigned long)data);
   lprintf("open_plugin: ao_directx=%08x\n", (unsigned long)ao_directx);
 
-  ao_driverx->xine                              = class->xine;
+  ao_directx->xine                              = class->xine;
 
   ao_directx->ao_driver.get_capabilities        = ao_directx_get_capabilities;
   ao_directx->ao_driver.get_property	        = ao_directx_get_property;
diff --git a/src/input/input_http.c b/src/input/input_http.c
index e22a94035..93e47aa29 100644
--- a/src/input/input_http.c
+++ b/src/input/input_http.c
@@ -19,7 +19,7 @@
  *
  * input plugin for http network streams
  *
- * $Id: input_http.c,v 1.77 2003/12/04 21:19:03 tmattern Exp $
+ * $Id: input_http.c,v 1.78 2003/12/13 11:35:07 valtri Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -898,7 +898,7 @@ static void *init_class (xine_t *xine, void *data) {
 
     if((proxy_env = getenv("http_proxy")) && (strlen(proxy_env))) {
       int   proxy_port = DEFAULT_HTTP_PORT;
-      char  http_proxy[strlen(proxy_env + 1)];
+      char  *http_proxy = xine_xmalloc(strlen(proxy_env + 1));
       char *p;
       
       if(!strncmp(proxy_env, "http://", 7))
@@ -915,6 +915,8 @@ static void *init_class (xine_t *xine, void *data) {
       this->proxyhost_env                   = strdup(http_proxy);
       this->proxyhost                       = this->proxyhost_env;
       this->proxyport = this->proxyport_env = proxy_port;
+
+      free(http_proxy);
     }
   }
 
diff --git a/src/video_out/video_out_directx.c b/src/video_out/video_out_directx.c
index dec8eb50f..aa0693722 100755
--- a/src/video_out/video_out_directx.c
+++ b/src/video_out/video_out_directx.c
@@ -20,7 +20,7 @@
  * video_out_directx.c, direct draw video output plugin for xine
  * by Matthew Grooms <elon@altavista.com>
  *
- * $Id: video_out_directx.c,v 1.12 2003/12/05 15:55:03 f1rmb Exp $
+ * $Id: video_out_directx.c,v 1.13 2003/12/13 11:35:07 valtri Exp $
  */
 
 typedef unsigned char boolean;
@@ -839,7 +839,7 @@ static vo_frame_t * win32_alloc_frame( vo_driver_t * vo_driver )
   win32_driver_t *win32_driver = (win32_driver_t *)vo_driver;
   win32_frame_t  *win32_frame;
 
-  win32_frame = ( win32_frame_t * ) xine_malloc( sizeof( win32_frame_t ) );
+  win32_frame = ( win32_frame_t * ) xine_xmalloc( sizeof( win32_frame_t ) );
   if (!win32_frame)
     return NULL;
 
diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h
index 009037c70..4860ed27f 100644
--- a/src/xine-engine/buffer.h
+++ b/src/xine-engine/buffer.h
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: buffer.h,v 1.126 2003/11/20 00:42:14 tmattern Exp $
+ * $Id: buffer.h,v 1.127 2003/12/13 11:35:07 valtri Exp $
  *
  *
  * contents:
@@ -463,7 +463,7 @@ struct fifo_buffer_s
    * buffer allocation functions
    */
 
-  buf_element_t *(*buffer_pool_alloc) (fifo_buffer_t *this);
+  buf_element_t *(*buffer_pool_alloc) (fifo_buffer_t *self);
 
 
   /*
@@ -471,7 +471,7 @@ struct fifo_buffer_s
    */
 
   /* the same as buffer_pool_alloc but may fail if none is available */
-  buf_element_t *(*buffer_pool_try_alloc) (fifo_buffer_t *this);
+  buf_element_t *(*buffer_pool_try_alloc) (fifo_buffer_t *self);
 
   /* the same as put but insert at the head of the fifo */
   void (*insert) (fifo_buffer_t *fifo, buf_element_t *buf);
diff --git a/src/xine-engine/info_helper.c b/src/xine-engine/info_helper.c
index 5221cd034..fb2a087f6 100644
--- a/src/xine-engine/info_helper.c
+++ b/src/xine-engine/info_helper.c
@@ -20,7 +20,7 @@
  * stream metainfo helper functions
  * hide some xine engine details from demuxers and reduce code duplication
  *
- * $Id: info_helper.c,v 1.6 2003/11/16 23:33:48 f1rmb Exp $ 
+ * $Id: info_helper.c,v 1.7 2003/12/13 11:35:08 valtri Exp $ 
  */
 
 #ifdef HAVE_CONFIG_H
@@ -224,10 +224,11 @@ void _x_meta_info_set(xine_stream_t *stream, int info, const char *str) {
 void _x_meta_info_n_set(xine_stream_t *stream, int info, const char *buf, int len) {
   pthread_mutex_lock(&stream->meta_mutex);
   if(__meta_valid(info) && len) {
-    char str[len + 1];
+    char *str = xine_xmalloc(len + 1);
     
     snprintf(str, len + 1 , "%s", buf);
-    __meta_info_set_unlocked(stream, info, (const char *) &str[0]);
+    __meta_info_set_unlocked(stream, info, (const char *) &str[0]);

+	free(str);
   }
   pthread_mutex_unlock(&stream->meta_mutex);
 }
diff --git a/src/xine-utils/xineutils.h b/src/xine-utils/xineutils.h
index 348904991..64a252f32 100644
--- a/src/xine-utils/xineutils.h
+++ b/src/xine-utils/xineutils.h
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xineutils.h,v 1.74 2003/12/13 01:47:35 f1rmb Exp $
+ * $Id: xineutils.h,v 1.75 2003/12/13 11:35:08 valtri Exp $
  *
  */
 #ifndef XINEUTILS_H
@@ -903,7 +903,7 @@ void xine_hexdump (const char *buf, int length);
     #define lprintf(fmt, args...)     do {} while(0)
   #else
   #ifdef _MSC_VER
-    #define lprintf                   do {} while(0)
+    #define lprintf
   #else
     #define lprintf(...)              do {} while(0)
   #endif /* _MSC_VER */
diff --git a/win32/README b/win32/README
index 3806df7c9..926e2708d 100755
--- a/win32/README
+++ b/win32/README
@@ -17,9 +17,8 @@ Steps for building Xine using MSVC:
 
 - Build the following projects in this order:
   libxinesuppt
-  libxineutils
-  libdvdnav
   libxine
+  libdvdnav
 
 - Next build any desired plugins (decoders/demuxers ...). The ao_out_directx and vo_out_directx are required for Win32. There is an option to use the vo_out_sdl but a sdl.dll must be present for that to take place. There have also been some issues observed with the directX video driver on some machines.
 NOTE: Project xineplug_dmx_asf currently does not build correctly.
diff --git a/win32/libdvdnav.dsp b/win32/libdvdnav.dsp
index 6273b6652..9827b0c33 100644
--- a/win32/libdvdnav.dsp
+++ b/win32/libdvdnav.dsp
@@ -40,10 +40,10 @@ RSC=rc.exe
 # PROP Output_Dir "Release"

 # PROP Intermediate_Dir "Release"

 # PROP Target_Dir ""

-MTL=midl.exe

 LINK32=link.exe

 # ADD BASE LINK32 /machine:IX86

 # ADD LINK32 /machine:IX86

+MTL=midl.exe

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

 # ADD CPP /nologo /W3 /GX /O2 /I "." /I ".." /I "..\..\libdvdcss\src" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

@@ -73,11 +73,11 @@ PostBuild_Cmds=scripts\libdvdnav_install.bat Release
 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-MTL=midl.exe

 LINK32=link.exe

 # ADD BASE LINK32 /machine:IX86

 # ADD LINK32 /debug /machine:IX86 /out:"Debug/libdvdnav.lib" /implib:"Debug/libdvdnav.lib"

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

+MTL=midl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c

 # ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "../src/xine-utils" /I "contrib/dirent" /I "contrib/pthreads" /I "contrib/timer" /I "../src/input/libdvdcss/src" /I ".." /I "../src" /D "WIN32" /D "_DEBUG" /D "_LIB" /D "DVDNAV_COMPILE" /D "HAVE_CONFIG_H" /FR"Debug/libdvdnav/" /Fp"Debug/libdvdnav/libdvdnav.pch" /YX /Fo"Debug/libdvdnav/" /Fd"Debug/libdvdnav/" /FD /GZ /c

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

diff --git a/win32/libxine.def b/win32/libxine.def
index 48e6dea63..18f784024 100644
--- a/win32/libxine.def
+++ b/win32/libxine.def
@@ -3,6 +3,64 @@
 
 EXPORTS
 
+;---- xine-utils ----

+xine_mm_accel

+xine_fast_memcpy

+xine_probe_fast_memcpy

+

+xine_profiler_init

+xine_profiler_allocate_slot

+xine_profiler_start_count

+xine_profiler_stop_count

+xine_profiler_print_results

+

+xine_xmalloc

+xine_xmalloc_aligned

+

+xine_get_homedir

+xine_chomp

+xine_usec_sleep

+

+init_yuv_conversion

+init_yuv_planes

+free_yuv_planes

+

+xine_hexdump

+

+xine_list_free

+xine_list_is_empty

+xine_list_first_content

+xine_list_next_content

+xine_list_last_content

+xine_list_prev_content

+xine_list_append_content

+xine_list_insert_content

+xine_list_delete_current

+

+basename

+

+xine_buffer_init

+_xine_buffer_free

+xine_buffer_dup

+_xine_buffer_copyin

+xine_buffer_copyout

+_xine_buffer_set

+_xine_buffer_strcat

+_xine_buffer_strcpy

+xine_buffer_get_size

+_xine_buffer_ensure_size

+

+xml_parser_init

+xml_parser_build_tree

+xml_parser_free_tree

+xml_parser_get_property

+xml_parser_get_property_int

+xml_parser_dump_tree

+

+lexer_init

+lexer_get_token

+

+;---- xine-engine ----

 xine_init
 xine_exit
 xine_play
@@ -21,13 +79,13 @@ xine_engine_set_param
 xine_engine_get_param
 
 xine_get_status
-xine_get_audio_channel
+_x_get_audio_channel
 xine_get_audio_lang
-get_audio_decoder
-xine_get_spu_channel
+;get_audio_decoder
+;xine_get_spu_channel
 xine_get_spu_lang
-xine_select_spu_channel
-get_spu_decoder
+;xine_select_spu_channel
+_x_get_spu_decoder
 xine_get_browsable_input_plugin_ids
 xine_get_browse_mrls
 xine_get_autoplay_input_plugin_ids
@@ -60,11 +118,11 @@ xine_get_param
 
 xine_get_current_frame
 xine_get_current_vpts
-xine_get_current_info
+;xine_get_current_info
 xine_get_stream_info
 xine_get_pos_length
 
-xine_set_speed
+;xine_set_speed
 
 xine_post_init
 xine_list_post_plugins
@@ -116,8 +174,48 @@ xine_tvmode_set_tvsystem
 xine_tvmode_switch
 xine_tvmode_size
 xine_tvmode_exit
-
-xine_message
+

+_x_handle_stream_end
+_x_message

+_x_find_input_plugin

+_x_find_demux_plugin

+_x_find_demux_plugin_by_name

+_x_find_demux_plugin_last_probe

+_x_rip_plugin_get_instance

+

+_x_video_decoder_init

+_x_video_decoder_shutdown

+_x_audio_decoder_init

+_x_audio_decoder_shutdown

+_x_extra_info_reset

+_x_extra_info_merge

+_x_get_current_info
+

+_x_demux_flush_engine

+_x_demux_control_nop

+_x_demux_control_newpts

+_x_demux_control_headers_done

+_x_demux_control_start

+_x_demux_control_end

+_x_demux_start_thread

+_x_demux_stop_thread

+_x_demux_read_header

+_x_demux_check_extension

+

+_x_read_abort

+_x_action_pending

+

+_x_get_video_decoder

+_x_free_video_decoder

+_x_get_audio_decoder

+_x_free_audio_decoder

+_x_get_spu_decoder

+_x_free_spu_decoder

+

+_x_set_speed

+_x_select_spu_channel

+_x_get_audio_channel

+_x_get_spu_channel

 
 xine_config_register_string
 xine_config_register_range
@@ -132,33 +230,37 @@ xine_config_load
 xine_config_save
 xine_config_reset
 xine_config_update_entry
+

+_x_fourcc_to_buf_video
+_x_buf_video_name

+_x_formattag_to_buf_audio

+_x_buf_audio_name
+_x_bmiheader_le2me
+_x_waveformatex_le2me
 
-xine_demux_control_newpts
-xine_demux_control_start
-xine_demux_flush_engine
-xine_demux_check_extension
-xine_demux_read_header
-xine_read_abort
-
-fourcc_to_buf_video
-formattag_to_buf_audio
-xine_bmiheader_le2me
-xine_waveformatex_le2me
-buf_video_name
-buf_audio_name
-
-vo_scale_init
-vo_scale_compute_output_size
-vo_scale_compute_ideal_size
-vo_scale_aspect_ratio_name
-
-xine_set_stream_info
-xine_set_meta_info
-xine_set_metan_info
-
-xio_select
-xio_tcp_connect
-xio_tcp_read
-xio_tcp_write
-xio_file_read
-xio_file_write
+_x_vo_scale_init
+_x_vo_scale_compute_output_size
+_x_vo_scale_compute_ideal_size
+_x_vo_scale_aspect_ratio_name
+

+_x_io_select
+_x_io_tcp_connect
+_x_io_tcp_read
+_x_io_tcp_write
+_x_io_file_read
+_x_io_file_write
+

+

+_x_stream_info_set

+_x_stream_info_reset

+_x_stream_info_public_reset

+_x_stream_info_get

+_x_stream_info_get_public

+_x_meta_info_set

+_x_meta_info_n_set

+_x_meta_info_reset

+_x_meta_info_public_reset

+_x_meta_info_get

+_x_meta_info_get_public

+

+_x_get_current_info

diff --git a/win32/libxine.dsp b/win32/libxine.dsp
index 9a14b760a..6a0c2a05d 100644
--- a/win32/libxine.dsp
+++ b/win32/libxine.dsp
@@ -76,7 +76,7 @@ PostBuild_Cmds=scripts\move_xine_fonts.bat Release
 # PROP Target_Dir ""

 LIB32=link.exe

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBXINE_EXPORTS" /YX /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "contrib/pthreads" /I "contrib/zlib" /I "contrib/dirent" /I "contrib/timer" /I "../include" /I ".." /I "../intl" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBXINE_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /D "__WINE_WINDEF_H" /D "__WINE_WINGDI_H" /D "__WINE_VFW_H" /FR /YX /FD /GZ /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "contrib/pthreads" /I "contrib/zlib" /I "contrib/dirent" /I "contrib/timer" /I "../include" /I ".." /I "../intl" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBXINE_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /D "__WINE_WINDEF_H" /D "__WINE_WINGDI_H" /D "__WINE_VFW_H" /D "HAVE_NANOSLEEP" /FR /YX /FD /GZ /c

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -86,7 +86,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 libdvdnav.lib wsock32.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/libxine.dll" /pdbtype:sept /libpath:"Debug\libdvdnav" /libpath:"lib"

+# ADD LINK32 wsock32.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/libxine.dll" /pdbtype:sept /libpath:"lib"

 # SUBTRACT LINK32 /pdb:none

 # Begin Special Build Tool

 SOURCE="$(InputPath)"

@@ -100,9 +100,17 @@ PostBuild_Cmds=scripts\move_xine_fonts.bat Debug
 

 # Name "libxine - Win32 Release"

 # Name "libxine - Win32 Debug"

-# Begin Group "Source Files"

+# Begin Group "DLL Defs"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=.\libxine.def

+# End Source File

+# End Group

+# Begin Group "xine-engine"

 

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

+# PROP Default_Filter ""

 # Begin Source File

 

 SOURCE="..\src\xine-engine\audio_decoder.c"

@@ -141,11 +149,11 @@ SOURCE="..\src\xine-engine\info_helper.c"
 # End Source File

 # Begin Source File

 

-SOURCE="..\src\xine-engine\io_helper.c"

+SOURCE="..\src\xine-engine\input_rip.c"

 # End Source File

 # Begin Source File

 

-SOURCE="..\src\xine-engine\input_rip.c"

+SOURCE="..\src\xine-engine\io_helper.c"

 # End Source File

 # Begin Source File

 

@@ -204,12 +212,52 @@ SOURCE="..\src\xine-engine\xine.c"
 SOURCE="..\src\xine-engine\xine_interface.c"

 # End Source File

 # End Group

-# Begin Group "DLL Defs"

+# Begin Group "xine-utils"

 

 # PROP Default_Filter ""

 # Begin Source File

 

-SOURCE=.\libxine.def

+SOURCE="..\src\xine-utils\color.c"

+# End Source File

+# Begin Source File

+

+SOURCE="..\src\xine-utils\cpu_accel.c"

+# End Source File

+# Begin Source File

+

+SOURCE="..\src\xine-utils\list.c"

+# End Source File

+# Begin Source File

+

+SOURCE="..\src\xine-utils\memcpy.c"

+# End Source File

+# Begin Source File

+

+SOURCE="..\src\xine-utils\monitor.c"

+# End Source File

+# Begin Source File

+

+SOURCE="..\src\xine-utils\utils.c"

+# End Source File

+# Begin Source File

+

+SOURCE="..\src\xine-utils\xine_buffer.c"

+# End Source File

+# Begin Source File

+

+SOURCE="..\src\xine-utils\xine_check.c"

+# End Source File

+# Begin Source File

+

+SOURCE="..\src\xine-utils\xine_mutex.c"

+# End Source File

+# Begin Source File

+

+SOURCE="..\src\xine-utils\xmllexer.c"

+# End Source File

+# Begin Source File

+

+SOURCE="..\src\xine-utils\xmlparser.c"

 # End Source File

 # End Group

 # End Target

diff --git a/win32/xine.dsw b/win32/xine.dsw
index d279b6444..b9a2eb94e 100644
--- a/win32/xine.dsw
+++ b/win32/xine.dsw
@@ -26,9 +26,6 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name libxinesuppt

     End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libxineutils

-    End Project Dependency

 }}}

 

 ###############################################################################

@@ -42,9 +39,6 @@ Package=<5>
 Package=<4>

 {{{

     Begin Project Dependency

-    Project_Dep_Name libxineutils

-    End Project Dependency

-    Begin Project Dependency

     Project_Dep_Name libxinesuppt

     End Project Dependency

 }}}

@@ -63,7 +57,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "libxineutils"=".\libxineutils.dsp" - Package Owner=<4>

+Project: "xineplug_ao_out_directx"=".\xineplug_ao_out_directx.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -72,24 +66,12 @@ Package=<5>
 Package=<4>

 {{{

     Begin Project Dependency

-    Project_Dep_Name libxinesuppt

+    Project_Dep_Name libxine

     End Project Dependency

 }}}

 

 ###############################################################################

 

-Project: "xineplug_ao_out_directx"=".\xineplug_ao_out_directx.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

 Project: "xineplug_decode_a52"=".\xineplug_decode_a52.dsp" - Package Owner=<4>

 

 Package=<5>

@@ -99,10 +81,7 @@ Package=<5>
 Package=<4>

 {{{

     Begin Project Dependency

-    Project_Dep_Name libxinesuppt

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libxineutils

+    Project_Dep_Name libxine

     End Project Dependency

 }}}

 

@@ -117,10 +96,7 @@ Package=<5>
 Package=<4>

 {{{

     Begin Project Dependency

-    Project_Dep_Name libxinesuppt

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libxineutils

+    Project_Dep_Name libxine

     End Project Dependency

 }}}

 

@@ -135,10 +111,7 @@ Package=<5>
 Package=<4>

 {{{

     Begin Project Dependency

-    Project_Dep_Name libxinesuppt

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libxineutils

+    Project_Dep_Name libxine

     End Project Dependency

 }}}

 

@@ -153,10 +126,7 @@ Package=<5>
 Package=<4>

 {{{

     Begin Project Dependency

-    Project_Dep_Name libxinesuppt

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libxineutils

+    Project_Dep_Name libxine

     End Project Dependency

 }}}

 

@@ -171,14 +141,8 @@ Package=<5>
 Package=<4>

 {{{

     Begin Project Dependency

-    Project_Dep_Name libxinesuppt

-    End Project Dependency

-    Begin Project Dependency

     Project_Dep_Name libxine

     End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libxineutils

-    End Project Dependency

 }}}

 

 ###############################################################################

@@ -194,12 +158,6 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name libxine

     End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libxinesuppt

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libxineutils

-    End Project Dependency

 }}}

 

 ###############################################################################

@@ -218,9 +176,6 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name libxine

     End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libxineutils

-    End Project Dependency

 }}}

 

 ###############################################################################

@@ -234,13 +189,10 @@ Package=<5>
 Package=<4>

 {{{

     Begin Project Dependency

-    Project_Dep_Name libxine

-    End Project Dependency

-    Begin Project Dependency

     Project_Dep_Name libxinesuppt

     End Project Dependency

     Begin Project Dependency

-    Project_Dep_Name libxineutils

+    Project_Dep_Name libxine

     End Project Dependency

 }}}

 

@@ -257,12 +209,6 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name libxine

     End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libxinesuppt

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libxineutils

-    End Project Dependency

 }}}

 

 ###############################################################################

@@ -276,12 +222,6 @@ Package=<5>
 Package=<4>

 {{{

     Begin Project Dependency

-    Project_Dep_Name libxinesuppt

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libxineutils

-    End Project Dependency

-    Begin Project Dependency

     Project_Dep_Name libxine

     End Project Dependency

 }}}

@@ -299,12 +239,6 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name libxine

     End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libxinesuppt

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libxineutils

-    End Project Dependency

 }}}

 

 ###############################################################################

@@ -318,12 +252,6 @@ Package=<5>
 Package=<4>

 {{{

     Begin Project Dependency

-    Project_Dep_Name libxinesuppt

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libxineutils

-    End Project Dependency

-    Begin Project Dependency

     Project_Dep_Name libxine

     End Project Dependency

 }}}

@@ -338,6 +266,9 @@ Package=<5>
 

 Package=<4>

 {{{

+    Begin Project Dependency

+    Project_Dep_Name libxine

+    End Project Dependency

 }}}

 

 ###############################################################################

@@ -351,14 +282,8 @@ Package=<5>
 Package=<4>

 {{{

     Begin Project Dependency

-    Project_Dep_Name libxinesuppt

-    End Project Dependency

-    Begin Project Dependency

     Project_Dep_Name libxine

     End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libxineutils

-    End Project Dependency

 }}}

 

 ###############################################################################

@@ -372,14 +297,8 @@ Package=<5>
 Package=<4>

 {{{

     Begin Project Dependency

-    Project_Dep_Name libxinesuppt

-    End Project Dependency

-    Begin Project Dependency

     Project_Dep_Name libxine

     End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libxineutils

-    End Project Dependency

 }}}

 

 ###############################################################################

@@ -395,12 +314,6 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name libxine

     End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libxinesuppt

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libxineutils

-    End Project Dependency

 }}}

 

 ###############################################################################

@@ -414,14 +327,8 @@ Package=<5>
 Package=<4>

 {{{

     Begin Project Dependency

-    Project_Dep_Name libxinesuppt

-    End Project Dependency

-    Begin Project Dependency

     Project_Dep_Name libxine

     End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libxineutils

-    End Project Dependency

 }}}

 

 ###############################################################################

@@ -437,12 +344,6 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name libxine

     End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libxinesuppt

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libxineutils

-    End Project Dependency

 }}}

 

 ###############################################################################

@@ -458,12 +359,6 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name libxine

     End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libxinesuppt

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libxineutils

-    End Project Dependency

 }}}

 

 ###############################################################################

@@ -479,12 +374,6 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name libxine

     End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libxinesuppt

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libxineutils

-    End Project Dependency

 }}}

 

 ###############################################################################

@@ -500,12 +389,6 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name libxine

     End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libxinesuppt

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libxineutils

-    End Project Dependency

 }}}

 

 ###############################################################################

@@ -521,12 +404,6 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name libxine

     End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libxinesuppt

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libxineutils

-    End Project Dependency

 }}}

 

 ###############################################################################

@@ -542,12 +419,6 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name libxine

     End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libxinesuppt

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libxineutils

-    End Project Dependency

 }}}

 

 ###############################################################################

@@ -563,12 +434,6 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name libxine

     End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libxinesuppt

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libxineutils

-    End Project Dependency

 }}}

 

 ###############################################################################

@@ -582,13 +447,10 @@ Package=<5>
 Package=<4>

 {{{

     Begin Project Dependency

-    Project_Dep_Name libxine

-    End Project Dependency

-    Begin Project Dependency

     Project_Dep_Name libxinesuppt

     End Project Dependency

     Begin Project Dependency

-    Project_Dep_Name libxineutils

+    Project_Dep_Name libxine

     End Project Dependency

 }}}

 

@@ -606,12 +468,6 @@ Package=<4>
     Project_Dep_Name libxine

     End Project Dependency

     Begin Project Dependency

-    Project_Dep_Name libxinesuppt

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libxineutils

-    End Project Dependency

-    Begin Project Dependency

     Project_Dep_Name libdvdnav

     End Project Dependency

 }}}

@@ -632,9 +488,6 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name libxine

     End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libxineutils

-    End Project Dependency

 }}}

 

 ###############################################################################

@@ -648,13 +501,10 @@ Package=<5>
 Package=<4>

 {{{

     Begin Project Dependency

-    Project_Dep_Name libxine

-    End Project Dependency

-    Begin Project Dependency

     Project_Dep_Name libxinesuppt

     End Project Dependency

     Begin Project Dependency

-    Project_Dep_Name libxineutils

+    Project_Dep_Name libxine

     End Project Dependency

 }}}

 

@@ -669,13 +519,10 @@ Package=<5>
 Package=<4>

 {{{

     Begin Project Dependency

-    Project_Dep_Name libxine

-    End Project Dependency

-    Begin Project Dependency

     Project_Dep_Name libxinesuppt

     End Project Dependency

     Begin Project Dependency

-    Project_Dep_Name libxineutils

+    Project_Dep_Name libxine

     End Project Dependency

 }}}

 

@@ -690,7 +537,7 @@ Package=<5>
 Package=<4>

 {{{

     Begin Project Dependency

-    Project_Dep_Name libxineutils

+    Project_Dep_Name libxine

     End Project Dependency

 }}}

 

@@ -705,9 +552,6 @@ Package=<5>
 Package=<4>

 {{{

     Begin Project Dependency

-    Project_Dep_Name libxineutils

-    End Project Dependency

-    Begin Project Dependency

     Project_Dep_Name libxine

     End Project Dependency

     Begin Project Dependency

@@ -731,9 +575,6 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name libxinesuppt

     End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libxineutils

-    End Project Dependency

 }}}

 

 ###############################################################################

diff --git a/win32/xineplug_dmx_audio.dsp b/win32/xineplug_dmx_audio.dsp
index 8b55ab81a..02f010fe9 100755
--- a/win32/xineplug_dmx_audio.dsp
+++ b/win32/xineplug_dmx_audio.dsp
@@ -140,6 +140,10 @@ SOURCE=..\src\demuxers\demux_wav.c
 

 SOURCE=..\src\demuxers\group_audio.c

 # End Source File

+# Begin Source File

+

+SOURCE=..\src\demuxers\id3.c

+# End Source File

 # End Group

 # Begin Group "Dll Defs"

 

diff --git a/win32/xineplug_inp_http.dsp b/win32/xineplug_inp_http.dsp
index 5a76de478..a0160ae3c 100755
--- a/win32/xineplug_inp_http.dsp
+++ b/win32/xineplug_inp_http.dsp
@@ -95,6 +95,10 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

 # Begin Source File

 

+SOURCE=..\src\input\http_helper.c

+# End Source File

+# Begin Source File

+

 SOURCE=..\src\input\input_http.c

 # End Source File

 # Begin Source File