Commit 8ce3a352 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Revert "Try to not confuse between Dolby Surround (2.1) and Dolby Digital (5.1)"

Let's wait for this issue to be statued.

This reverts commit 984fb14a.
parent b9af4725
......@@ -217,7 +217,7 @@ create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_des
- (void)initStrings
{
/* audio */
[o_audio_dolby_txt setStringValue: _NS("Force detection of Dolby Digital")];
[o_audio_dolby_txt setStringValue: _NS("Force detection of Dolby Surround")];
[o_audio_effects_box setTitle: _NS("Effects")];
[o_audio_enable_ckb setTitle: _NS("Enable Audio")];
[o_audio_general_box setTitle: _NS("General Audio")];
......@@ -419,7 +419,7 @@ create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_des
[o_audio_spdif_ckb setState: config_GetInt( p_intf, "spdif" )];
[self setupButton: o_audio_dolby_pop forIntList: "force-dolby-digital"];
[self setupButton: o_audio_dolby_pop forIntList: "force-dolby-surround"];
[o_audio_lang_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "audio-language" ) ?: ""]];
......@@ -748,7 +748,7 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
config_PutInt( p_intf, "volume", [o_audio_vol_sld intValue] );
config_PutInt( p_intf, "spdif", [o_audio_spdif_ckb state] );
SaveIntList( o_audio_dolby_pop, "force-dolby-digital" );
SaveIntList( o_audio_dolby_pop, "force-dolby-surround" );
config_PutPsz( p_intf, "audio-language", [[o_audio_lang_fld stringValue] UTF8String] );
config_PutInt( p_intf, "headphone-dolby", [o_audio_headphone_ckb state] );
......
......@@ -286,7 +286,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
CONFIG_GENERIC( "spdif", Bool, NULL, spdifBox );
CONFIG_GENERIC( "qt-autosave-volume", Bool, NULL, saveVolBox );
CONFIG_GENERIC( "force-dolby-digital" , IntegerList , NULL,
CONFIG_GENERIC( "force-dolby-surround" , IntegerList , NULL,
detectionDolby );
CONFIG_GENERIC( "headphone-dolby" , Bool , NULL, headphoneEffect );
......
......@@ -110,7 +110,7 @@
<item row="2" column="0" >
<widget class="QLabel" name="label_8" >
<property name="text" >
<string>_("Force detection of Dolby Digital")</string>
<string>_("Force detection of Dolby Surround")</string>
</property>
<property name="buddy" >
<cstring>detectionDolby</cstring>
......
......@@ -132,7 +132,7 @@ int aout_OutputNew( aout_instance_t * p_aout,
if ( p_aout->output.output.i_original_channels & AOUT_CHAN_DOLBYSTEREO )
{
val.i_int = AOUT_VAR_CHAN_DOLBYS;
text.psz_string = _("Dolby Digital");
text.psz_string = _("Dolby Surround");
}
else
{
......
......@@ -1893,7 +1893,7 @@ static aout_buffer_t *aout_new_buffer( decoder_t *p_dec, int i_samples )
if( p_owner->p_aout_input == NULL )
{
const int i_force_dolby = config_GetInt( p_dec, "force-dolby-digital" );
const int i_force_dolby = config_GetInt( p_dec, "force-dolby-surround" );
audio_sample_format_t format;
aout_input_t *p_aout_input;
aout_instance_t *p_aout;
......
......@@ -283,11 +283,11 @@ static const char *const ppsz_snap_formats[] =
"S/PDIF can be used by default when " \
"your hardware supports it as well as the audio stream being played.")
#define FORCE_DOLBY_TEXT N_("Force detection of Dolby Digital")
#define FORCE_DOLBY_TEXT N_("Force detection of Dolby Surround")
#define FORCE_DOLBY_LONGTEXT N_( \
"Use this when you know your stream is (or is not) encoded with Dolby "\
"Digital but fails to be detected as such. Even if the stream is "\
"not actually encoded with Dolby Digital, turning on this option might "\
"Surround but fails to be detected as such. Even if the stream is "\
"not actually encoded with Dolby Surround, turning on this option might "\
"enhance your experience, especially when combined with the Headphone "\
"Channel Mixer." )
static const int pi_force_dolby_values[] = { 0, 1, 2 };
......@@ -1462,7 +1462,7 @@ vlc_module_begin();
AOUT_RESAMP_LONGTEXT, true );
#endif
add_bool( "spdif", 0, NULL, SPDIF_TEXT, SPDIF_LONGTEXT, false );
add_integer( "force-dolby-digital", 0, NULL, FORCE_DOLBY_TEXT,
add_integer( "force-dolby-surround", 0, NULL, FORCE_DOLBY_TEXT,
FORCE_DOLBY_LONGTEXT, false );
change_integer_list( pi_force_dolby_values, ppsz_force_dolby_descriptions, NULL );
add_integer( "audio-desync", 0, NULL, DESYNC_TEXT,
......
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