mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-03 02:41:12 +02:00
movieplayer/record: stop playback of timeshift when zap to another channel
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:
@@ -1155,7 +1155,7 @@ bool CRecordManager::StopAutoRecord(bool lock)
|
||||
|
||||
g_RCInput->killTimer (shift_timer);
|
||||
|
||||
if(!autoshift)
|
||||
if (!autoshift)
|
||||
return false;
|
||||
|
||||
if (lock)
|
||||
@@ -1165,7 +1165,7 @@ bool CRecordManager::StopAutoRecord(bool lock)
|
||||
if (inst)
|
||||
{
|
||||
StopInstance(inst);
|
||||
CMoviePlayerGui::getInstance().timeshift = TSHIFT_MODE_OFF;
|
||||
CMoviePlayerGui::getInstance().stopTimeshift();
|
||||
}
|
||||
|
||||
if (lock)
|
||||
|
@@ -1252,6 +1252,16 @@ void CMoviePlayerGui::stopPlayBack(void)
|
||||
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)
|
||||
{
|
||||
if (b && (playstate == CMoviePlayerGui::PAUSE))
|
||||
|
@@ -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; }
|
||||
bool PlayBackgroundStart(const std::string &file, const std::string &name, t_channel_id chan, const std::string &script="");
|
||||
void stopPlayBack(void);
|
||||
void stopTimeshift(void);
|
||||
void setLastMode(int m) { m_LastMode = m; }
|
||||
void Pause(bool b = true);
|
||||
void selectAudioPid(void);
|
||||
|
Reference in New Issue
Block a user