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

movieplayer/record: stop playback of timeshift when zap to another channel

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: d03f201f8b
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-07-29 (Sun, 29 Jul 2018)

Origin message was:
------------------
- movieplayer/record: stop playback of timeshift when zap to another channel

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2018-07-29 00:54:54 +02:00
parent 27c978b608
commit 5457dfdaa1
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/driver/record.cpp
View File

@@ -1155,7 +1155,7 @@ bool CRecordManager::StopAutoRecord(bool lock)
g_RCInput->killTimer (shift_timer); g_RCInput->killTimer (shift_timer);
if(!autoshift) if (!autoshift)
return false; return false;
if (lock) if (lock)
@@ -1165,7 +1165,7 @@ bool CRecordManager::StopAutoRecord(bool lock)
if (inst) if (inst)
{ {
StopInstance(inst); StopInstance(inst);
CMoviePlayerGui::getInstance().timeshift = TSHIFT_MODE_OFF; CMoviePlayerGui::getInstance().stopTimeshift();
} }
if (lock) if (lock)

10
src/gui/movieplayer.cpp
View File

@@ -1252,6 +1252,16 @@ void CMoviePlayerGui::stopPlayBack(void)
printf("%s: stopped\n", __func__); printf("%s: stopped\n", __func__);
} }
void CMoviePlayerGui::stopTimeshift(void)
{
if (timeshift && playback)
{
printf("%s: stopping timeshift...\n", __func__);
playback->RequestAbort();
timeshift = TSHIFT_MODE_OFF;
}
}
void CMoviePlayerGui::Pause(bool b) void CMoviePlayerGui::Pause(bool b)
{ {
if (b && (playstate == CMoviePlayerGui::PAUSE)) if (b && (playstate == CMoviePlayerGui::PAUSE))

1
src/gui/movieplayer.h
View File

@@ -254,6 +254,7 @@ class CMoviePlayerGui : public CMenuTarget
void SetFile(std::string &name, std::string &file, std::string info1="", std::string info2="") { pretty_name = name; file_name = file; info_1 = info1; info_2 = info2; } void SetFile(std::string &name, std::string &file, std::string info1="", std::string info2="") { pretty_name = name; file_name = file; info_1 = info1; info_2 = info2; }
bool PlayBackgroundStart(const std::string &file, const std::string &name, t_channel_id chan, const std::string &script=""); bool PlayBackgroundStart(const std::string &file, const std::string &name, t_channel_id chan, const std::string &script="");
void stopPlayBack(void); void stopPlayBack(void);
void stopTimeshift(void);
void setLastMode(int m) { m_LastMode = m; } void setLastMode(int m) { m_LastMode = m; }
void Pause(bool b = true); void Pause(bool b = true);
void selectAudioPid(void); void selectAudioPid(void);