Ticket #6029: alternate-player.3.patch

Index: mythvideo/mythvideo/videodlg.h
===================================================================
--- mythvideo/mythvideo/videodlg.h      (revision 19467)
+++ mythvideo/mythvideo/videodlg.h      (working copy)
@@ -57,6 +57,7 @@
     void SetCurrentNode(MythGenericTree *);
 
     void playVideo();
+    void playVideoAlt();
     void playVideoWithTrailers();
     void playTrailer();
 
@@ -188,6 +189,7 @@
     MythUIStateType  *m_userRatingState;
 
     class VideoDialogPrivate *m_d;
+    bool hasAltPlayer;
 };
 
 class VideoListDeathDelay : public QObject
Index: mythvideo/mythvideo/globalsettings.cpp
===================================================================
--- mythvideo/mythvideo/globalsettings.cpp      (revision 19467)
+++ mythvideo/mythvideo/globalsettings.cpp      (working copy)
@@ -272,6 +272,18 @@
     return gc;
 }
 
+HostLineEdit *VideoAlternatePlayer()
+{
+    HostLineEdit *gc = new HostLineEdit("VideoAlternatePlayer");
+    gc->setLabel(QObject::tr("Alternate Player"));
+    gc->setValue("");
+    gc->setHelpText(QObject::tr("If, for some reason, the default player "
+                    "doesn't play a video, you can play it in the alternate "
+                    "player by hitting the INFO button and selecting 'Watch "
+                    "In Alternate Player'"));
+    return gc;
+};
+
 ///////////////////////////////////////////////////////////
 //// DVD Settings
 ///////////////////////////////////////////////////////////
@@ -752,6 +764,7 @@
     videoplayersettings->setLabel(QObject::tr("Player Settings"));
     videoplayersettings->addChild(VideoDefaultPlayer());
     videoplayersettings->addChild(PlayerCommand());
+    videoplayersettings->addChild(VideoAlternatePlayer());
     videoplayersettings->addChild(VCDPlayerCommand());
     addChild(videoplayersettings);
 }
Index: mythvideo/mythvideo/videodlg.cpp
===================================================================
--- mythvideo/mythvideo/videodlg.cpp    (revision 19467)
+++ mythvideo/mythvideo/videodlg.cpp    (working copy)
@@ -701,7 +701,7 @@
     }
 
     void PlayVideo(const QString &filename,
-            const MetadataListManager &video_list)
+            const MetadataListManager &video_list, bool wantsAltPlayer = false)
     {
         const int WATCHED_WATERMARK = 10000; // Less than this and the chain of
                                              // videos will not be followed when
@@ -717,7 +717,10 @@
         {
             playing_time.start();
 
-            VideoPlayerCommand::PlayerFor(item.get()).Play();
+            if (wantsAltPlayer)
+                VideoPlayerCommand::AltPlayerFor(item.get()).Play();
+            else
+                VideoPlayerCommand::PlayerFor(item.get()).Play();
 
             if (item->ChildID() > 0)
                 item = video_list.byID(item->ChildID());
@@ -929,6 +932,8 @@
 
     m_popupStack = GetMythMainWindow()->GetStack("popup stack");
 
+    hasAltPlayer = gContext->GetSetting("VideoAlternatePlayer") != "";
+
     m_d->m_videoList->setCurrentVideoFilter(VideoFilterSettings(true,
                     lname));
 
@@ -1502,6 +1507,8 @@
     if (node && node->getInt() >= 0)
     {
         m_menuPopup->AddButton(tr("Watch This Video"), SLOT(playVideo()));
+        if (hasAltPlayer)
+            m_menuPopup->AddButton(tr("Watch This Video In Alternate Player"), SLOT(playVideoAlt()));
 
         if (gContext->GetNumSetting("mythvideo.TrailersRandomEnabled", 0))
         {
@@ -1809,6 +1816,19 @@
     VideoPlayerCommand::PlayerFor(metadata->GetTrailer()).Play();
 }
 
+void VideoDialog::playVideoAlt()
+{
+    Metadata *metadata = GetMetadata(GetItemCurrent());
+
+    if (metadata)
+        PlayVideo(metadata->Filename(), m_d->m_videoList->getListCache(), true);
+
+}
+
 void VideoDialog::setParentalLevel(const ParentalLevel::Level &level)
 {
     m_d->m_parentalLevel.SetLevel(level);
Index: mythvideo/mythvideo/playercommand.h
===================================================================
--- mythvideo/mythvideo/playercommand.h (revision 19467)
+++ mythvideo/mythvideo/playercommand.h (working copy)
@@ -4,6 +4,7 @@
 class VideoPlayerCommand
 {
   public:
+    static VideoPlayerCommand AltPlayerFor(const class Metadata *item);
     static VideoPlayerCommand PlayerFor(const class Metadata *item);
     static VideoPlayerCommand PlayerFor(const QString &filename);
 
Index: mythvideo/mythvideo/playercommand.cpp
===================================================================
--- mythvideo/mythvideo/playercommand.cpp       (revision 19467)
+++ mythvideo/mythvideo/playercommand.cpp       (working copy)
@@ -176,6 +176,21 @@
         ClearPlayerList();
     }
 
+    void AltPlayerFor(const Metadata *item)
+    {
+        QString play_command = gContext->GetSetting("VideoAlternatePlayer");
+        if (play_command.trimmed().isEmpty())
+        {
+            PlayerFor(item);
+        }
+        else
+        {
+            AddPlayer(play_command, item->Filename(), item->Plot(),
+                    item->Title(), item->Director(), item->Length(),
+                    QString::number(item->Year()));
+        }
+    }
+
     void PlayerFor(const Metadata *item)
     {
         if (item)
@@ -263,6 +278,13 @@
 
 ////////////////////////////////////////////////////////////////////////
 
+VideoPlayerCommand VideoPlayerCommand::AltPlayerFor(const Metadata *item)
+{
+    VideoPlayerCommand ret;
+    ret.m_d->AltPlayerFor(item);
+    return ret;
+}
+
 VideoPlayerCommand VideoPlayerCommand::PlayerFor(const Metadata *item)
 {
     VideoPlayerCommand ret;