* ./modules/audio_output/waveout.c: audio output now works under WinCE

    using the waveout module.
  * ./bootstrap: we ignore comments when parsing makefiles.
  * ./modules/audio_filter/converter/fixed32tofloat32.c: changed this module
    so that it also does float32tofixed32.
  * ./modules/*: ported a few other modules to WinCE (most of the time it's
    just a #include <errno.h> that needs to be removed).

diff --git a/bootstrap b/bootstrap
index f2c2dff2d62f14e10559c9db0babd2f7d739933c..3f13a3ba84c925533c63d8f645bb020e59a6ff03 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 ##  bootstrap file for vlc, the VideoLAN Client
-##  $Id: bootstrap,v 1.30 2002/11/20 08:58:20 sam Exp $
+##  $Id: bootstrap,v 1.31 2002/11/20 16:43:32 sam Exp $
 ##
 ##  Authors: Samuel Hocevar <sam@zoy.org>
 
@@ -204,7 +204,7 @@ EOF
     # this is an attempt at getting a list of plugin sources... we take the
     # production and remove everything that does not contain "module", which
     # means you miss $(NULL), but other variables too.
-    cfiles=`awk 'BEGIN{a=0}{if(!a&&/^SOURCES_'${plugin}'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < ${makefile} | tr '\\ ' '\n\n' | sed -ne 's,/,\\\\,g; s/.*modules/modules/p'`
+    cfiles=`grep -v '[^-_a-zA-Z0-9]*#' ${makefile} | awk 'BEGIN{a=0}{if(!a&&/^SOURCES_'${plugin}'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' | tr '\\ ' '\n\n' | sed -ne 's,/,\\\\,g; s/.*modules/modules/p'`
     hfiles=`for i in ${cfiles} ; do echo $i ; done | grep '\.h$'`
     cfiles=`for i in ${cfiles} ; do echo $i ; done | grep -v '\.h$'`
     for dir in evc msvc

diff --git a/evc/vlc.c b/evc/vlc.c
index fe9334730953775c6dda4da00f1d1e6d91b5200d..e9c0bbb544c21cd753fef470248b8c58cd38fb68 100644 (file)
--- a/evc/vlc.c
+++ b/evc/vlc.c
@@ -2,7 +2,7 @@
  * vlc.c: the vlc player, WinCE version
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: vlc.c,v 1.3 2002/11/20 13:37:35 sam Exp $
+ * $Id: vlc.c,v 1.4 2002/11/20 16:43:32 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -53,7 +53,7 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
 {
     int    i_ret;
     int    i_argc = 5;
-    char * ppsz_argv[] = { lpCmdLine, "-vv", "--intf", "dummy", "shovel.mpeg", NULL };
+    char * ppsz_argv[] = { lpCmdLine, "-vv", "--intf", "dummy", "shovel.mpeg", /*"washington.mpeg",*/ NULL };
     HWND   window;
     MSG    message;
 

diff --git a/evc/vlc.vcw b/evc/vlc.vcw
index 4a971467a2157ed39886e89743ade429391f8ad7..78ab4dbbfc892a06f54b5e11a1a5afe424281725 100644 (file)
--- a/evc/vlc.vcw
+++ b/evc/vlc.vcw
@@ -75,6 +75,30 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
+Project: "plugin_fixed32tofloat32"=.\plugin_fixed32tofloat32.vcp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "plugin_fixed32tos16"=.\plugin_fixed32tos16.vcp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
 Project: "plugin_i420_rgb"=.\plugin_i420_rgb.vcp - Package Owner=<4>\r
 \r
 Package=<5>\r
@@ -147,6 +171,18 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
+Project: "plugin_linear_resampler"=.\plugin_linear_resampler.vcp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
 Project: "plugin_memcpy"=.\plugin_memcpy.vcp - Package Owner=<4>\r
 \r
 Package=<5>\r
@@ -231,6 +267,42 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
+Project: "plugin_trivial_channel_mixer"=.\plugin_trivial_channel_mixer.vcp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "plugin_trivial_mixer"=.\plugin_trivial_mixer.vcp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "plugin_trivial_resampler"=.\plugin_trivial_resampler.vcp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
 Project: "plugin_ts"=.\plugin_ts.vcp - Package Owner=<4>\r
 \r
 Package=<5>\r
@@ -243,6 +315,30 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
+Project: "plugin_vout_directx"=.\plugin_vout_directx.vcp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "plugin_waveout"=.\plugin_waveout.vcp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
 Project: "vlc"=.\vlc.vcp - Package Owner=<4>\r
 \r
 Package=<5>\r

diff --git a/modules/audio_filter/channel_mixer/trivial.c b/modules/audio_filter/channel_mixer/trivial.c
index dccc057afce78877d4959ff5cb4931d3b199147b..9d25c30cdd6e0e71b063826c51ef0beed07d4c30 100644 (file)
--- a/modules/audio_filter/channel_mixer/trivial.c
+++ b/modules/audio_filter/channel_mixer/trivial.c
@@ -2,7 +2,7 @@
  * trivial.c : trivial channel mixer plug-in (drops unwanted channels)
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: trivial.c,v 1.6 2002/11/14 22:38:46 massiot Exp $
+ * $Id: trivial.c,v 1.7 2002/11/20 16:43:32 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -24,7 +24,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <errno.h>
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>
 

diff --git a/modules/audio_filter/converter/fixed32tofloat32.c b/modules/audio_filter/converter/fixed32tofloat32.c
index c95fafdc2a90b971397ce8d96b7a8f5d61fd18be..7f1151d9a8f4fc6d722cb91d86a4a297803e002b 100644 (file)
--- a/modules/audio_filter/converter/fixed32tofloat32.c
+++ b/modules/audio_filter/converter/fixed32tofloat32.c
@@ -2,7 +2,7 @@
  * fixed32float32.c : converter from fixed32 to float32 bits integer
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: fixed32tofloat32.c,v 1.10 2002/10/15 23:10:54 massiot Exp $
+ * $Id: fixed32tofloat32.c,v 1.11 2002/11/20 16:43:32 sam Exp $
  *
  * Authors: Jean-Paul Saman <jpsaman@wxs.nl>
  *
@@ -24,7 +24,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <errno.h>
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>
 
@@ -35,16 +34,18 @@
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
-static int  Create    ( vlc_object_t * );
+static int  Create       ( vlc_object_t * );
 
-static void DoWork    ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
-                        aout_buffer_t * );
+static void FixedToFloat ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
+                           aout_buffer_t * );
+static void FloatToFixed ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
+                           aout_buffer_t * );
 
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
-    set_description( _("audio filter for fixed32->float32 conversion") );
+    set_description( _("audio filter for fixed32<->float32 conversion") );
     set_capability( "audio filter", 10 );
     set_callbacks( Create, NULL );
 vlc_module_end();
@@ -58,8 +59,10 @@ static int Create( vlc_object_t *p_this )
 {
     aout_filter_t * p_filter = (aout_filter_t *)p_this;
 
-    if ( p_filter->input.i_format != VLC_FOURCC('f','i','3','2')
-          || p_filter->output.i_format != VLC_FOURCC('f','l','3','2') )
+    if( ( p_filter->input.i_format != VLC_FOURCC('f','i','3','2')
+           || p_filter->output.i_format != VLC_FOURCC('f','l','3','2') )
+      && ( p_filter->input.i_format != VLC_FOURCC('f','l','3','2')
+            || p_filter->output.i_format != VLC_FOURCC('f','i','3','2') ) )
     {
         return -1;
     }
@@ -69,17 +72,25 @@ static int Create( vlc_object_t *p_this )
         return -1;
     }
 
-    p_filter->pf_do_work = DoWork;
+    if( p_filter->input.i_format == VLC_FOURCC('f','i','3','2') )
+    {
+        p_filter->pf_do_work = FixedToFloat;
+    }
+    else
+    {
+        p_filter->pf_do_work = FloatToFixed;
+    }
+
     p_filter->b_in_place = 1;
 
     return 0;
 }
 
 /*****************************************************************************
- * DoWork: convert a buffer
+ * FixedToFloat: convert a buffer
  *****************************************************************************/
