[vlc-devel] [PATCH] Qt: hide live555 module options when disabled

[Francois Cartegnie]

---
 modules/gui/qt4/components/simple_preferences.cpp |   11 ++++++++++-
 modules/gui/qt4/ui/sprefs_input.ui                |   10 +++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 866974f..05d2a10 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 b6cbcdf..33c7dc6 100644
--- a/modules/gui/qt4/ui/sprefs_input.ui
+++ b/modules/gui/qt4/ui/sprefs_input.ui
@@ -157,7 +157,7 @@
       <item row="2" column="1">
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
-         <widget class="QRadioButton" name="HTTP">
+         <widget class="QRadioButton" name="live555TransportHTTPRadio">
           <property name="text">
            <string>HTTP (default)</string>
           </property>
@@ -170,7 +170,7 @@
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="RTSP_TCPBox">
+         <widget class="QRadioButton" name="live555TransportRTSP_TCPRadio">
           <property name="text">
            <string>RTP over RTSP (TCP)</string>
           </property>
@@ -179,9 +179,9 @@
        </layout>
       </item>
       <item row="2" column="0">
-       <widget class="QLabel" name="label_3">
+       <widget class="QLabel" name="live555TransportLabel">
         <property name="text">
-         <string>Stream transport</string>
+         <string>Live555 stream transport</string>
         </property>
        </widget>
       </item>
@@ -316,7 +316,7 @@
   <tabstop>cachingCombo</tabstop>
   <tabstop>PostProcLevel</tabstop>
   <tabstop>AviRepair</tabstop>
-  <tabstop>RTSP_TCPBox</tabstop>
+  <tabstop>live555TransportRTSP_TCPRadio</tabstop>
   <tabstop>systemCodecBox</tabstop>
  </tabstops>
  <resources/>
-- 
1.6.2.5