[vlc-commits] Qt4: use canonical name of the DirectSound module

Rémi Denis-Courmont git at videolan.org
Sat Sep 28 11:01:20 CEST 2013


vlc/vlc-2.1 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Sep 28 11:21:26 2013 +0300| [4ec9ae7260ed6e5df7ac4793dac80107339870b9] | committer: Jean-Baptiste Kempf

Qt4: use canonical name of the DirectSound module

(cherry picked from commit cbf64179a2cee2e26269d2baf5f7e1de7b0ae062)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=4ec9ae7260ed6e5df7ac4793dac80107339870b9
---

 modules/gui/qt4/components/simple_preferences.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index e07d631..2eb0608 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -482,7 +482,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             module_exists( name ) && ( !psz_aout || !strcmp( psz_aout, name ) || !strcmp( psz_aout, "any" ) )
 
 #if defined( _WIN32 )
-            if( get_vol_aout( "directx" ) )
+            if( get_vol_aout( "directsound" ) )
                 i_volume = config_GetFloat( p_intf, "directx-volume") * 100 + 0.5;
             else if( get_vol_aout( "waveout" ) )
                 i_volume = config_GetFloat( p_intf, "waveout-volume") * 100 + 0.5;
@@ -1074,7 +1074,7 @@ void SPrefsPanel::apply()
         //FIXME this is moot
 #if defined( _WIN32 )
         VLC_UNUSED( f_gain );
-        if( save_vol_aout( "directx" ) )
+        if( save_vol_aout( "directsound" ) )
             config_PutFloat( p_intf, "directx-volume", i_volume / 100.f );
         if( save_vol_aout( "waveout" ) )
             config_PutFloat( p_intf, "waveout-volume", i_volume / 100.f );



More information about the vlc-commits mailing list