-static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
-                    aout_buffer_t * p_in_buf, aout_buffer_t * p_out_buf )
+static void FixedToFloat( aout_instance_t * p_aout, aout_filter_t * p_filter,
+                          aout_buffer_t * p_in_buf, aout_buffer_t * p_out_buf )
 {
     int i;
     vlc_fixed_t * p_in = (vlc_fixed_t *)p_in_buf->p_buffer;
@@ -95,3 +106,23 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
     p_out_buf->i_nb_bytes = p_in_buf->i_nb_bytes;
 }
 
+/*****************************************************************************
+ * FloatToFixed: convert a buffer
+ *****************************************************************************/
+static void FloatToFixed( aout_instance_t * p_aout, aout_filter_t * p_filter,
+                          aout_buffer_t * p_in_buf, aout_buffer_t * p_out_buf )
+{
+    int i;
+    float * p_in = (float *)p_in_buf->p_buffer;
+    vlc_fixed_t * p_out = (vlc_fixed_t *)p_out_buf->p_buffer;
+
+    for ( i = p_in_buf->i_nb_samples
+               * aout_FormatNbChannels( &p_filter->input ) ; i-- ; )
+    {
+        *p_out++ = (vlc_fixed_t)( *p_in++ * (float)FIXED32_ONE );
+    }
+
+    p_out_buf->i_nb_samples = p_in_buf->i_nb_samples;
+    p_out_buf->i_nb_bytes = p_in_buf->i_nb_bytes;
+}
+

diff --git a/modules/audio_filter/converter/fixed32tos16.c b/modules/audio_filter/converter/fixed32tos16.c
index 2095a51c5a36ce815615d82f24b01b3d30213308..19afddab654efd3ce12d4d2983f1c023596f53bc 100644 (file)
--- a/modules/audio_filter/converter/fixed32tos16.c
+++ b/modules/audio_filter/converter/fixed32tos16.c
@@ -2,7 +2,7 @@
  * fixed32tos16.c : converter from fixed32 to signed 16 bits integer
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: fixed32tos16.c,v 1.7 2002/10/15 23:10:54 massiot Exp $
+ * $Id: fixed32tos16.c,v 1.8 2002/11/20 16:43:32 sam Exp $
  *
  * Authors: Jean-Paul Saman <jpsaman@wxs.nl>
  *
@@ -24,7 +24,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <errno.h>
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>
 

diff --git a/modules/audio_filter/converter/float32tos16.c b/modules/audio_filter/converter/float32tos16.c
index 7cd0eb5da3186eca66c5bc1494e04873f0cc3cee..f5254684df77b4633c0ffdb81ebc9e9c780ce459 100644 (file)
--- a/modules/audio_filter/converter/float32tos16.c
+++ b/modules/audio_filter/converter/float32tos16.c
@@ -2,7 +2,7 @@
  * float32tos16.c : converter from float32 to signed 16 bits integer
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: float32tos16.c,v 1.11 2002/10/15 23:10:54 massiot Exp $
+ * $Id: float32tos16.c,v 1.12 2002/11/20 16:43:32 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -24,7 +24,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <errno.h>
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>
 

diff --git a/modules/audio_filter/converter/float32tos8.c b/modules/audio_filter/converter/float32tos8.c
index cf635228dab6e7b9fb8af1019e2b7eaa8f7495d4..06d30eef4d3d6e1ac53753f60866fadba0b779b1 100644 (file)
--- a/modules/audio_filter/converter/float32tos8.c
+++ b/modules/audio_filter/converter/float32tos8.c
@@ -2,7 +2,7 @@
  * float32tos8.c : converter from float32 to signed 8 bits integer
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: float32tos8.c,v 1.6 2002/10/15 23:10:54 massiot Exp $
+ * $Id: float32tos8.c,v 1.7 2002/11/20 16:43:32 sam Exp $
  *
  * Authors: Xavier Maillard <zedek@fxgsproject.org>
  *
