From: Francois Cartegnie Date: Mon, 21 Sep 2009 23:19:41 +0000 (+0200) Subject: Qt: hide live555 module options when disabled X-Git-Tag: 1.1.0-ff~3214 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=608c0306bc50224a2f848ca53171d679e5a67c8e;p=vlc Qt: hide live555 module options when disabled Signed-off-by: RĂ©mi Denis-Courmont --- diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp index 866974f70f..05d2a10377 100644 --- a/modules/gui/qt4/components/simple_preferences.cpp +++ b/modules/gui/qt4/components/simple_preferences.cpp @@ -412,7 +412,16 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, CONFIG_GENERIC_NO_BOOL( "ffmpeg-pp-q", Integer, ui.ppLabel, PostProcLevel ); CONFIG_GENERIC( "avi-index", IntegerList, ui.aviLabel, AviRepair ); - CONFIG_GENERIC( "rtsp-tcp", Bool, NULL, RTSP_TCPBox ); + + /* live555 module prefs */ + CONFIG_GENERIC( "rtsp-tcp", Bool, NULL, + live555TransportRTSP_TCPRadio ); + if ( !module_exists( "live555" ) ) + { + ui.live555TransportRTSP_TCPRadio->hide(); + ui.live555TransportHTTPRadio->hide(); + ui.live555TransportLabel->hide(); + } #ifdef WIN32 CONFIG_GENERIC( "prefer-system-codecs", Bool, NULL, systemCodecBox ); #else diff --git a/modules/gui/qt4/ui/sprefs_input.ui b/modules/gui/qt4/ui/sprefs_input.ui index b6cbcdfb2d..33c7dc67d0 100644 --- a/modules/gui/qt4/ui/sprefs_input.ui +++ b/modules/gui/qt4/ui/sprefs_input.ui @@ -157,7 +157,7 @@ - + HTTP (default) @@ -170,7 +170,7 @@ - + RTP over RTSP (TCP) @@ -179,9 +179,9 @@ - + - Stream transport + Live555 stream transport @@ -316,7 +316,7 @@ cachingCombo PostProcLevel AviRepair - RTSP_TCPBox + live555TransportRTSP_TCPRadio systemCodecBox