* modules/audio_output/alsa.c: alsa is now the default audio output.
* src/misc/configuration.c: removed unnecessary line.
* modules/gui/skins/parser.*: small cosmetic change.

modules/audio_output/alsa.c

@@ -2,7 +2,7 @@
  * alsa.c : alsa plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: alsa.c,v 1.30 2003/07/11 07:13:27 gbazin Exp $
+ * $Id: alsa.c,v 1.31 2003/07/18 20:06:00 gbazin Exp $
  *
  * Authors: Henri Fallon <henri@videolan.org> - Original Author
  *          Jeffrey Baker <jwbaker@acm.org> - Port to ALSA 1.0 API
@@ -98,7 +98,7 @@ vlc_module_begin();
     add_string( "alsadev", DEFAULT_ALSA_DEVICE, aout_FindAndRestart,
                 N_("ALSA device name"), NULL, VLC_FALSE );
     set_description( _("ALSA audio output") );
-    set_capability( "audio output", 50 );
+    set_capability( "audio output", 150 );
     set_callbacks( Open, Close );
 vlc_module_end();
 

modules/gui/skins/parser/skin.act

@@ -4,7 +4,7 @@
  * skin.act: FleXML actions file
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: skin.act,v 1.6 2003/06/11 10:42:34 gbazin Exp $
+ * $Id: skin.act,v 1.7 2003/07/18 20:06:00 gbazin Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -30,7 +30,7 @@
 <actions>
     <top>
         <![CDATA[
-            #include "../parser/wrappers.h"
+            #include "wrappers.h"
         ]]>
     </top>
     <start tag="Bitmap">

modules/gui/skins/parser/skin.c

@@ -28,7 +28,7 @@
 #line 31 "skin.act"
 
         
-            #include "../parser/wrappers.h"
+            #include "wrappers.h"
         
     
 void STag_Bitmap(void)

modules/gui/skins/src/skin_main.cpp

@@ -2,7 +2,7 @@
  * skin-main.cpp: skins plugin for VLC
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: skin_main.cpp,v 1.45 2003/07/17 17:30:40 gbazin Exp $
+ * $Id: skin_main.cpp,v 1.46 2003/07/18 20:06:00 gbazin Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -344,6 +344,7 @@ vlc_module_begin();
     set_description( _("Skinnable Interface") );
     set_capability( "interface", 30 );
     set_callbacks( Open, Close );
+    set_program( "svlc" );
 vlc_module_end();
 
 

src/misc/configuration.c

@@ -2,7 +2,7 @@
  * configuration.c management of the modules configuration
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: configuration.c,v 1.58 2003/06/27 13:38:54 sam Exp $
+ * $Id: configuration.c,v 1.59 2003/07/18 20:06:00 gbazin Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -1294,7 +1294,6 @@ int __config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, char *ppsz_argv[],
 
             free( p_longopts );
             free( psz_shortopts );
-            if( b_ignore_errors ) free( ppsz_argv );
             return -1;
         }
     }