Ticket #541: videosource.patch

videosource.h

@@ -209 +209 @@
     QString grabber;
 };
 
+class OnAirGuide_config: public LabelSetting {
+public:
+    OnAirGuide_config();
+
+    virtual void load() {};
+    virtual void save() {};
+};
+
 class XMLTVConfig: public VerticalConfigurationGroup, 
                    public TriggeredConfigurationGroup {
 public:

videosource.cpp

@@ -904 +904 @@
     pdlg.Close();
 }
 
+OnAirGuide_config::OnAirGuide_config()
+{
+}
+
 XMLTVConfig::XMLTVConfig(const VideoSource& parent) 
 {
     setUseLabel(false);
@@ -921 +925 @@
     addTarget("technovera", new DataDirect_config(parent, DD_LXM));
     grabber->addSelection("LxM (United States)", "technovera");
 
+    addTarget("onairguide", new OnAirGuide_config());
+    grabber->addSelection("Transmitted Over Air Guide (EIT)", "onairguide");
+
     addTarget("tv_grab_de_tvtoday", new XMLTV_generic_config(parent, "tv_grab_de_tvtoday"));
     grabber->addSelection("Germany (tvtoday)", "tv_grab_de_tvtoday");
 

channelsettings.cpp

@@ -167 +167 @@
     };
 };
 
-class OnAirGuide: public CheckBoxSetting, public CSetting {
-public:
-    OnAirGuide(const ChannelID& id):
-        CheckBoxSetting(), CSetting(id, "useonairguide") {
-        setLabel(QObject::tr("Use on air guide"));
-        setHelpText(QObject::tr("If set the guide information will be taken "
-                    "from the On Air Channel guide."));
-    };
-};
-
 /*****************************************************************************
         Channel Options - Video 4 Linux
  *****************************************************************************/
@@ -274 +264 @@
     addChild(new VideoFilters(id));
     addChild(new OutputFilters(id));
 
-#ifdef USING_DVB_EIT
-    HorizontalConfigurationGroup *bottomhoz = new HorizontalConfigurationGroup(false,true);
-    bottomhoz->addChild(onairguide = new OnAirGuide(id));
-    bottomhoz->addChild(xmltvID = new XmltvID(id));
-    addChild(bottomhoz);
-
-    connect(onairguide,SIGNAL(valueChanged(bool)),this,SLOT(onAirGuideChanged(bool)));
+    addChild(xmltvID = new XmltvID(id));
     connect(source,SIGNAL(valueChanged(const QString&)),this,SLOT(sourceChanged(const QString&)));
-#else
-    addChild(new XmltvID(id));
-#endif
 };
 
 void ChannelOptionsCommon::load()
@@ -292 +273 @@
     VerticalConfigurationGroup::load();
 }
 
-void ChannelOptionsCommon::onAirGuideChanged(bool fValue)
-{
-    (void)fValue;
-#ifdef USING_DVB
-    xmltvID->setEnabled(!fValue);
-#endif
-}
-
 void ChannelOptionsCommon::sourceChanged(const QString& str)
 {
     (void)str;
 #ifdef USING_DVB
 
     bool fDVB =false;
+    bool fOnAirGuide = false;
 
     MSqlQuery query(MSqlQuery::InitCon());
 
@@ -323 +297 @@
     {
         query.next();
         if (query.value(0).toInt())
-           fDVB = true;
+        {
+            fDVB = true;
+            query.prepare("SELECT xmltvgrabber FROM videosource WHERE "
+                          "videosource.sourceid = :SOURCEID ");
+            query.bindValue(":SOURCEID", str);
+            if (query.exec() && query.isActive() && query.size() > 0)
+            {
+                query.next();
+                if (query.value(0).toString() == "onairguide")
+                   fOnAirGuide = true;
+            }
+        }
     }
     if (fDVB)
-    {
-       onairguide->setEnabled(true);
-       xmltvID->setEnabled(!onairguide->boolValue());
-    }
+       xmltvID->setEnabled(!fOnAirGuide);
     else
-    {
-       onairguide->setEnabled(false);
        xmltvID->setEnabled(true);
-    }
 #endif
 }
 

eithelper.cpp

@@ -145 +145 @@
     // linkage to chanid is different than DVB
     if (event.ATSC)
     {
-        query.prepare(QString("SELECT chanid, useonairguide FROM channel "
+        query.prepare(QString("SELECT chanid, xmltvgrabber "
+                              "FROM channel, videosource "
                               "WHERE atscsrcid = %1 AND mplexid = %2")
                       .arg(event.ServiceID)
                       .arg(mplexid));
@@ -153 +154 @@
     else
     {
         /* DVB Link to chanid */
-        query.prepare(QString("SELECT chanid, useonairguide "
-                              "FROM channel, dtv_multiplex "
+        query.prepare(QString("SELECT chanid, xmltvgrabber "
+                              "FROM channel, videosource, dtv_multiplex "
                               "WHERE serviceid = %1 AND "
                               "      networkid = %2 AND "
                               "      channel.mplexid = dtv_multiplex.mplexid")
@@ -173 +174 @@
         return -1;
     }
 
-    // Check to see if we are interseted in this channel
+    // Check to see if we are interested in this channel
     query.next();
-    bool useOnAirGuide = query.value(1).toBool();
+    bool useOnAirGuide = query.value(1).toString() == "onairguide";
     return (useOnAirGuide) ? query.value(0).toInt() : -1;
 }
 

channelsettings.h

@@ -108 +108 @@
     ChannelOptionsCommon(const ChannelID& id);
     void load();
 public slots:
-    void onAirGuideChanged(bool);
     void sourceChanged(const QString&);
 
 protected: