Merge pull request #6 from ua0lnj/master

Version 0.5.0.

README

@@ -23,6 +23,8 @@ vdr-mpv is a fork of the vdr-play plugin from Johns. It uses libmpv for playing
 media (video, audio, picture) in VDR and also displays the VDR OSD (On Screen Display) during playback.
 You can play internet or network streams also. For this you need make mpv with lua script
 and youtube-dl (for youtube stream).
+You can record some network stream, and play it like normal vdr recordings. This is experimental mpv
+function, so some streams may not be redorded correctly. Recording is made to the vdr video directory.
 
 Requirements
 ------------
@@ -152,7 +154,8 @@ Fast forward:           Speed up playback speed up to 32 times
 Red:                    Time search functionality like used in VDR recordings
 Green:                  Seek 60 seconds backwards
 Yellow:                 Seek 60 seconds forward
-Blue:                   Show menu with current playback options
+Blue:                   Show menu with current playback options, when network stream play
+                        show streams list
 Stop:                   Stop playback, exit from plugin if exit at the end is enabled
 Back:                   Show the browser menu from where the last file was launched
 Ok:                     Display current playback status or close status display
@@ -169,6 +172,9 @@ Audio:                  Display a menu to switch between the available audio
                         tracks
 Subtitles:              Display a menu to switch between the available subtitle
                         tracks
+Record:                 Recording while play a network stream. Press STOP once to stop recording
+Channel Up              Next stream while play a network sream
+Channel Dn              Previous stream while play a network sream
 
 If a disc menu is active the following keys loose their default function described
 above and gain the following function

control.c

@@ -9,6 +9,7 @@
 #include "control.h"
 #include "config.h"
 #include <vdr/interface.h>
+#include <vdr/videodir.h>
 
 cMpvControl::cMpvControl(string Filename, bool Shuffle)
 :cControl(Player = new cMpvPlayer(Filename.c_str(), Shuffle))
@@ -58,7 +59,7 @@ cMpvControl::~cMpvControl()
 
 void cMpvControl::ShowProgress(int playlist)
 {
-  if (!Player->IsPaused() && LastPlayerCurrent == Player->CurrentPlayTime() && Player->TotalPlayTime() > 0)
+  if (!Player->IsPaused() && LastPlayerCurrent == Player->CurrentPlayTime() && Player->TotalPlayTime() > 0 && !Player->NetworkPlay())
     return;
   LastPlayerCurrent = Player->CurrentPlayTime();
 
@@ -97,6 +98,7 @@ void cMpvControl::ShowProgress(int playlist)
     TitleDisplay += buffer;
     DisplayReplay->SetMarks(Marks());
   }
+  if (Player->IsRecord()) TitleDisplay = "REC " + TitleDisplay;
 
   DisplayReplay->SetTitle(TitleDisplay.c_str());
 
@@ -202,6 +204,11 @@ eOSState cMpvControl::ProcessKey(eKeys key)
         break;
       }
     case kFastRew:
+      if (Player->IsRecord())
+      {
+        Skins.Message(mtError, tr("Recording - can't rewing"));
+        break;
+      }
       if (Player->TotalPlayTime())
       {
         // reset to normal playback speed (if fastfwd is active currently) and then just go back 5 seconds since there is no fastrew in mpv
@@ -220,6 +227,11 @@ eOSState cMpvControl::ProcessKey(eKeys key)
         break;
       }
     case kFastFwd:
+      if (Player->IsRecord())
+      {
+        Skins.Message(mtError, tr("Recording - can't forwarding"));
+        break;
+      }
       if (Player->TotalPlayTime())
       {
         if (Player->CurrentPlaybackSpeed() < 32)
@@ -238,19 +250,35 @@ eOSState cMpvControl::ProcessKey(eKeys key)
       break;
     case kGreen | k_Repeat:
     case kGreen:
+      if (Player->IsRecord())
+      {
+        Skins.Message(mtError, tr("Recording - can't seek"));
+        break;
+      }
       Player->Seek(-60);
       break;
     case kYellow | k_Repeat:
     case kYellow:
+      if (Player->IsRecord())
+      {
+        Skins.Message(mtError, tr("Recording - can't seek"));
+        break;
+      }
       Player->Seek(+60);
       break;
 
     case kBlue:
+      infoVisible = false;
       MpvPluginConfig->ShowOptions = 1;
       cRemote::CallPlugin("mpv");
       break;
 
     case kBack:
+      if (Player->IsRecord())
+      {
+        Skins.Message(mtError, tr("Recording - stop record first!"));
+        break;
+      }
       if (Player->DiscNavActive())
       {
         Player->DiscNavPrev();
@@ -260,17 +288,26 @@ eOSState cMpvControl::ProcessKey(eKeys key)
       cRemote::CallPlugin("mpv");
       break;
     case kStop:
-      if (!MpvPluginConfig->ExitAtEnd)
+      if (Player->IsRecord())
       {
-        Hide();
-        if (MpvPluginConfig->SavePos)
-          Player->SavePosPlayer();
-        Player->StopPlayer();
+        Skins.Message(mtInfo, tr("Recording Stoped"));
+        Player->Record("");
+        cRecordings::Update(true);
       }
       else
       {
-        Hide();
-        Player->QuitPlayer();
+        if (!MpvPluginConfig->ExitAtEnd)
+        {
+          Hide();
+          if (MpvPluginConfig->SavePos)
+            Player->SavePosPlayer();
+          Player->StopPlayer();
+        }
+        else
+        {
+          Hide();
+          Player->QuitPlayer();
+        }
       }
       break;
 
@@ -300,13 +337,23 @@ eOSState cMpvControl::ProcessKey(eKeys key)
       break;
 
     case kNext:
+      if (Player->IsRecord())
+      {
+        Skins.Message(mtError, tr("Recording - can't next"));
+        break;
+      }
       if (MpvPluginConfig->PlaylistOnNextKey || (MpvPluginConfig->PlaylistIfNoChapters && !Player->NumChapters()))
         Player->NextPlaylistItem();
       else
         Player->NextChapter();
       break;
 
     case kPrev:
+      if (Player->IsRecord())
+      {
+        Skins.Message(mtError, tr("Recording - can't prev"));
+        break;
+      }
       if (MpvPluginConfig->PlaylistOnNextKey || (MpvPluginConfig->PlaylistIfNoChapters && !Player->NumChapters()))
         Player->PreviousPlaylistItem();
       else
@@ -315,27 +362,107 @@ eOSState cMpvControl::ProcessKey(eKeys key)
 
     case k1 | k_Repeat:
     case k1:
+      if (Player->IsRecord())
+      {
+        Skins.Message(mtError, tr("Recording - can't seek"));
+        break;
+      }
       Player->Seek(-15);
       break;
     case k3 | k_Repeat:
     case k3:
+      if (Player->IsRecord())
+      {
+        Skins.Message(mtError, tr("Recording - can't seek"));
+        break;
+      }
       Player->Seek(+15);
       break;
 
     case k7:
+      if (Player->IsRecord())
+      {
+        Skins.Message(mtError, tr("Recording - can't prev"));
+        break;
+      }
       if (MpvPluginConfig->PlaylistOnNextKey)
         Player->PreviousChapter();
       else
         Player->PreviousPlaylistItem();
       break;
 
     case k9:
+      if (Player->IsRecord())
+      {
+        Skins.Message(mtError, tr("Recording - can't next"));
+        break;
+      }
       if (MpvPluginConfig->PlaylistOnNextKey)
         Player->NextChapter();
       else
         Player->NextPlaylistItem();
       break;
 
+    case kRecord:
+      if (!Player->NetworkPlay())
+      {
+        Skins.Message(mtError, tr("Not network stream, can't recording!"));
+      }
+      else
+      {
+        if (!Player->IsRecord())
+        {
+          time_t timeNow;
+          char buffer [20];
+          struct tm * timeinfo;
+          time (&timeNow);
+          timeinfo = localtime(&timeNow);
+          strftime (buffer,20,"%Y-%m-%d.%H.%M.%S",timeinfo);
+          string dir = cVideoDirectory::Name();
+          dir += "/" + Player->ListTitle(Player->CurrentListPos());
+          mkdir(dir.c_str(),0777);
+          dir += "/";
+          dir += buffer;
+          dir += "-0.rec";
+          mkdir(dir.c_str(),0777);
+          string rec = dir+"/"+"00001.ts";
+#ifdef DEBUG
+          esyslog("[mpv] recording %s\n",rec.c_str());
+#endif
+          Player->Record(rec.c_str());
+          Skins.Message(mtInfo, tr("Recording Started"));
+        }
+      }
+      break;
+
+    case kChanUp:
+      if (Player->NetworkPlay())
+      {
+        if (Player->IsRecord())
+        {
+          Skins.Message(mtError, tr("Recording - can't next"));
+          break;
+        }
+        Player->NextPlaylistItem();
+        ShowProgress(0);
+        count = 2;
+      }
+      break;
+
+    case kChanDn:
+      if (Player->NetworkPlay())
+      {
+        if (Player->IsRecord())
+        {
+          Skins.Message(mtError, tr("Recording - can't prev"));
+          break;
+        }
+        Player->PreviousPlaylistItem();
+        ShowProgress(0);
+        count = 2;
+      }
+      break;
+
     default:
       break;
   }

filebrowser.c

@@ -39,6 +39,14 @@ void cMpvFilebrowser::ShowDirectory(string Path)
   struct dirent *Entry;
 
   hDir = opendir(Path.c_str());
+
+  // current directory deleted?
+  if (!hDir && Path != rootDir)
+  {
+    currentDir = rootDir;
+    Path = rootDir;
+    hDir = opendir(Path.c_str());
+  }
   // do not crash if browser root directory absent
   if (!hDir)
   {

menu_options.c

@@ -112,6 +112,11 @@ eOSState cMpvMenuPlaylist::ProcessKey(eKeys Key)
     switch (Key)
     {
       case kOk:
+        if (player->IsRecord())
+        {
+          Skins.Message(mtError, tr("Recording - can't play!"));
+          break;
+        }
         cMpvMenuPlaylistItem *item = (cMpvMenuPlaylistItem *) Get(Current());
         player->PlayIndex(item->Number());
       return osEnd;

mpv.c

@@ -19,7 +19,7 @@
 #include "menu_options.h"
 #include "mpv_service.h"
 
-static const char *VERSION = "0.4.0"
+static const char *VERSION = "0.5.0"
 #ifdef GIT_REV
     "-GIT" GIT_REV
 #endif
@@ -99,7 +99,10 @@ cOsdObject *cMpvPlugin::MainMenuAction(void)
     if (!MpvPluginConfig->ShowOptions)
       return new cMpvFilebrowser(MpvPluginConfig->BrowserRoot, MpvPluginConfig->DiscDevice);
     else
-      return new cMpvMenuOptions(cMpvPlayer::Player());
+      if (cMpvPlayer::Player()->NetworkPlay())
+        return new cMpvMenuPlaylist(cMpvPlayer::Player());
+      else
+        return new cMpvMenuOptions(cMpvPlayer::Player());
   }
   return new cMpvFilebrowser(MpvPluginConfig->BrowserRoot, MpvPluginConfig->DiscDevice);
 }

player.c

@@ -33,6 +33,7 @@ using std::vector;
 #define MPV_OBSERVE_MEDIA_TITLE 10
 #define MPV_OBSERVE_LIST_POS 11
 #define MPV_OBSERVE_LIST_COUNT 12
+#define MPV_OBSERVE_VIA_NET 13
 
 volatile int cMpvPlayer::running = 0;
 cMpvPlayer *cMpvPlayer::PlayerHandle = NULL;
@@ -65,6 +66,7 @@ void *cMpvPlayer::ObserverThread(void *handle)
   mpv_observe_property(Player->hMpv, MPV_OBSERVE_MEDIA_TITLE, "media-title", MPV_FORMAT_STRING);
   mpv_observe_property(Player->hMpv, MPV_OBSERVE_LIST_POS, "playlist-pos-1", MPV_FORMAT_INT64);
   mpv_observe_property(Player->hMpv, MPV_OBSERVE_LIST_COUNT, "playlist-count", MPV_FORMAT_INT64);
+  mpv_observe_property(Player->hMpv, MPV_OBSERVE_VIA_NET, "demuxer-via-network", MPV_FORMAT_FLAG);
 
   while (Player->PlayerIsRunning())
   {
@@ -138,6 +140,7 @@ cMpvPlayer::cMpvPlayer(string Filename, bool Shuffle)
   PlayShuffle = Shuffle;
   running = 0;
   OriginalFps = -1;
+  PlayerRecord = 0;
 }
 
 cMpvPlayer::~cMpvPlayer()
@@ -441,6 +444,10 @@ void cMpvPlayer::HandlePropertyChange(mpv_event *event)
       PlayerSpeed = (int)*(double*)property->data;
     break;
 
+    case MPV_OBSERVE_VIA_NET :
+      isNetwork = (int)*(int64_t*)property->data;
+    break;
+
     case MPV_OBSERVE_MEDIA_TITLE :
       mediaTitle = *(char**)property->data;
     break;
@@ -476,6 +483,7 @@ void cMpvPlayer::HandlePropertyChange(mpv_event *event)
           }
         }
       }
+
     break;
   }
 }
@@ -674,6 +682,15 @@ void cMpvPlayer::PlayNew(string Filename)
   mpv_command(hMpv, cmd);
 }
 
+void cMpvPlayer::Record(string Filename)
+{
+  mpv_set_option_string(hMpv, "stream-record", Filename.c_str());
+  if (Filename == "")
+    PlayerRecord = 0;
+  else
+    PlayerRecord = 1;
+}
+
 void cMpvPlayer::Seek(int Seconds)
 {
   SendCommand("seek %d\n", Seconds);