From 8ce3a352594cb66830e532acf2d00d17847e3d48 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Sat, 18 Oct 2008 12:06:30 +0200 Subject: [PATCH] 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 984fb14a84fdc5af8f0dc9c49928f32d04dc8cbf. --- modules/gui/macosx/simple_prefs.m | 6 +++--- modules/gui/qt4/components/simple_preferences.cpp | 2 +- modules/gui/qt4/ui/sprefs_audio.ui | 2 +- src/audio_output/output.c | 2 +- src/input/decoder.c | 2 +- src/libvlc-module.c | 8 ++++---- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m index 1374e52a78..42ebc42c24 100644 --- a/modules/gui/macosx/simple_prefs.m +++ b/modules/gui/macosx/simple_prefs.m @@ -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] ); diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp index af4ae43044..ca1c776d51 100644 --- a/modules/gui/qt4/components/simple_preferences.cpp +++ b/modules/gui/qt4/components/simple_preferences.cpp @@ -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 ); diff --git a/modules/gui/qt4/ui/sprefs_audio.ui b/modules/gui/qt4/ui/sprefs_audio.ui index a57de7cd80..6d2a4c65b6 100644 --- a/modules/gui/qt4/ui/sprefs_audio.ui +++ b/modules/gui/qt4/ui/sprefs_audio.ui @@ -110,7 +110,7 @@ - _("Force detection of Dolby Digital") + _("Force detection of Dolby Surround") detectionDolby diff --git a/src/audio_output/output.c b/src/audio_output/output.c index 14e20087b1..41494d2ae0 100644 --- a/src/audio_output/output.c +++ b/src/audio_output/output.c @@ -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 { diff --git a/src/input/decoder.c b/src/input/decoder.c index e03643b312..e2bfc49174 100644 --- a/src/input/decoder.c +++ b/src/input/decoder.c @@ -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; diff --git a/src/libvlc-module.c b/src/libvlc-module.c index 4974754c78..abd4c6b792 100644 --- a/src/libvlc-module.c +++ b/src/libvlc-module.c @@ -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, -- 2.39.2