vlc | branch: master | KO Myung-Hun <[email protected]> | Thu Oct 20 21:30:22 2011 +0900| [e9e13b75b645bf0cc6f414fb9b0b16d4c7d6a889] | committer: Rémi Denis-Courmont
Add UI for KAI Signed-off-by: Rémi Denis-Courmont <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e9e13b75b645bf0cc6f414fb9b0b16d4c7d6a889 --- modules/gui/qt4/components/simple_preferences.cpp | 7 +++++++ modules/gui/qt4/components/simple_preferences.hpp | 2 ++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp index b24d994..0735d0a 100644 --- a/modules/gui/qt4/components/simple_preferences.cpp +++ b/modules/gui/qt4/components/simple_preferences.cpp @@ -290,6 +290,11 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, optionWidgets.append( DirectXControl ); CONFIG_GENERIC_NO_UI( "directx-audio-device-name", StringList, DirectXLabel, DirectXDevice ); +#elif defined( __OS2__ ) + audioControl( kai ); + optionWidgets.append( kaiControl ); + CONFIG_GENERIC_NO_UI( "kai-audio-device", StringList, kaiLabel, + kaiDevice ); #else if( module_exists( "alsa" ) ) { @@ -719,6 +724,8 @@ void SPrefsPanel::updateAudioOptions( int number) ->itemData( number ).toString(); #ifdef WIN32 optionWidgets[directxW]->setVisible( ( value == "aout_directx" ) ); +#elif defined( __OS2__ ) + optionWidgets[kaiW]->setVisible( ( value == "kai" ) ); #else /* optionWidgets[ossW] can be NULL */ if( optionWidgets[ossW] ) diff --git a/modules/gui/qt4/components/simple_preferences.hpp b/modules/gui/qt4/components/simple_preferences.hpp index 2b7ef73..e3e7e71 100644 --- a/modules/gui/qt4/components/simple_preferences.hpp +++ b/modules/gui/qt4/components/simple_preferences.hpp @@ -66,6 +66,8 @@ enum { enum { #ifdef WIN32 directxW, +#elif defined( __OS2__) + kaiW, #else alsaW, ossW, _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
