* 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.

diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c
index a89a89958f0957f61f334cf649f07f2603a0a543..c94b3b262624a28e7d073c1628ebaaf2ddd9d567 100644 (file)
--- a/modules/audio_output/alsa.c
+++ b/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();
 

diff --git a/modules/gui/skins/parser/skin.act b/modules/gui/skins/parser/skin.act
index f7c14368f4e7a1089073f8b769b11f3d512e55ed..ad319510812b1a3fe93813fac39a7e40503cf9c8 100644 (file)
--- a/modules/gui/skins/parser/skin.act
+++ b/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 Teulière <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">

diff --git a/modules/gui/skins/parser/skin.c b/modules/gui/skins/parser/skin.c
index 0601bb4af2f59db927deca7b0a47f46f94857b75..b58c9396d2c22107f10b497aa3f5efa90aefb6d4 100644 (file)
--- a/modules/gui/skins/parser/skin.c
+++ b/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)

diff --git a/modules/gui/skins/src/skin_main.cpp b/modules/gui/skins/src/skin_main.cpp
index b18965b3070ffefd0736a3b1c4118ec46f712f6b..142ecea06f9c2af820279358d6f85d7fd5ee85b2 100644 (file)
--- a/modules/gui/skins/src/skin_main.cpp
+++ b/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 Teulière <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();
 
 

diff --git a/src/misc/configuration.c b/src/misc/configuration.c
index a24da6a091493a65e7b288fff3f1edcc94eccf10..4990fdf9b68de0e643b00a16180b0c8788ba4006 100644 (file)
--- a/src/misc/configuration.c
+++ b/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;
         }
     }