mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

neutrino.cpp: try to fix timeshift stop/restart,

Browse Source 
after quit from playback audioplayer, picture viewer and so on
This commit is contained in:
[CST] Focus
2015-01-21 18:00:25 +03:00
parent c6424534e8
commit ecff984432
4 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/driver/record.cpp
View File

@@ -1050,6 +1050,11 @@ bool CRecordManager::StopAutoRecord(bool lock)
return (inst != NULL);
}
void CRecordManager::StopAutoTimer()
{
g_RCInput->killTimer (shift_timer);
}
void CRecordManager::StartNextRecording()
{
CTimerd::RecordingInfo * eventinfo = NULL;
@@ -1230,7 +1235,8 @@ int CRecordManager::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data
else if ((msg == NeutrinoMessages::EVT_TIMER)) {
if(data == shift_timer) {
shift_timer = 0;
StartAutoRecord();
if (!FindTimeshift())
StartAutoRecord();
return messages_return::handled;
}
else if(data == check_timer) {
@@ -1265,11 +1271,13 @@ void CRecordManager::StartTimeshift()
std::string tmode = "ptimeshift"; // already recording, pause
bool res = true;
t_channel_id live_channel_id = CZapit::getInstance()->GetCurrentChannelID();
bool tstarted = false;
/* start temporary timeshift if enabled and not running, but dont start second record */
if (g_settings.temp_timeshift) {
if (!FindTimeshift()) {
res = StartAutoRecord();
tmode = "timeshift"; // record just started
tstarted = true;
}
}
else if (!RecordingStatus(live_channel_id)) {
@@ -1280,7 +1288,7 @@ void CRecordManager::StartTimeshift()
if(res)
{
CMoviePlayerGui::getInstance().exec(NULL, tmode);
if(g_settings.temp_timeshift && !g_settings.auto_timeshift && autoshift)
if(g_settings.temp_timeshift && tstarted && autoshift)
ShowMenu();
}
}