@@ -24,7 +24,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <errno.h>
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>
 

diff --git a/modules/audio_filter/converter/float32tou16.c b/modules/audio_filter/converter/float32tou16.c
index cd78a50116b839f26c7315bcdb974aeaa20d8615..5af35da75aa7855d725b80c3127c51a875ae5f10 100644 (file)
--- a/modules/audio_filter/converter/float32tou16.c
+++ b/modules/audio_filter/converter/float32tou16.c
@@ -2,7 +2,7 @@
  * float32tou16.c : converter from float32 to unsigned 16 bits integer
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: float32tou16.c,v 1.6 2002/10/15 23:10:54 massiot Exp $
+ * $Id: float32tou16.c,v 1.7 2002/11/20 16:43:32 sam Exp $
  *
  * Authors: Xavier Maillard <zedek@fxgsproject.org>
  *
@@ -24,7 +24,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <errno.h>
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>
 

diff --git a/modules/audio_filter/converter/float32tou8.c b/modules/audio_filter/converter/float32tou8.c
index 477ab130a30fbda38b845e505dbca3e9b3f8b1c4..5567818b593752e401d6510787073b4fe1d585e9 100644 (file)
--- a/modules/audio_filter/converter/float32tou8.c
+++ b/modules/audio_filter/converter/float32tou8.c
@@ -2,7 +2,7 @@
  * float32tou8.c : converter from float32 to unsigned 8 bits integer
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: float32tou8.c,v 1.6 2002/10/15 23:10:54 massiot Exp $
+ * $Id: float32tou8.c,v 1.7 2002/11/20 16:43:32 sam Exp $
  *
  * Authors: Xavier Maillard <zedek@fxgsproject.org>
  *
@@ -24,7 +24,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <errno.h>
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>
 

diff --git a/modules/audio_filter/converter/s16tofloat32.c b/modules/audio_filter/converter/s16tofloat32.c
index ef4a85f27765708a6f3e7bfa4edd33a85ede70de..5b7f75f471aa0c9ec89632e28fe7760b8e2aef5f 100644 (file)
--- a/modules/audio_filter/converter/s16tofloat32.c
+++ b/modules/audio_filter/converter/s16tofloat32.c
@@ -2,7 +2,7 @@
  * s16tofloat32.c : converter from signed 16 bits integer to float32
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: s16tofloat32.c,v 1.4 2002/10/15 23:10:54 massiot Exp $
+ * $Id: s16tofloat32.c,v 1.5 2002/11/20 16:43:32 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -24,7 +24,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <errno.h>
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>
 

diff --git a/modules/audio_filter/converter/s16tofloat32swab.c b/modules/audio_filter/converter/s16tofloat32swab.c
index cebfbea2bddea9fc928c648fcff6bc91e4c1ddaf..615e389612e8d6c5ec9f384b779674f237178b88 100644 (file)
--- a/modules/audio_filter/converter/s16tofloat32swab.c
+++ b/modules/audio_filter/converter/s16tofloat32swab.c
@@ -3,7 +3,7 @@
  *                      with endianness change
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: s16tofloat32swab.c,v 1.7 2002/10/15 23:10:54 massiot Exp $
+ * $Id: s16tofloat32swab.c,v 1.8 2002/11/20 16:43:32 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Henri Fallon <henri@videolan.org>
@@ -26,7 +26,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <errno.h>
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>
 

diff --git a/modules/audio_filter/converter/s8tofloat32.c b/modules/audio_filter/converter/s8tofloat32.c
index 9454db8c36f9b389dd7680e85d3fa88015171d1b..0ee3a6dd0459921a4c6f0d2e6953ae64536fec72 100644 (file)
--- a/modules/audio_filter/converter/s8tofloat32.c
+++ b/modules/audio_filter/converter/s8tofloat32.c
@@ -2,7 +2,7 @@
  * s8tofloat32.c : converter from signed 8 bits integer to float32.
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: s8tofloat32.c,v 1.1 2002/11/08 14:23:49 gbazin Exp $
+ * $Id: s8tofloat32.c,v 1.2 2002/11/20 16:43:32 sam Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -24,7 +24,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <errno.h>
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>
 

diff --git a/modules/audio_filter/converter/u8tofloat32.c b/modules/audio_filter/converter/u8tofloat32.c
index 8736a5cec0c54d265291f240eed2a6c1a3164451..9957a499bb59a3eb33b2dc6ecb5136aac3555b58 100644 (file)
--- a/modules/audio_filter/converter/u8tofloat32.c
+++ b/modules/audio_filter/converter/u8tofloat32.c
@@ -2,7 +2,7 @@
  * u8tofloat32.c : converter from unsigned 8 bits integer to float32.
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: u8tofloat32.c,v 1.2 2002/11/18 15:19:26 gbazin Exp $
+ * $Id: u8tofloat32.c,v 1.3 2002/11/20 16:43:32 sam Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -24,7 +24,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <errno.h>
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>
 

diff --git a/modules/audio_filter/resampler/linear.c b/modules/audio_filter/resampler/linear.c
index 5d61ca479eceffb4d1dd016cf1f4793802f91047..cc2005f93c59e6f08e5780c53f0f571a603416f3 100644 (file)
--- a/modules/audio_filter/resampler/linear.c
+++ b/modules/audio_filter/resampler/linear.c
@@ -2,7 +2,7 @@
  * linear.c : linear interpolation resampler
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: linear.c,v 1.5 2002/11/15 00:41:00 gbazin Exp $
+ * $Id: linear.c,v 1.6 2002/11/20 16:43:32 sam Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *          Sigmund Augdal <sigmunau@idi.ntnu.no>
@@ -25,7 +25,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <errno.h>
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>
 

diff --git a/modules/audio_filter/resampler/trivial.c b/modules/audio_filter/resampler/trivial.c
index 416f4f895f73112f59c97a6d0c055258eb05eb65..8cdf58b90032f41765e34407c8021bca94f3c55c 100644 (file)
--- a/modules/audio_filter/resampler/trivial.c
+++ b/modules/audio_filter/resampler/trivial.c
@@ -2,7 +2,7 @@
  * trivial.c : trivial resampler (skips samples or pads with zeroes)
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: trivial.c,v 1.9 2002/11/14 22:38:46 massiot Exp $
+ * $Id: trivial.c,v 1.10 2002/11/20 16:43:32 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -24,7 +24,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <errno.h>
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>
 

diff --git a/modules/audio_filter/resampler/ugly.c b/modules/audio_filter/resampler/ugly.c
index 035b998749d7f8b92b816defc1118a1ef4a4513f..880bb511ae68c41b19725c15fabddd8b1d81ad91 100644 (file)
--- a/modules/audio_filter/resampler/ugly.c
+++ b/modules/audio_filter/resampler/ugly.c
@@ -2,7 +2,7 @@
  * ugly.c : ugly resampler (changes pitch)
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: ugly.c,v 1.6 2002/11/14 22:38:46 massiot Exp $
+ * $Id: ugly.c,v 1.7 2002/11/20 16:43:32 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -24,7 +24,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <errno.h>
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>
 

diff --git a/modules/audio_mixer/float32.c b/modules/audio_mixer/float32.c
index 84b4fc2eeb63c5007afc0cd6948faf99d0cb6d34..a9e7084d32891d9b9c016ef475aa102c1ba4fcd8 100644 (file)
--- a/modules/audio_mixer/float32.c
+++ b/modules/audio_mixer/float32.c
@@ -2,7 +2,7 @@
  * float32.c : precise float32 audio mixer implementation
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: float32.c,v 1.7 2002/11/14 22:38:47 massiot Exp $
+ * $Id: float32.c,v 1.8 2002/11/20 16:43:33 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -24,7 +24,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <errno.h>
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>
 

