[vlc-commits] qt: fix build

Rémi Denis-Courmont git at videolan.org
Sat Feb 29 16:56:02 CET 2020


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Feb 29 17:55:50 2020 +0200| [41a6474df6cae915b36490fd326bfc5f228c5be6] | committer: Rémi Denis-Courmont

qt: fix build

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=41a6474df6cae915b36490fd326bfc5f228c5be6
---

 modules/gui/qt/dialogs/vlm/vlm.cpp | 105 -------------------------------------
 modules/gui/qt/dialogs/vlm/vlm.hpp |  21 --------
 modules/gui/qt/dialogs/vlm/vlm.ui  |  44 +---------------
 3 files changed, 1 insertion(+), 169 deletions(-)

diff --git a/modules/gui/qt/dialogs/vlm/vlm.cpp b/modules/gui/qt/dialogs/vlm/vlm.cpp
index 21f48fc3d8..ce24eefa44 100644
--- a/modules/gui/qt/dialogs/vlm/vlm.cpp
+++ b/modules/gui/qt/dialogs/vlm/vlm.cpp
@@ -71,7 +71,6 @@ VLMDialog::VLMDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
 #define ADDMEDIATYPES( str, type ) ui.mediaType->addItem( qtr( str ), QVariant( type ) );
     ADDMEDIATYPES( N_("Broadcast"), QVLM_Broadcast );
     ADDMEDIATYPES( N_("Schedule"), QVLM_Schedule );
-    ADDMEDIATYPES( N_("Video On Demand ( VOD )"), QVLM_VOD );
 #undef ADDMEDIATYPES
 
     /* Schedule Stuffs */
@@ -172,7 +171,6 @@ void VLMDialog::showScheduleWidget( int i )
 {
     ui.schedBox->setVisible( ( i == QVLM_Schedule ) );
     ui.loopBCast->setVisible( ( i == QVLM_Broadcast ) );
-    ui.vodBox->setVisible( ( i == QVLM_VOD ) );
 }
 
 void VLMDialog::selectVLMItem( int i )
@@ -226,12 +224,6 @@ void VLMDialog::addVLMItem()
         vlm->AddBroadcast( name, inputText, inputOptions, outputText,
                            b_checked, b_looped );
     break;
-    case QVLM_VOD:
-        typeShortName = "VOD";
-        vlmAwidget = new VLMVod( vlm, name, inputText, inputOptions, outputText,
-                                 b_checked, ui.muxLedit->text(), this );
-        vlm->AddVod( name, inputText, inputOptions, outputText, b_checked );
-        break;
     case QVLM_Schedule:
         typeShortName = "Sched";
         vlmAwidget = new VLMSchedule( vlm, name, inputText, inputOptions, outputText,
@@ -256,7 +248,6 @@ void VLMDialog::addVLMItem()
     clearWidgets();
 }
 
-/* TODO : VOD are not exported to the file */
 bool VLMDialog::exportVLMConf()
 {
     QString saveVLMConfFileName = QFileDialog::getSaveFileName( this,
@@ -298,15 +289,6 @@ void VLMDialog::mediasPopulator()
             QString outputText = qfu( pp_dsc[i]->psz_output );
 
             /* Schedule media is a quite especial, maybe there is another way to grab information */
-            if( pp_dsc[i]->b_vod )
-            {
-                typeShortName = "VOD";
-                QString mux = qfu( pp_dsc[i]->vod.psz_mux );
-                vlmAwidget = new VLMVod( vlm, mediaName, inputText,
-                                         inputOptions, outputText,
-                                         pp_dsc[i]->b_enabled, mux, this );
-            }
-            else
             {
                 typeShortName = "Bcast";
                 vlmAwidget = new VLMBroadcast( vlm, mediaName, inputText, inputOptions,
@@ -360,7 +342,6 @@ void VLMDialog::clearWidgets()
     ui.enableCheck->setChecked( true );
     ui.nameLedit->setReadOnly( false );
     ui.loopBCast->setChecked( false );
-    ui.muxLedit->clear();
     ui.saveButton->hide();
     ui.addButton->show();
 }
@@ -411,9 +392,6 @@ void VLMDialog::startModifyVLMItem( VLMAWidget *vlmObj )
     case QVLM_Broadcast:
         ui.loopBCast->setChecked( (qobject_cast<VLMBroadcast *>(vlmObj))->b_looped );
         break;
-    case QVLM_VOD:
-        ui.muxLedit->setText( (qobject_cast<VLMVod *>(vlmObj))->mux );
-        break;
     case QVLM_Schedule:
         time->setDateTime( ( qobject_cast<VLMSchedule *>(vlmObj))->schetime );
         date->setDateTime( ( qobject_cast<VLMSchedule *>(vlmObj))->schedate );
@@ -439,9 +417,6 @@ void VLMDialog::saveModifications()
         case QVLM_Broadcast:
             (qobject_cast<VLMBroadcast *>(vlmObj))->b_looped = ui.loopBCast->isChecked();
             break;
-        case QVLM_VOD:
-            (qobject_cast<VLMVod *>(vlmObj))->mux = ui.muxLedit->text();
-            break;
         case QVLM_Schedule:
             (qobject_cast<VLMSchedule *>(vlmObj))->schetime = time->dateTime();
             (qobject_cast<VLMSchedule *>(vlmObj))->schedate = date->dateTime();
@@ -616,31 +591,6 @@ void VLMSchedule::update()
                        rNumber, rDays, b_enabled);
 }
 
-/****************
- * VLMVOD
- ****************/
-VLMVod::VLMVod( VLMWrapper *vlm, const QString& name_, const QString& input,
-                const QString& inputOptions, const QString& output,
-                bool enabled, const QString& _mux, VLMDialog *parent)
-       : VLMAWidget( vlm, name_, input, inputOptions, output, enabled, parent,
-                     QVLM_VOD )
-{
-    nameLabel->setText( qtr("VOD: ") + name );
-
-    mux = _mux;
-    muxLabel = new QLabel;
-    objLayout->addWidget( muxLabel, 1, 0 );
-
-    update();
-}
-
-void VLMVod::update()
-{
-    muxLabel->setText( mux );
-    vlm->EditVod( name, input, inputOptions, output, b_enabled, mux );
-}
-
-
 /*******************
  * VLMWrapper
  *******************/
@@ -753,61 +703,6 @@ void VLMWrapper::ControlBroadcast( const QString& name, int BroadcastStatus,
     vlm_MessageDelete( message );
 }
 
-void VLMWrapper::AddVod( const QString& name, const QString& input,
-                         const QString& inputOptions, const QString& output,
-                         bool b_enabled, const QString& mux )
-{
-    vlm_message_t *message;
-    QString command = "new \"" + name + "\" vod";
-    vlm_ExecuteCommand( p_vlm, qtu( command ), &message );
-    vlm_MessageDelete( message );
-    EditVod(  name, input, inputOptions, output, b_enabled, mux );
-}
-
-void VLMWrapper::EditVod( const QString& name, const QString& input,
-                          const QString& inputOptions, const QString& output,
-                          bool b_enabled,
-                          const QString& mux )
-{
-    vlm_message_t *message;
-    QString command;
-
-    if( !input.isEmpty() )
-    {
-        command = "setup \"" + name + "\" input \"" + input + "\"";
-        vlm_ExecuteCommand( p_vlm, qtu( command ), &message );
-        vlm_MessageDelete( message );
-
-        QStringList options = inputOptions.split( " :", QString::SkipEmptyParts );
-        for( int i = 0; i < options.count(); i++ )
-        {
-            command = "setup \"" + name + "\" option \"" + options[i].trimmed() + "\"";
-            vlm_ExecuteCommand( p_vlm, qtu( command ), &message );
-            vlm_MessageDelete( message );
-        }
-    }
-
-    if( !output.isEmpty() )
-    {
-        command = "setup \"" + name + "\" output \"" + output + "\"";
-        vlm_ExecuteCommand( p_vlm, qtu( command ), &message );
-        vlm_MessageDelete( message );
-    }
-
-    if( b_enabled )
-    {
-        command = "setup \"" + name + "\" enabled";
-        vlm_ExecuteCommand( p_vlm, qtu( command ), &message );
-        vlm_MessageDelete( message );
-    }
-    if( !mux.isEmpty() )
-    {
-        command = "setup \"" + name + "\" mux \"" + mux + "\"";
-        vlm_ExecuteCommand( p_vlm, qtu( command ), &message );
-        vlm_MessageDelete( message );
-    }
-}
-
 void VLMWrapper::AddSchedule( const QString& name, const QString& input,
                               const QString& inputOptions, const QString& output,
                               QDateTime _schetime, QDateTime _schedate,
diff --git a/modules/gui/qt/dialogs/vlm/vlm.hpp b/modules/gui/qt/dialogs/vlm/vlm.hpp
index 930efe43d5..234c676898 100644
--- a/modules/gui/qt/dialogs/vlm/vlm.hpp
+++ b/modules/gui/qt/dialogs/vlm/vlm.hpp
@@ -38,7 +38,6 @@
 enum{
     QVLM_Broadcast,
     QVLM_Schedule,
-    QVLM_VOD
 };
 
 enum{
@@ -124,12 +123,6 @@ public:
                        QDateTime _schetime, QDateTime _schedate,
                        int _scherepeatnumber, int _repeatDays,
                        bool b_enabled = true, const QString& mux = "" );
-    void AddVod( const QString&, const QString&,
-                 const QString&, const QString&,
-                 bool b_enabled = true, const QString& mux = "" );
-    void EditVod( const QString&, const QString&,
-                  const QString&, const QString&,
-                  bool b_enabled = true, const QString& mux = "" );
     void AddSchedule( const QString&, const QString&,
                       const QString&, const QString&,
                       QDateTime _schetime, QDateTime _schedate,
@@ -191,20 +184,6 @@ private slots:
     void toggleLoop();
 };
 
-class VLMVod : public VLMAWidget
-{
-    Q_OBJECT
-    friend class VLMDialog;
-public:
-    VLMVod( VLMWrapper *, const QString& name, const QString& input,
-            const QString& inputOptions, const QString& output,
-            bool _enable, const QString& _mux, VLMDialog *parent );
-    void update();
-private:
-    QString mux;
-    QLabel *muxLabel;
-};
-
 class VLMSchedule : public VLMAWidget
 {
     Q_OBJECT
diff --git a/modules/gui/qt/dialogs/vlm/vlm.ui b/modules/gui/qt/dialogs/vlm/vlm.ui
index 23f2b35090..f616249336 100644
--- a/modules/gui/qt/dialogs/vlm/vlm.ui
+++ b/modules/gui/qt/dialogs/vlm/vlm.ui
@@ -121,49 +121,7 @@
         </property>
        </widget>
       </item>
-      <item row="6" column="0" colspan="3" >
-       <widget class="QGroupBox" name="vodBox" >
-        <property name="title" >
-         <string>Mux Control</string>
-        </property>
-        <layout class="QHBoxLayout" >
-         <item>
-          <widget class="QLabel" name="label" >
-           <property name="text" >
-            <string>Muxer:</string>
-           </property>
-           <property name="margin" >
-            <number>3</number>
-           </property>
-           <property name="buddy" >
-            <cstring>muxLedit</cstring>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLineEdit" name="muxLedit" >
-           <property name="inputMask" >
-            <string>AAAA; </string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <spacer>
-           <property name="orientation" >
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0" >
-            <size>
-             <width>411</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item row="7" column="0" colspan="2" >
+      <item row="6" column="0" colspan="2" >
        <widget class="QCheckBox" name="loopBCast" >
         <property name="text" >
          <string>Loop</string>



More information about the vlc-commits mailing list