* configure.ac: alsa is now really default enabled

* modules/demux/*: typo and user-friendly description
* modules/access/*: less vlc warnings
* modules/codec/subsdec.c: subtitles justification is no longer "advanced"

diff --git a/configure.ac b/configure.ac
index e3834b561965cd5fb66c3877b14af63167907fb8..49b6ea2731e1e9e49461e86bdb839b8b6f26d606 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3343,25 +3343,25 @@ dnl
 dnl  ALSA module
 dnl
 AC_ARG_ENABLE(alsa,
-  [  --enable-alsa           ALSA sound support for Linux (default enabled)],
-  [if test "${enable_alsa}" != "no"
-   then
-     AC_CHECK_HEADER(alsa/asoundlib.h, AC_CHECK_LIB(asound, main, have_alsa="true", have_alsa="false"),have_alsa="false")
-     if test "${have_alsa}" = "true"
-     then
-       AC_TRY_COMPILE([#define ALSA_PCM_NEW_HW_PARAMS_API
-                       #define ALSA_PCM_NEW_SW_PARAMS_API
-                       #include <alsa/asoundlib.h>],
-          [void foo() { snd_pcm_hw_params_get_period_time(0,0,0); }],
-           AC_DEFINE(HAVE_ALSA_NEW_API, 1, Define if ALSA is at least rc4))
-       VLC_ADD_PLUGINS([alsa])
-       VLC_ADD_LDFLAGS([alsa],[-lasound -lm -ldl])
-     else
-       if test "${enable_alsa}" = "yes"; then
-         AC_MSG_ERROR([Could not find ALSA development headers])
-       fi
-     fi
-   fi])
+  [  --enable-alsa           ALSA sound support for Linux (default enabled)])
+if test "${enable_alsa}" != "no"
+then
+  AC_CHECK_HEADER(alsa/asoundlib.h, AC_CHECK_LIB(asound, main, have_alsa="true", have_alsa="false"),have_alsa="false")
+  if test "${have_alsa}" = "true"
+  then
+    AC_TRY_COMPILE([#define ALSA_PCM_NEW_HW_PARAMS_API
+                    #define ALSA_PCM_NEW_SW_PARAMS_API
+                    #include <alsa/asoundlib.h>],
+       [void foo() { snd_pcm_hw_params_get_period_time(0,0,0); }],
+        AC_DEFINE(HAVE_ALSA_NEW_API, 1, Define if ALSA is at least rc4))
+    VLC_ADD_PLUGINS([alsa])
+    VLC_ADD_LDFLAGS([alsa],[-lasound -lm -ldl])
+  else
+    if test "${enable_alsa}" = "yes"; then
+      AC_MSG_ERROR([Could not find ALSA development headers])
+    fi
+  fi
+fi
 
 dnl
 dnl  win32 waveOut plugin

diff --git a/modules/access/file.c b/modules/access/file.c
index 841e18c7ec05d4a8f2012c34d698071655f4ea54..ebbc63b6445f06c374a9fcff45ad46703a8cc130 100644 (file)
--- a/modules/access/file.c
+++ b/modules/access/file.c
@@ -557,6 +557,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
         case ACCESS_SET_TITLE:
         case ACCESS_SET_SEEKPOINT:
         case ACCESS_SET_PRIVATE_ID_STATE:
+        case ACCESS_GET_META:
             return VLC_EGENERIC;
 
         default:

diff --git a/modules/access/vcd/vcd.c b/modules/access/vcd/vcd.c
index 68b753feb085b0e6a3cc5fa03d58c2b55e762c54..dfbb1e8b0fef185e947d3deddfe22655d5a19fae 100644 (file)
--- a/modules/access/vcd/vcd.c
+++ b/modules/access/vcd/vcd.c
@@ -127,7 +127,6 @@ static int Open( vlc_object_t *p_this )
     /* Open VCD */
     if( !(vcddev = ioctl_Open( p_this, psz_dup )) )
     {
-        msg_Warn( p_access, "could not open %s", psz_dup );
         free( psz_dup );
         return VLC_EGENERIC;
     }

diff --git a/modules/access/vcdx/access.c b/modules/access/vcdx/access.c
index 6efbf4860d6752ffc8acfdce748acd9fdc47ee82..0c377fe3fe0591d249cd2c3833b000b20bcacdf6 100644 (file)
--- a/modules/access/vcdx/access.c
+++ b/modules/access/vcdx/access.c
@@ -914,7 +914,6 @@ VCDOpen ( vlc_object_t *p_this )
 
     if( !(p_vcdplayer->vcd = vcd_Open( p_this, psz_source )) )
     {
-        msg_Warn( p_access, "could not open %s", psz_source );
         goto err_exit;
     }
 

diff --git a/modules/codec/subsdec.c b/modules/codec/subsdec.c
index ec45295d1ea37cb31d9401640c91cf5f87bfc562..4c17f8f304a2f1cb7eaf1c20cb7f48a51b6dbb5e 100644 (file)
--- a/modules/codec/subsdec.c
+++ b/modules/codec/subsdec.c
@@ -97,7 +97,7 @@ vlc_module_begin();
     set_subcategory( SUBCAT_INPUT_SCODEC );
 
     add_integer( "subsdec-align", 0, NULL, ALIGN_TEXT, ALIGN_LONGTEXT,
-                 VLC_TRUE );
+                 VLC_FALSE );
         change_integer_list( pi_justification, ppsz_justification_text, 0 );
     add_string( "subsdec-encoding", DEFAULT_NAME, NULL,
                 ENCODING_TEXT, ENCODING_LONGTEXT, VLC_FALSE );

diff --git a/modules/demux/mjpeg.c b/modules/demux/mjpeg.c
index 435a21bb256df73c17dc7e8d3fef93e0b33d68b6..00d11959fa59f9d70f08621a41d35263a83a4f66 100644 (file)
--- a/modules/demux/mjpeg.c
+++ b/modules/demux/mjpeg.c
@@ -45,7 +45,7 @@ static void Close( vlc_object_t * );
     "playing from files, use 0 for live.")
 
 vlc_module_begin();
-    set_shortname( "MJEPG");
+    set_shortname( "MJPEG");
     set_description( _("JPEG camera demuxer") );
     set_capability( "demux2", 5 );
     set_callbacks( Open, Close );

diff --git a/modules/demux/ts.c b/modules/demux/ts.c
index c7ab9f9858fea3a2974caf3250405b6f4f71c314..e0c5373fe7d382528757fbc166324c7a29d171c4 100644 (file)
--- a/modules/demux/ts.c
+++ b/modules/demux/ts.c
@@ -87,7 +87,7 @@ static void Close ( vlc_object_t * );
 #define CAPMT_SYSID_LONGTEXT N_("only forward descriptors from this SysID to the CAM")
 
 vlc_module_begin();
-    set_description( _("ISO 13818-1 MPEG Transport Stream input - new" ) );
+    set_description( _("MPEG Transport Stream demuxer") );
     set_shortname ( _("MPEG-TS") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );