Ticket #10383: 10383.patch

mythtv/libs/libmythmetadata/metadatadownload.cpp

@@ -90 +90 @@
         {
             if (lookup->GetSubtype() == kProbableTelevision)
             {
-                if (lookup->GetSeason() > 0 || lookup->GetEpisode() > 0)
+                if ( lookup->GetSeason() > 0 || lookup->GetEpisode() > 0)
                     list = handleTelevision(lookup);
                 else if (!lookup->GetSubtitle().isEmpty())
                     list = handleVideoUndetermined(lookup);
@@ -213 +213 @@
 
 MetadataLookupList MetadataDownload::runGrabber(QString cmd, QStringList args,
                                                 MetadataLookup* lookup,
+                                                LookupType lookuptype,
                                                 bool passseas)
 {
     MythSystem grabber(cmd, args, kMSNoRunShell | kMSStdOut | kMSBuffered);
@@ -235 +236 @@
         {
             MetadataLookup *tmp = ParseMetadataItem(item, lookup,
                 passseas);
+            tmp->SetSubtype(lookuptype);
             list.append(tmp);
             item = item.nextSiblingElement("item");
         }
@@ -469 +471 @@
         args.append(QString("-D"));
         args.append(lookup->GetInetref());
     }
-    list = runGrabber(cmd, args, lookup);
+    list = runGrabber(cmd, args, lookup, kProbableGame);
 
     return list;
 }
@@ -513 +515 @@
             args.append(QString("-D"));
             args.append(lookup->GetInetref());
         }
-        list = runGrabber(cmd, args, lookup);
+        list = runGrabber(cmd, args, lookup, kProbableMovie);
+
     }
     else if (!mxml.isEmpty())
         list = readMXML(mxml, lookup);
@@ -530 +533 @@
     QString cmd = GetTelevisionGrabber();
 
     QStringList args;
+
     args.append(QString("-l")); // Language Flag
     args.append(gCoreContext->GetLanguage()); // UI Language
 
@@ -567 +571 @@
         args.append(QString("-C"));
         args.append(lookup->GetCollectionref());
     }
-    list = runGrabber(cmd, args, lookup);
+    list = runGrabber(cmd, args, lookup, kProbableTelevision);
 
     // Collection Fallback
     // If the lookup allows generic metadata, and the specific
@@ -610 +614 @@
     args.append(subtitle);
 
     // Try to do a title/subtitle lookup
-    list = runGrabber(cmd, args, lookup, false);
+    list = runGrabber(cmd, args, lookup, kProbableTelevision, false);
 
     if (list.count() == 1)
         list.at(0)->SetStep(kLookupData);
@@ -649 +653 @@
         lookup->SetEpisode(1);
     }
 
-    list = runGrabber(cmd, args, lookup, true);
+    list = runGrabber(cmd, args, lookup, kProbableTelevision, true);
 
     if (list.count() == 1)
     {

mythtv/libs/libmythmetadata/metadatadownload.h

@@ -71 +71 @@
                                       QString originaltitle);
     MetadataLookupList  runGrabber(QString cmd, QStringList args,
                                    MetadataLookup* lookup,
+                                   LookupType lookuptype,
                                    bool passseas = true);
     MetadataLookupList  readMXML(QString MXMLpath,
                                  MetadataLookup* lookup,

mythtv/libs/libmythtv/mythplayer.cpp

@@ -2449 +2449 @@
     if (!pginfo)
         return;
 
+    discontinuity = true;
+
     bool newIsDummy = player_ctx->tvchain->GetCardType(newid) == "DUMMY";
 
     SetPlayingInfo(*pginfo);