Ticket #3162: nzmheg.patch

keys.txt

@@ -75 +75 @@
 - F7          Toggle Background on/off
 - F8          Reveal hidden text.
 
-When in MHEG ITV Menu mode:
+When MHEG ITV is enabled:
 - F2-F5       Menu Red, Green, Yellow, or Blue, respectively
-- F6          Exit ITV Menu
-- F7          Toggle Menu Text
+- F6          Exit key, exits from interactive mode on some channels
+- F7          Text key, enters interactive mode on some channels
+- F12         EPG key, enters EPG mode (New Zealand only).
+  The effect of these keys depends on what is being displayed.  The arrow,
+  Enter, and 0-9 keys may also be used.
 
 Without the stickykeys option selected:
 

libs/libmythtv/tv_play.cpp

@@ -417 +417 @@
     REG_KEY("ITV Menu", "MENUBLUE",   "Menu Blue",   "F5");
     REG_KEY("ITV Menu", "TEXTEXIT",   "Menu Exit",   "F6");
     REG_KEY("ITV Menu", "MENUTEXT",   "Menu Text",   "F7");
+    REG_KEY("ITV Menu", "MENUEPG",    "Menu EPG",    "F12");
 /*
   keys already used:
 
@@ -441 +442 @@
   Global:   F1,
   Playback:                   F7,F8,F9,F10,F11
   Teletext     F2,F3,F4,F5,F6,F7,F8
-  ITV          F2,F3,F4,F5,F6,F7
+  ITV          F2,F3,F4,F5,F6,F7,F12
 
   Playback: Ctrl-B,Ctrl-G
 */

libs/libmythtv/mhi.h

@@ -101 +101 @@
     void DrawImage(int x, int y, const QRect &rect, const QImage &image);
 
     virtual int GetChannelIndex(const QString &str);
+    /// Get netId etc from the channel index.
+    virtual bool GetServiceInfo(int channelId, int &netId, int &origNetId,
+                                int &transportId, int &serviceId);
     virtual bool TuneTo(int channel);
 
     /// Begin playing audio from the specified stream

libs/libmythtv/mhi.cpp

@@ -327 +327 @@
     int action = 0;
     QMutexLocker locker(&m_keyLock);
 
+    // This supports the UK and NZ key profile registers.
+    // The UK uses 3, 4 and 5 and NZ 13, 14 and 15.  These are
+    // similar but the NZ profile also provides an EPG key.
+
     if (key == "UP")
     {
-        if (m_keyProfile == 4 || m_keyProfile == 5)
+        if (m_keyProfile == 4 || m_keyProfile == 5 ||
+            m_keyProfile == 14 || m_keyProfile == 15)
             action = 1;
     }
     else if (key == "DOWN")
     {
-        if (m_keyProfile == 4 || m_keyProfile == 5)
+        if (m_keyProfile == 4 || m_keyProfile == 5 ||
+            m_keyProfile == 14 || m_keyProfile == 15)
             action = 2;
     }
     else if (key == "LEFT")
     {
-        if (m_keyProfile == 4 || m_keyProfile == 5)
+        if (m_keyProfile == 4 || m_keyProfile == 5 ||
+            m_keyProfile == 14 || m_keyProfile == 15)
             action = 3;
     }
     else if (key == "RIGHT")
     {
-        if (m_keyProfile == 4 || m_keyProfile == 5)
+        if (m_keyProfile == 4 || m_keyProfile == 5 ||
+            m_keyProfile == 14 || m_keyProfile == 15)
             action = 4;
     }
     else if (key == "0" || key == "1" || key == "2" ||
@@ -352 +360 @@
              key == "6" || key == "7" || key == "8" ||
              key == "9")
     {
-        if (m_keyProfile == 4)
+        if (m_keyProfile == 4 || m_keyProfile == 14)
             action = key.toInt() + 5;
     }
     else if (key == "SELECT")
     {
-        if (m_keyProfile == 4 || m_keyProfile == 5)
+        if (m_keyProfile == 4 || m_keyProfile == 5 ||
+            m_keyProfile == 14 || m_keyProfile == 15)
             action = 15;
     }
     else if (key == "TEXTEXIT")
@@ -371 +380 @@
     else if (key == "MENUBLUE")
         action = 103;
     else if (key == "MENUTEXT")
-        action = 104;
+        action = m_keyProfile > 12 ? 105 : 104;
+    else if (key == "MENUEPG")
+        action = m_keyProfile > 12 ? 300 : 0;
 
     if (action != 0)
     {
@@ -573 +584 @@
         if (query.exec() && query.isActive() && query.next())
             return query.value(0).toInt();
     }
-    else if (str == "rec://svc/cur")
+    else if (str == "rec://svc/cur" || str == "rec://svc/def")
         return m_currentChannel;
     else if (str.startsWith("rec://"))
     {
@@ -581 +592 @@
     return -1;
 }
 
+// Get netId etc from the channel index.  This is the inverse of GetChannelIndex.
+bool MHIContext::GetServiceInfo(int channelId, int &netId, int &origNetId,
+                                int &transportId, int &serviceId)
+{
+    MSqlQuery query(MSqlQuery::InitCon());
+    query.prepare("SELECT networkid, transportid, serviceid "
+                  "FROM channel, dtv_multiplex "
+                  "WHERE chanid           = :CHANID AND "
+                  "      channel.mplexid  = dtv_multiplex.mplexid");
+    query.bindValue(":CHANID", channelId);
+    if (query.exec() && query.isActive() && query.next())
+    {
+        netId = query.value(0).toInt();
+        origNetId = netId; // We don't have this in the database.
+        transportId = query.value(1).toInt();
+        serviceId = query.value(2).toInt();
+        return true;
+    }
+    else return false;
+}
+
 bool MHIContext::TuneTo(int channel)
 {
     if (!m_isLive)

libs/libmythfreemheg/freemheg.h

@@ -116 +116 @@
 
     // Tuning.  Get the index corresponding to a given channel.
     virtual int GetChannelIndex(const QString &str) = 0;
+    // Get netId etc from the channel index.
+    virtual bool GetServiceInfo(int channelId, int &netId, int &origNetId,
+                                int &transportId, int &serviceId) = 0;
     // Tune to an index returned by GetChannelIndex
     virtual bool TuneTo(int channel) = 0;
 

libs/libmythfreemheg/Programs.cpp

@@ -389 +389 @@
             // Indicates whether to perform a subsequent TIn quietly or normally. 
             MHERROR("SI_TuneIndexInfo ResidentProgram is not implemented");
         }
+
         else if (m_Name.Equal("BSI")) { // SI_GetBasicSI
             // Returns basic SI information about the service indicated by an index
             // returned by GSI.
             // Returns networkID, origNetworkID, transportStreamID, serviceID
-            MHERROR("SI_GetBasicSI ResidentProgram is not implemented");
+            if (args.Size() == 5) {
+                int channelId = GetInt(args.GetAt(0), engine);
+                int netId, origNetId, transportId, serviceId;
+                // Look the information up in the database.
+                bool res = engine->GetContext()->GetServiceInfo(channelId, netId, origNetId,
+                                transportId, serviceId);
+                if (res)
+                {
+                    engine->FindObject(*(args.GetAt(1)->GetReference()))->SetVariableValue(netId);
+                    engine->FindObject(*(args.GetAt(2)->GetReference()))->SetVariableValue(origNetId);
+                    engine->FindObject(*(args.GetAt(3)->GetReference()))->SetVariableValue(transportId);
+                    engine->FindObject(*(args.GetAt(4)->GetReference()))->SetVariableValue(serviceId);
+                }
+                SetSuccessFlag(success, res, engine);
+            }
+            else SetSuccessFlag(success, false, engine);
         }
+
         else if (m_Name.Equal("GBI")) { // GetBootInfo
             // Gets the NB_info field.
             MHERROR("GetBootInfo ResidentProgram is not implemented");
         }
+
         else if (m_Name.Equal("CCR")) { // CheckContentRef
             // Sees if an item with a particular content reference is available
-            // in the carousel.
-            MHERROR("CheckContentRef ResidentProgram is not implemented");
+            // in the carousel.  This looks like it should block until the file
+            // is available.  The profile recommends that this should be forked
+            // rather than called.
+            if (args.Size() == 3) {
+                MHUnion un;
+                un.GetValueFrom(*(args.GetAt(0)), engine);
+                un.CheckType(MHUnion::U_ContentRef);
+                MHContentRef fileName;
+                fileName.Copy(un.m_ContentRefVal);
+                QString csPath = engine->GetPathName(fileName.m_ContentRef);
+                bool result = false;
+                QByteArray text;
+                // Try to load the object.
+                if (! csPath.isEmpty())
+                    result = engine->GetContext()->GetCarouselData(csPath, text);
+                // Set the result variable.
+                MHParameter *pResFlag = args.GetAt(1);
+                engine->FindObject(*(pResFlag->GetReference()))->SetVariableValue(result);
+                MHParameter *pResCR = args.GetAt(2);
+                // Copy the file name to the resulting content ref.
+                engine->FindObject(*(pResCR->GetReference()))->SetVariableValue(fileName);
+                SetSuccessFlag(success, true, engine);
+            }
+            else SetSuccessFlag(success, false, engine);
         }
+
         else if (m_Name.Equal("CGR")) { // CheckGroupIDRef
             // Sees if an application or scene with a particular group id
             // is available in the carousel.