mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-11 23:50:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

movieplayer/record: try to fix timeshift stop; ...

Browse Source 
Timeshift was stopped immediately when mpkey_stop was pressed.
After that the record/timeshift menu was shown, but is wasn't possilble
to return to timeshift record.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 576fde651a
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-07-23 (Mon, 23 Jul 2018)

Origin message was:
------------------
- movieplayer/record: try to fix timeshift stop; ...

Timeshift was stopped immediately when mpkey_stop was pressed.
After that the record/timeshift menu was shown, but is wasn't possilble
to return to timeshift record.


------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2018-07-23 23:55:19 +02:00
parent fc2e407816
commit fd3c249679
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/driver/record.cpp
View File

@@ -1415,8 +1415,14 @@ void CRecordManager::StartTimeshift()
if(res) if(res)
{ {
CMoviePlayerGui::getInstance().exec(NULL, tmode); CMoviePlayerGui::getInstance().exec(NULL, tmode);
#if 0
/*
ShowMenu() moved to movieplayer.cpp
Function is called when stop key is pressed.
*/
if(g_settings.temp_timeshift && tstarted && autoshift) if(g_settings.temp_timeshift && tstarted && autoshift)
ShowMenu(); ShowMenu();
#endif
} }
} }
} }

14
src/gui/movieplayer.cpp
View File

@@ -1634,9 +1634,17 @@ void CMoviePlayerGui::PlayFileLoop(void)
if (msg == (neutrino_msg_t) g_settings.mpkey_plugin) { if (msg == (neutrino_msg_t) g_settings.mpkey_plugin) {
g_Plugins->startPlugin_by_name(g_settings.movieplayer_plugin.c_str ()); g_Plugins->startPlugin_by_name(g_settings.movieplayer_plugin.c_str ());
} else if (msg == (neutrino_msg_t) g_settings.mpkey_stop) { } else if (msg == (neutrino_msg_t) g_settings.mpkey_stop) {
playstate = CMoviePlayerGui::STOPPED; bool timeshift_stopped = false;
keyPressed = CMoviePlayerGui::PLUGIN_PLAYSTATE_STOP;
ClearQueue(); if (timeshift != TSHIFT_MODE_OFF)
timeshift_stopped = CRecordManager::getInstance()->ShowMenu();
if (timeshift == TSHIFT_MODE_OFF || timeshift_stopped)
{
playstate = CMoviePlayerGui::STOPPED;
keyPressed = CMoviePlayerGui::PLUGIN_PLAYSTATE_STOP;
ClearQueue();
}
} else if (msg == CRCInput::RC_left || msg == CRCInput::RC_right) { } else if (msg == CRCInput::RC_left || msg == CRCInput::RC_right) {
bool reset_vzap_it = true; bool reset_vzap_it = true;
switch (g_settings.mode_left_right_key_tv) switch (g_settings.mode_left_right_key_tv)