Drop external player support from MythNews and while we're at it pass…

… the article title/description in so that they are displayed in the OSD.
MythTV · Jan 23, 2012 · 5bc07dc · 5bc07dc
1 parent ee0a85c
commit 5bc07dc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 18 deletions.
diff --git a/mythplugins/mythnews/mythnews/mythnews.cpp b/mythplugins/mythnews/mythnews/mythnews.cpp
@@ -875,7 +875,7 @@ void MythNews::slotViewArticle(MythUIButtonListItem *articlesListItem)
     QString sFilename(fileprefix + "/newstempfile");
 
     if (getHttpFile(sFilename, cmdURL))
-        playVideo(sFilename);
+        playVideo(sFilename, article);
 }
 
 void MythNews::ShowEditDialog(bool edit)
@@ -957,25 +957,12 @@ void MythNews::deleteNewsSite(void)
 }
 
 // does not need locking
-void MythNews::playVideo(const QString &filename)
+void MythNews::playVideo(const QString &filename, const NewsArticle &article)
 {
-    QString command_string = gCoreContext->GetSetting("VideoDefaultPlayer");
-
     sendPlaybackStart();
 
-    if ((command_string.indexOf("Internal", 0, Qt::CaseInsensitive) > -1) ||
-        (command_string.length() < 1))
-    {
-        command_string = "Internal";
-        GetMythMainWindow()->HandleMedia(command_string, filename);
-    }
-    else
-    {
-        if (command_string.contains("%s"))
-            command_string = command_string.replace("%s", filename);
-
-        myth_system(command_string);
-    }
+    GetMythMainWindow()->HandleMedia("Internal", filename, article.title(),
+                                     article.description());
 
     sendPlaybackEnd();
 }

diff --git a/mythplugins/mythnews/mythnews/mythnews.h b/mythplugins/mythnews/mythnews/mythnews.h
@@ -41,7 +41,7 @@ class MythNews : public MythScreenType
     bool getHttpFile(const QString &sFilename, const QString &cmdURL);
     void createProgress(const QString &title);
     QString formatSize(long long bytes, int prec);
-    void playVideo(const QString &filename);
+    void playVideo(const QString &filename, const NewsArticle &article);
 
     // menu stuff
     void ShowMenu(void);