Ticket #4963: external-changer.diff

mythtv-0.21/libs/libmythtv/channelbase.cpp

@@ -600 +600 @@
     return GetChannels(inputid);
 }
 
-bool ChannelBase::ChangeExternalChannel(const QString &channum)
+bool ChannelBase::ChangeExternalChannel(const QString &freqid, const QString &channum)
 {
 #ifdef USING_MINGW
     VERBOSE(VB_IMPORTANT, LOC_WARN +
@@ -613 +613 @@
     if (changer.isEmpty())
         return false;
 
-    QString command = QString("%1 %2").arg(changer).arg(channum);
+    QString command = QString("%1 %2 %3").arg(changer).arg(freqid).arg(channum);
 
     VERBOSE(VB_CHANNEL, QString("External channel change: %1").arg(command));
     pid_t child = fork();
--- mythtv-0.21/libs/libmythtv/channel.cpp~      2008-03-15 14:42:42.000000000 +0000
+++ mythtv-0.21/libs/libmythtv/channel.cpp       2008-03-15 14:51:00.000000000 +0000
@@ -532 +532 @@
                 return false;
         }
     }
-    else if (!ChangeExternalChannel(freqid))
+    else if (ChangeExternalChannel(freqid,channum))
+      {
+        if ((*it)->name.contains("television", false))
+        {
+            if (isFrequency)
+            {
+                if (!Tune(frequency, "", (is_dtv) ? "8vsb" : "analog", dtv_si_std))
+                {
+                    return false;
+                }
+            }
+            else
+            {
+                if (!TuneTo(freqid, finetune))
+                    return false;
+            }
+        }
+      }
+    else
         return false;
 
     // Set the current channum to the new channel's channum
--- mythtv-0.21/libs/libmythtv/firewirechannel.cpp~      2008-01-16 17:55:48.000000000 +0000
+++ mythtv-0.21/libs/libmythtv/firewirechannel.cpp       2008-03-15 13:55:28.000000000 +0000
@@ -95 +95 @@
     bool ok = false;
     if (!(*it)->externalChanger.isEmpty())
     {
-        ok = ChangeExternalChannel(freqid);
+        ok = ChangeExternalChannel(freqid,channum);
         SetSIStandard("mpeg");
         SetDTVInfo(0,0,0,0,1);
     }

mythtv-0.21/libs/libmythtv/channelbase.h

@@ -115 +115 @@
         int inputNum, uint &mplexid_restriction) const;
 
     virtual int GetCardID(void) const;
-    virtual bool ChangeExternalChannel(const QString &newchan);
+    virtual bool ChangeExternalChannel(const QString &freqid, const QString &channum);
     static void StoreInputChannels(const InputMap&);
     static void StoreDefaultInput(uint cardid, const QString &input);
 

mythtv-0.21/libs/libmythtv/iptvchannel.cpp

@@ -107 +107 @@
         return false;
     }
 
-    if (!(*it)->externalChanger.isEmpty() && !ChangeExternalChannel(channum))
+    if (!(*it)->externalChanger.isEmpty() && !ChangeExternalChannel(channum,"0"))
         return false;
 
     // Set the current channum to the new channel's channum

mythtv-0.21/libs/libmythtv/hdhrchannel.cpp

@@ -331 +331 @@
             return false;
         }
     }
-    else if (!ChangeExternalChannel(freqid))
+    else if (!ChangeExternalChannel(freqid,channum))
         return false;
 
     // Set the current channum to the new channel's channum