Ticket #541: videosource1.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");
 
+#ifdef USING_DVB_EIT
+    addTarget("onairguide", new OnAirGuide_config());
+    grabber->addSelection("Transmitted Over Air Guide (EIT)", "onairguide");
+#endif
+
     addTarget("tv_grab_de_tvtoday", new XMLTV_generic_config(parent, "tv_grab_de_tvtoday"));
     grabber->addSelection("Germany (tvtoday)", "tv_grab_de_tvtoday");
 

channelsettings.cpp

@@ -306 +306 @@
 #ifdef USING_DVB
 
     bool fDVB =false;
+    bool fOnAirGuide =false;
 
     MSqlQuery query(MSqlQuery::InitCon());
 
@@ -323 +324 @@
     {
         query.next();
         if (query.value(0).toInt())
+        {
            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)
+
+    if (fOnAirGuide)
     {
-       onairguide->setEnabled(true);
-       xmltvID->setEnabled(!onairguide->boolValue());
+       onairguide->setEnabled(false);
+       xmltvID->setEnabled(false);
     }
+    else if (fDVB)
+    { 
+        onairguide->setEnabled(true);
+        xmltvID->setEnabled(!onairguide->boolValue());
+    }
     else
     {
        onairguide->setEnabled(false);

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, useonairguide "
+                              "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, useonairguide "
+                              "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();
-    return (useOnAirGuide) ? query.value(0).toInt() : -1;
+    if (query.value(1).toString() == "onairguide")
+        return query.value(0).toInt();
+    else if (query.value(2).toBool())
+        return query.value(0).toInt();
+    else
+        return -1;
 }
 
 static uint update_eit_in_db(MSqlQuery &query, MSqlQuery &query2,

siscan.cpp

@@ -1495 +1495 @@
                 chan_num,
                 (*s).ServiceID,
                 atsc_major, atsc_minor,
-                true,
+                false,
                 !(*s).EITPresent, !(*s).EITPresent,
                 freqid);
         }