diff --git a/modules/audio_mixer/spdif.c b/modules/audio_mixer/spdif.c
index de662b6e79c431e1e98601ff1ce897a23e1ed3b5..1ac2cad76762446326e9c44c3cdafc29a60542bd 100644 (file)
--- a/modules/audio_mixer/spdif.c
+++ b/modules/audio_mixer/spdif.c
@@ -2,7 +2,7 @@
  * spdif.c : dummy mixer for S/PDIF output (1 input only)
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: spdif.c,v 1.7 2002/09/28 13:05:16 massiot Exp $
+ * $Id: spdif.c,v 1.8 2002/11/20 16:43:33 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -24,7 +24,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <errno.h>
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>
 

diff --git a/modules/audio_mixer/trivial.c b/modules/audio_mixer/trivial.c
index 809620cd68de2939193fd10b06556993358e707c..8a160768afcf6700c1f67ac7ee36bdc8aa17a16f 100644 (file)
--- a/modules/audio_mixer/trivial.c
+++ b/modules/audio_mixer/trivial.c
@@ -2,7 +2,7 @@
  * trivial.c : trivial mixer plug-in (1 input, no downmixing)
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: trivial.c,v 1.10 2002/10/15 23:10:54 massiot Exp $
+ * $Id: trivial.c,v 1.11 2002/11/20 16:43:33 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -24,7 +24,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <errno.h>
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>
 

diff --git a/modules/audio_output/waveout.c b/modules/audio_output/waveout.c
index 34cd18c5226c88c2921743de36e278d19b2ae5ee..797f7e965838f3efedf5d9d78530a271c3966a26 100644 (file)
--- a/modules/audio_output/waveout.c
+++ b/modules/audio_output/waveout.c
@@ -2,7 +2,7 @@
  * waveout.c : Windows waveOut plugin for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: waveout.c,v 1.11 2002/11/15 16:27:10 gbazin Exp $
+ * $Id: waveout.c,v 1.12 2002/11/20 16:43:33 sam Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *      
@@ -24,10 +24,7 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <errno.h>                                                 /* ENOMEM */
-#include <fcntl.h>                                       /* open(), O_WRONLY */
 #include <string.h>                                            /* strerror() */
-
 #include <stdlib.h>                            /* calloc(), malloc(), free() */
 
 #include <vlc/vlc.h>
@@ -152,13 +149,22 @@ static int Open( vlc_object_t *p_this )
     p_aout->output.p_sys->i_buffer_size = FRAME_SIZE *
                                       p_aout->output.output.i_bytes_per_frame;
     /* Allocate silence buffer */
+#ifndef UNDER_CE
     p_aout->output.p_sys->p_silence_buffer =
         calloc( p_aout->output.p_sys->i_buffer_size, 1 );
+#else
+    p_aout->output.p_sys->p_silence_buffer =
+        malloc( p_aout->output.p_sys->i_buffer_size );
+#endif
     if( p_aout->output.p_sys->p_silence_buffer == NULL )
     {
         msg_Err( p_aout, "out of memory" );
         return 1;
     }
+#ifdef UNDER_CE
+    memset( p_aout->output.p_sys->p_silence_buffer, 0,
+            p_aout->output.p_sys->i_buffer_size );
+#endif
 
     /* We need to kick off the playback in order to have the callback properly
      * working */
@@ -243,7 +249,11 @@ static int OpenWaveOut( aout_instance_t *p_aout, int i_format,
     /* Open the device */
     result = waveOutOpen( &p_aout->output.p_sys->h_waveout, WAVE_MAPPER,
                           &p_aout->output.p_sys->waveformat,
+#ifndef UNDER_CE
                           (DWORD_PTR)WaveOutCallback, (DWORD_PTR)p_aout,
+#else
+                          (DWORD)WaveOutCallback, (DWORD)p_aout,
+#endif
                           CALLBACK_FUNCTION );
     if( result == WAVERR_BADFORMAT )
     {
@@ -274,7 +284,11 @@ static int PlayWaveOut( aout_instance_t *p_aout, HWAVEOUT h_waveout,
         /* Use silence buffer instead */
         p_waveheader->lpData = p_aout->output.p_sys->p_silence_buffer;
 
+#ifndef UNDER_CE
     p_waveheader->dwUser = (DWORD_PTR)p_buffer;
+#else
+    p_waveheader->dwUser = (DWORD)p_buffer;
+#endif
     p_waveheader->dwBufferLength = p_aout->output.p_sys->i_buffer_size;
     p_waveheader->dwFlags = 0;
 

diff --git a/share/resource.h b/share/resource.h
index fcae52ab57a2b50736a88215d5879f920ec95690..8f40863d64be4181152d44c8208c71206dcc2544 100644 (file)
--- a/share/resource.h
+++ b/share/resource.h
@@ -11,13 +11,20 @@
 #define IDM_FILE_EXIT                   40002\r
 #define IDM_HELP_ABOUT                  40003\r
 #define IDM_PLOP                        40004\r
+#define ID_VIEW_PLAYLIST                40005\r
+#define ID_VIEW_MESSAGES                40006\r
+#define ID_SETTINGS_AUDIO               40007\r
+#define ID_SETTINGS_SUBTITLES           40008\r
+#define ID_SETTINGS                     40011\r
+#define ID_FILE_OPENFILE                40012\r
+#define ID_FILE_NETWORKSTREAM           40013\r
 \r
 // Next default values for new objects\r
 // \r
 #ifdef APSTUDIO_INVOKED\r
 #ifndef APSTUDIO_READONLY_SYMBOLS\r
 #define _APS_NEXT_RESOURCE_VALUE        104\r
-#define _APS_NEXT_COMMAND_VALUE         40005\r
+#define _APS_NEXT_COMMAND_VALUE         40014\r
 #define _APS_NEXT_CONTROL_VALUE         1001\r
 #define _APS_NEXT_SYMED_VALUE           101\r
 #endif\r

diff --git a/share/vlc_wince_rc.rc b/share/vlc_wince_rc.rc
index 442e859d4c2fc4f85e9d019f0b7cf8cd5fd68466..9a8fda9cc8f4f27994060484b9f8dc6710f916ea 100644 (file)
--- a/share/vlc_wince_rc.rc
+++ b/share/vlc_wince_rc.rc
@@ -58,20 +58,35 @@ END
 \r
 /////////////////////////////////////////////////////////////////////////////\r
 //\r
-// Menubar\r
+// Menu\r
 //\r
 \r
 IDM_MENU MENU DISCARDABLE \r
 BEGIN\r
     POPUP "&File"\r
     BEGIN\r
+        MENUITEM "Open File...",                ID_FILE_OPENFILE, GRAYED\r
+        MENUITEM "Network Stream...",           ID_FILE_NETWORKSTREAM\r
+        , GRAYED\r
+        MENUITEM SEPARATOR\r
         MENUITEM "E&xit",                       IDM_FILE_EXIT\r
     END\r
-    MENUITEM "View",                        65535\r
-    MENUITEM "Settings",                    65535\r
+    POPUP "View"\r
+    BEGIN\r
+        MENUITEM "Playlist...",                 ID_VIEW_PLAYLIST, GRAYED\r
+        MENUITEM "Messages...",                 ID_VIEW_MESSAGES, GRAYED\r
+    END\r
+    POPUP "Settings"\r
+    BEGIN\r
+        MENUITEM "Audio",                       ID_SETTINGS_AUDIO, GRAYED\r
+        MENUITEM "Subtitles",                   ID_SETTINGS_SUBTITLES\r
+        , GRAYED\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "Preferences...",              ID_SETTINGS, GRAYED\r
+    END\r
     POPUP "&Help"\r
     BEGIN\r
-        MENUITEM "&About",                      IDM_HELP_ABOUT\r
+        MENUITEM "&About...",                   IDM_HELP_ABOUT\r
     END\r
 END\r
 \r
@@ -81,7 +96,7 @@ END
 // Dialog\r
 //\r
 \r
-IDD_ABOUTBOX DIALOGEX 0, 0, 127, 42\r
+IDD_ABOUTBOX DIALOG DISCARDABLE  0, 0, 127, 42\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 EXSTYLE 0x80000000L\r
 CAPTION "About PocketVLC"\r