From d64960d7de776685871eaacc5518a5c74c7c11d0 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 15 Jan 2019 21:32:08 +0100 Subject: [PATCH] timeshift: small renamings in timeshift action keys Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/ab38c21a03b6386e3e0606dd91e568d3c7f43872 Author: vanhofen Date: 2019-01-15 (Tue, 15 Jan 2019) Origin message was: ------------------ - timeshift: small renamings in timeshift action keys ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/driver/record.cpp | 2 +- src/gui/movieplayer.cpp | 4 ++-- src/neutrino.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/driver/record.cpp b/src/driver/record.cpp index 984101fa9..f55d73c27 100644 --- a/src/driver/record.cpp +++ b/src/driver/record.cpp @@ -1398,7 +1398,7 @@ void CRecordManager::StartTimeshift() { if(g_RemoteControl->is_video_started) { - std::string tmode = "ptimeshift"; // already recording, pause + std::string tmode = "timeshift_pause"; // already recording, pause bool res = true; t_channel_id live_channel_id = CZapit::getInstance()->GetCurrentChannelID(); // bool tstarted = false; diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index cbfcc4f24..cfd05aecb 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -426,10 +426,10 @@ int CMoviePlayerGui::exec(CMenuTarget * parent, const std::string & actionKey) else if (actionKey == "timeshift") { timeshift = TSHIFT_MODE_ON; } - else if (actionKey == "ptimeshift") { + else if (actionKey == "timeshift_pause") { timeshift = TSHIFT_MODE_PAUSE; } - else if (actionKey == "rtimeshift") { + else if (actionKey == "timeshift_rewind") { timeshift = TSHIFT_MODE_REWIND; } #if 0 diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 6a770e5fe..4f8064b6c 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -3211,7 +3211,7 @@ void CNeutrinoApp::RealRun() if(g_RemoteControl->is_video_started) { t_channel_id live_channel_id = CZapit::getInstance()->GetCurrentChannelID(); if(CRecordManager::getInstance()->RecordingStatus(live_channel_id)) - CMoviePlayerGui::getInstance().exec(NULL, "rtimeshift"); + CMoviePlayerGui::getInstance().exec(NULL, "timeshift_rewind"); } } else if( msg == CRCInput::RC_stop) {