Qt: Access-filter 'record' does not exist anymore.

We need to reimplement an on-the-fly option to record streams.
I know this commit is crappy...

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index 4edc1271f91c44feda4f082077a18eb5f04039f4..f99a660991705961ef22f537569a3d233c983f23 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -350,11 +350,13 @@ AdvControlsWidget::AdvControlsWidget( intf_thread_t *_p_i, bool b_fsCreation = f
 #endif
 
     /* Record Button */
+#if 0
     recordButton = new QPushButton;
     setupSmallButton( recordButton );
     advLayout->addWidget( recordButton );
     BUTTON_SET_ACT_I( recordButton, "", record,
             qtr( "Record" ), record() );
+#endif
 
     /* Snapshot Button */
     snapshotButton = new QPushButton;
@@ -374,16 +376,19 @@ void AdvControlsWidget::enableInput( bool enable )
     {
         input_item_t *p_item = input_GetItem( THEMIM->getInput() );
         i_input_id = p_item->i_id;
-
+#if 0
         recordButton->setVisible( var_GetBool( THEMIM->getInput(), "can-record" ) );
     }
     else
     {
         recordButton->setVisible( false );
+#endif
     }
 
     ABButton->setEnabled( enable );
+#if 0
     recordButton->setEnabled( enable );
+#endif
 
     if( enable && ( i_last_input_id != i_input_id ) )
     {
@@ -464,6 +469,7 @@ void AdvControlsWidget::AtoBLoop( float f_pos, int i_time, int i_length )
     }
 }
 
+// TODO: On-the-fly record needs to be reimplemented
 void AdvControlsWidget::record()
 {
     input_thread_t *p_input = THEMIM->getInput();

diff --git a/modules/gui/qt4/components/interface_widgets.hpp b/modules/gui/qt4/components/interface_widgets.hpp
index 85d50e1ce8102b8250869c84f100231a662a6d90..9894185dd1412e2ee066f4a9f745f26079302f12 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.hpp
+++ b/modules/gui/qt4/components/interface_widgets.hpp
@@ -133,7 +133,10 @@ public:
 
 private:
     intf_thread_t *p_intf;
-    QPushButton *recordButton, *ABButton;
+#if 0
+    QPushButton *recordButton;
+#endif
+    QPushButton *ABButton;
     QPushButton *snapshotButton, *frameButton;
 
     static mtime_t timeA, timeB;

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index e7c9e10781bd57a30dd5fa1ed8c7784df8eee2bb..9b7fcaaa3e190212245eea868a630edb983919cb 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -389,10 +389,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             free( psz );
             ui.timeshiftBox->setChecked( qs_filter.contains( "timeshift" ) );
             ui.dumpBox->setChecked( qs_filter.contains( "dump" ) );
-            ui.recordBox->setChecked( qs_filter.contains( "record" ) );
             ui.bandwidthBox->setChecked( qs_filter.contains( "bandwidth" ) );
 
-            optionWidgets.append( ui.recordBox );
             optionWidgets.append( ui.dumpBox );
             optionWidgets.append( ui.bandwidthBox );
             optionWidgets.append( ui.timeshiftBox );
@@ -619,7 +617,6 @@ void SPrefsPanel::apply()
 
         bool b_first = true;
         qs_filter.clear();
-        saveBox( "record", qobject_cast<QCheckBox *>(optionWidgets[recordChB]) );
         saveBox( "dump", qobject_cast<QCheckBox *>(optionWidgets[dumpChB]) );
         saveBox( "timeshift", qobject_cast<QCheckBox *>(optionWidgets[timeshiftChB]) );
         saveBox( "bandwidth", qobject_cast<QCheckBox *>(optionWidgets[bandwidthChB] ) );

diff --git a/modules/gui/qt4/components/simple_preferences.hpp b/modules/gui/qt4/components/simple_preferences.hpp
index afff9f4bee3ef54269f181c6b6ce21b1573227d5..e3414ab7ccff25f0703837fd97d715f7e0eb7f9f 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.hpp
+++ b/modules/gui/qt4/components/simple_preferences.hpp
@@ -72,7 +72,7 @@ enum {
        audioOutCoB,
        normalizerChB,
        volLW };
-enum { recordChB, dumpChB, bandwidthChB, timeshiftChB, inputLE, cachingCoB };
+enum { dumpChB, bandwidthChB, timeshiftChB, inputLE, cachingCoB };
 enum { skinRB, qtRB };
 
 class ConfigControl;

diff --git a/modules/gui/qt4/ui/sprefs_input.ui b/modules/gui/qt4/ui/sprefs_input.ui
index 235d7a638245760420f48093c76703f9da53e3a6..835b06581a1eff40390e464b659ff82bedf60505 100644 (file)
--- a/modules/gui/qt4/ui/sprefs_input.ui
+++ b/modules/gui/qt4/ui/sprefs_input.ui
@@ -188,13 +188,6 @@
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="QCheckBox" name="recordBox" >
-        <property name="text" >
-         <string>_("Record")</string>
-        </property>
-       </widget>
-      </item>
       <item>
        <widget class="QCheckBox" name="dumpBox" >
         <property name="text" >
@@ -225,7 +218,6 @@
   <tabstop>RTSP_TCPBox</tabstop>
   <tabstop>systemCodecBox</tabstop>
   <tabstop>timeshiftBox</tabstop>
-  <tabstop>recordBox</tabstop>
   <tabstop>dumpBox</tabstop>
   <tabstop>bandwidthBox</tabstop>
  </tabstops>