Commit f5961ab3 authored by Anil Daoud's avatar Anil Daoud

* 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"
parent 5522140b
...@@ -3343,25 +3343,25 @@ dnl ...@@ -3343,25 +3343,25 @@ dnl
dnl ALSA module dnl ALSA module
dnl dnl
AC_ARG_ENABLE(alsa, AC_ARG_ENABLE(alsa,
[ --enable-alsa ALSA sound support for Linux (default enabled)], [ --enable-alsa ALSA sound support for Linux (default enabled)])
[if test "${enable_alsa}" != "no" if test "${enable_alsa}" != "no"
then then
AC_CHECK_HEADER(alsa/asoundlib.h, AC_CHECK_LIB(asound, main, have_alsa="true", have_alsa="false"),have_alsa="false") 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" if test "${have_alsa}" = "true"
then then
AC_TRY_COMPILE([#define ALSA_PCM_NEW_HW_PARAMS_API AC_TRY_COMPILE([#define ALSA_PCM_NEW_HW_PARAMS_API
#define ALSA_PCM_NEW_SW_PARAMS_API #define ALSA_PCM_NEW_SW_PARAMS_API
#include <alsa/asoundlib.h>], #include <alsa/asoundlib.h>],
[void foo() { snd_pcm_hw_params_get_period_time(0,0,0); }], [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)) AC_DEFINE(HAVE_ALSA_NEW_API, 1, Define if ALSA is at least rc4))
VLC_ADD_PLUGINS([alsa]) VLC_ADD_PLUGINS([alsa])
VLC_ADD_LDFLAGS([alsa],[-lasound -lm -ldl]) VLC_ADD_LDFLAGS([alsa],[-lasound -lm -ldl])
else else
if test "${enable_alsa}" = "yes"; then if test "${enable_alsa}" = "yes"; then
AC_MSG_ERROR([Could not find ALSA development headers]) AC_MSG_ERROR([Could not find ALSA development headers])
fi fi
fi fi
fi]) fi
dnl dnl
dnl win32 waveOut plugin dnl win32 waveOut plugin
......
...@@ -557,6 +557,7 @@ static int Control( access_t *p_access, int i_query, va_list args ) ...@@ -557,6 +557,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
case ACCESS_SET_TITLE: case ACCESS_SET_TITLE:
case ACCESS_SET_SEEKPOINT: case ACCESS_SET_SEEKPOINT:
case ACCESS_SET_PRIVATE_ID_STATE: case ACCESS_SET_PRIVATE_ID_STATE:
case ACCESS_GET_META:
return VLC_EGENERIC; return VLC_EGENERIC;
default: default:
......
...@@ -127,7 +127,6 @@ static int Open( vlc_object_t *p_this ) ...@@ -127,7 +127,6 @@ static int Open( vlc_object_t *p_this )
/* Open VCD */ /* Open VCD */
if( !(vcddev = ioctl_Open( p_this, psz_dup )) ) if( !(vcddev = ioctl_Open( p_this, psz_dup )) )
{ {
msg_Warn( p_access, "could not open %s", psz_dup );
free( psz_dup ); free( psz_dup );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
......
...@@ -914,7 +914,6 @@ VCDOpen ( vlc_object_t *p_this ) ...@@ -914,7 +914,6 @@ VCDOpen ( vlc_object_t *p_this )
if( !(p_vcdplayer->vcd = vcd_Open( p_this, psz_source )) ) if( !(p_vcdplayer->vcd = vcd_Open( p_this, psz_source )) )
{ {
msg_Warn( p_access, "could not open %s", psz_source );
goto err_exit; goto err_exit;
} }
......
...@@ -97,7 +97,7 @@ vlc_module_begin(); ...@@ -97,7 +97,7 @@ vlc_module_begin();
set_subcategory( SUBCAT_INPUT_SCODEC ); set_subcategory( SUBCAT_INPUT_SCODEC );
add_integer( "subsdec-align", 0, NULL, ALIGN_TEXT, ALIGN_LONGTEXT, add_integer( "subsdec-align", 0, NULL, ALIGN_TEXT, ALIGN_LONGTEXT,
VLC_TRUE ); VLC_FALSE );
change_integer_list( pi_justification, ppsz_justification_text, 0 ); change_integer_list( pi_justification, ppsz_justification_text, 0 );
add_string( "subsdec-encoding", DEFAULT_NAME, NULL, add_string( "subsdec-encoding", DEFAULT_NAME, NULL,
ENCODING_TEXT, ENCODING_LONGTEXT, VLC_FALSE ); ENCODING_TEXT, ENCODING_LONGTEXT, VLC_FALSE );
......
...@@ -45,7 +45,7 @@ static void Close( vlc_object_t * ); ...@@ -45,7 +45,7 @@ static void Close( vlc_object_t * );
"playing from files, use 0 for live.") "playing from files, use 0 for live.")
vlc_module_begin(); vlc_module_begin();
set_shortname( "MJEPG"); set_shortname( "MJPEG");
set_description( _("JPEG camera demuxer") ); set_description( _("JPEG camera demuxer") );
set_capability( "demux2", 5 ); set_capability( "demux2", 5 );
set_callbacks( Open, Close ); set_callbacks( Open, Close );
......
...@@ -87,7 +87,7 @@ static void Close ( vlc_object_t * ); ...@@ -87,7 +87,7 @@ static void Close ( vlc_object_t * );
#define CAPMT_SYSID_LONGTEXT N_("only forward descriptors from this SysID to the CAM") #define CAPMT_SYSID_LONGTEXT N_("only forward descriptors from this SysID to the CAM")
vlc_module_begin(); vlc_module_begin();
set_description( _("ISO 13818-1 MPEG Transport Stream input - new" ) ); set_description( _("MPEG Transport Stream demuxer") );
set_shortname ( _("MPEG-TS") ); set_shortname ( _("MPEG-TS") );
set_category( CAT_INPUT ); set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_DEMUX ); set_subcategory( SUBCAT_INPUT_DEMUX );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment