switching to recording by calling /recordings/play/<recording-number>…

… - untested
yavdr · Apr 30, 2012 · fed3551 · fed3551
1 parent 7f2e269
commit fed3551
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 2 deletions.
diff --git a/recordings.cpp b/recordings.cpp
@@ -6,6 +6,15 @@ void RecordingsResponder::reply(ostream& out, cxxtools::http::Request& request,
   QueryHandler::addHeader(reply);
   bool found = false;
 
+  if ((int)request.url().find("/recordings/play") == 0 ) {
+     if ( request.method() == "GET" ) {
+        playRecording(out, request, reply);
+     } else {
+        reply.httpReturn(501, "Only GET method is supported by the /recordings/play service.");
+     }
+     found = true;
+  }
+
   if ((int)request.url().find("/recordings/cut") == 0 ) {
      if ( request.method() == "GET" ) {
 	showCutterStatus(out, request, reply);
@@ -47,6 +56,22 @@ void RecordingsResponder::reply(ostream& out, cxxtools::http::Request& request,
   }
 }
 
+void RecordingsResponder::playRecording(std::ostream& out, cxxtools::http::Request& request, cxxtools::http::Reply& reply)
+{
+  QueryHandler q("/recordings/play", request);
+  int recording_number = q.getParamAsInt(0);
+  if ( recording_number < 0 || recording_number >= Recordings.Count() ) {
+     reply.httpReturn(404, "Wrong recording number!");
+  } else {
+     cRecording* recording = Recordings.Get(recording_number);
+     if ( recording != NULL ) {
+        TaskScheduler::get()->SwitchableRecording(recording);
+     } else {
+        reply.httpReturn(404, "Wrong recording number!");
+     }
+  }
+}
+
 void RecordingsResponder::deleteRecording(ostream& out, cxxtools::http::Request& request, cxxtools::http::Reply& reply)
 {
   QueryHandler q("/recordings", request);

diff --git a/recordings.h b/recordings.h
@@ -27,6 +27,7 @@ class RecordingsResponder : public cxxtools::http::Responder
     void deleteMarks(std::ostream& out, cxxtools::http::Request& request, cxxtools::http::Reply& reply);
     void cutRecording(std::ostream& out, cxxtools::http::Request& request, cxxtools::http::Reply& reply);
     void showCutterStatus(std::ostream& out, cxxtools::http::Request& request, cxxtools::http::Reply& reply);
+    void playRecording(std::ostream& out, cxxtools::http::Request& request, cxxtools::http::Reply& reply);
 };
 
 typedef cxxtools::http::CachedService<RecordingsResponder> RecordingsService;

diff --git a/restfulapi.cpp b/restfulapi.cpp
@@ -155,8 +155,17 @@ void cPluginRestfulapi::MainThreadHook(void)
 
   if (!( channelID == tChannelID::InvalidID )) {
      cChannel* channel = Channels.GetByChannelID(channelID);
-     if (channel != NULL)
+     if (channel != NULL) {
         Channels.SwitchTo( channel->Number() );
+	scheduler->SwitchableChannel(tChannelID::InvalidID);
+     }
+  }
+
+  cRecording* recording = scheduler->SwitchableRecording();
+
+  if (recording != NULL) {
+     cReplayControl::SetRecording(recording->FileName(), recording->Title());
+     scheduler->SwitchableRecording(NULL);
   }
 }
 

diff --git a/tools.h b/tools.h
@@ -315,15 +315,18 @@ class TaskScheduler
   protected:
     std::list<BaseTask*> tasks;
     tChannelID _channel;
+    cRecording* _recording;
     cMutex     _channelMutex;
   public:
-    TaskScheduler() { _channel = tChannelID::InvalidID; };
+    TaskScheduler() { _channel = tChannelID::InvalidID; _recording = NULL; };
     ~TaskScheduler();
     static TaskScheduler* get();
     void AddTask(BaseTask* task) { tasks.push_back(task); };
     void DoTasks();
     void SwitchableChannel(tChannelID channel);
     tChannelID SwitchableChannel();
+    void SwitchableRecording(cRecording* recording) { _recording = recording; }
+    cRecording* SwitchableRecording() { return _recording; }
 };
 
 #endif