Commit b745d031 authored by lukas.durfina's avatar lukas.durfina Committed by Pierre d'Herbemont
Browse files

uniform naming of audio devices variable


Signed-off-by: default avatarPierre d'Herbemont <pdherbemont@videolan.org>
parent 0a1539f5
......@@ -108,7 +108,7 @@ vlc_module_begin();
set_description( N_("ALSA audio output") );
set_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_AOUT );
add_string( "alsadev", DEFAULT_ALSA_DEVICE, aout_FindAndRestart,
add_string( "alsa-audio-device", DEFAULT_ALSA_DEVICE, aout_FindAndRestart,
N_("ALSA Device Name"), NULL, false );
change_string_list( ppsz_devices, ppsz_devices_text, FindDevicesCallback );
change_action_add( FindDevicesCallback, N_("Refresh list") );
......@@ -320,7 +320,7 @@ static int Open( vlc_object_t *p_this )
vlc_mutex_init( &p_sys->lock );
/* Get device name */
if( (psz_device = config_GetPsz( p_aout, "alsadev" )) == NULL )
if( (psz_device = config_GetPsz( p_aout, "alsa-audio-device" )) == NULL )
{
msg_Err( p_aout, "no audio device given (maybe \"default\" ?)" );
intf_UserFatal( p_aout, false, _("No Audio Device"),
......
......@@ -112,7 +112,7 @@ vlc_module_begin();
set_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_AOUT );
add_file( "dspdev", "/dev/dsp", aout_FindAndRestart,
add_file( "oss-audio-device", "/dev/dsp", aout_FindAndRestart,
N_("OSS DSP device"), NULL, false );
add_bool( "oss-buggy", 0, NULL, BUGGY_TEXT, BUGGY_LONGTEXT, true );
......@@ -283,7 +283,7 @@ static int Open( vlc_object_t *p_this )
return VLC_ENOMEM;
/* Get device name */
if( (psz_device = config_GetPsz( p_aout, "dspdev" )) == NULL )
if( (psz_device = config_GetPsz( p_aout, "oss-audio-device" )) == NULL )
{
msg_Err( p_aout, "no audio device specified (maybe /dev/dsp?)" );
free( p_sys );
......
......@@ -110,7 +110,7 @@ vlc_module_begin();
set_description( N_("PORTAUDIO audio output") );
set_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_AOUT );
add_integer( "portaudio-device", 0, NULL,
add_integer( "portaudio-audio-device", 0, NULL,
DEVICE_TEXT, DEVICE_LONGTEXT, false );
set_capability( "audio output", 0 );
set_callbacks( Open, Close );
......@@ -183,8 +183,8 @@ static int Open( vlc_object_t * p_this )
p_aout->output.pf_play = Play;
/* Retrieve output device id from config */
var_Create( p_aout, "portaudio-device", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT);
var_Get( p_aout, "portaudio-device", &val );
var_Create( p_aout, "portaudio-audio-device", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT);
var_Get( p_aout, "portaudio-audio-device", &val );
p_sys->i_device_id = val.i_int;
#ifdef PORTAUDIO_IS_SERIOUSLY_BROKEN
......
......@@ -170,7 +170,7 @@ vlc_module_begin();
set_subcategory( SUBCAT_AUDIO_AOUT );
add_bool( "waveout-float32", 1, 0, FLOAT_TEXT, FLOAT_LONGTEXT, true );
add_string( "waveout-dev", "wavemapper", NULL,
add_string( "waveout-audio-device", "wavemapper", NULL,
DEVICE_TEXT, DEVICE_LONG, false );
change_string_list( ppsz_adev, ppsz_adev_text, ReloadWaveoutDevices );
change_need_restart();
......@@ -255,13 +255,13 @@ static int Open( vlc_object_t *p_this )
/*
initialize/update Device selection List
*/
ReloadWaveoutDevices( p_this, "waveout-dev", val, val, NULL);
ReloadWaveoutDevices( p_this, "waveout-audio-device", val, val, NULL);
/*
check for configured audio device!
*/
char *psz_waveout_dev = var_CreateGetString( p_aout, "waveout-dev");
char *psz_waveout_dev = var_CreateGetString( p_aout, "waveout-audio-device");
p_aout->output.p_sys->i_wave_device_id =
findDeviceID( psz_waveout_dev );
......@@ -303,7 +303,7 @@ static int Open( vlc_object_t *p_this )
if( var_Get( p_aout, "audio-device", &val ) < 0 )
{
/* Probe() has failed. */
var_Destroy( p_aout, "waveout-device");
var_Destroy( p_aout, "waveout-audio-device");
free( p_aout->output.p_sys );
return VLC_EGENERIC;
}
......
......@@ -259,7 +259,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
audioControl( alsa );
optionWidgets.append( alsaControl );
CONFIG_GENERIC2( "alsadev" , StringList , alsaLabel,
CONFIG_GENERIC2( "alsa-audio-device" , StringList , alsaLabel,
alsaDevice );
}
else
......@@ -268,7 +268,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
{
audioControl2( OSS );
optionWidgets.append( OSSControl );
CONFIG_GENERIC_FILE( "dspdev" , File , OSSLabel, OSSDevice,
CONFIG_GENERIC_FILE( "oss-audio-device" , File , OSSLabel, OSSDevice,
OSSBrowse );
}
else
......
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