From d338be9526c1f41afa8fe9deabe7353b6766e240 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Tue, 15 Jan 2019 21:32:08 +0100 Subject: [PATCH] - timeshift: small renamings in timeshift action keys Signed-off-by: Thilo Graf --- 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 d3ea89031..37c54badf 100644 --- a/src/driver/record.cpp +++ b/src/driver/record.cpp @@ -1358,7 +1358,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 016aceb74..f21d42045 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -428,10 +428,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 // TODO ? diff --git a/src/neutrino.cpp b/src/neutrino.cpp index fe8c8ee11..4effc1764 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -3030,7 +3030,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) {