mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 09:21:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

more pip changes

Browse Source
This commit is contained in:
BPanther
2021-10-15 20:00:19 +02:00
committed by Thilo Graf
parent 53dac96c8a
commit a60d269c7d
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/neutrino.cpp
View File

@@ -6054,7 +6054,7 @@ void CNeutrinoApp::getAnnounceEpgName(CTimerd::RecordingInfo * eventinfo, std::s
}
#ifdef ENABLE_PIP
bool CNeutrinoApp::StartPip(const t_channel_id channel_id)
bool CNeutrinoApp::StartPip(const t_channel_id channel_id, int pip)
{
bool ret = false;
if (!g_info.hw_caps->can_pip)
@@ -6069,7 +6069,7 @@ bool CNeutrinoApp::StartPip(const t_channel_id channel_id)
int recmode = CRecordManager::getInstance()->GetRecordMode(channel_id);
if ((recmode == CRecordManager::RECMODE_OFF) || (channel->getRecordDemux() != channel->getPipDemux())) {
if (!g_Zapit->zapTo_pip(channel_id))
if (!g_Zapit->zapTo_pip(channel_id, pip))
DisplayErrorMessage(g_Locale->getText(LOCALE_VIDEOMENU_PIP_ERROR));
else
ret = true;

2
src/neutrino.h
View File

@@ -214,7 +214,7 @@ public:
void numericZap(int msg);
void StopSubtitles(bool enable_glcd_mirroring = true);
void StartSubtitles(bool show = true);
bool StartPip(const t_channel_id channel_id);
bool StartPip(const t_channel_id channel_id, int pip = 0);
void SelectSubtitles();
void showInfo(void);
void showMainMenu(void);

4
src/zapit/include/zapit/client/zapitclient.h
View File

@@ -284,7 +284,7 @@ class CZapitClient:public CBasicClient
/* zaps to channel, returns the "zap-status" */
unsigned int zapTo_serviceID(const t_channel_id channel_id);
unsigned int zapTo_record(const t_channel_id channel_id);
unsigned int zapTo_pip(const t_channel_id channel_id);
unsigned int zapTo_pip(const t_channel_id channel_id, int pip = 0);
unsigned int zapTo_epg(const t_channel_id channel_id, bool standby = false);
/* zaps to subservice, returns the "zap-status" */
@@ -504,7 +504,7 @@ class CZapitClient:public CBasicClient
void setStandby(const bool enable);
void startPlayBack(const bool sendpmt = false);
void stopPlayBack(const bool sendpmt = false);
void stopPip();
void stopPip(int pip = 0);
void lockPlayBack(const bool sendpmt = true);
void unlockPlayBack(const bool sendpmt = true);
bool tune_TP(TP_params TP);

4
src/zapit/include/zapit/zapit.h
View File

@@ -283,8 +283,8 @@ class CZapit : public OpenThreads::Thread
int GetVolume() { return current_volume; };
int SetVolumePercent(int percent);
void SetVolumePercent(int default_ac3, int default_pcm);
bool StartPip(const t_channel_id channel_id);
bool StopPip();
bool StartPip(const t_channel_id channel_id, int pip = 0);
bool StopPip(int pip = 0);
void Lock() { mutex.lock(); }
void Unlock() { mutex.unlock(); }
void EnablePlayback(bool enable) { playbackStopForced = !enable; }

4
src/zapit/lib/zapitclient.cpp
View File

@@ -206,7 +206,7 @@ unsigned int CZapitClient::zapTo_record(const t_channel_id channel_id)
return response.zapStatus;
}
unsigned int CZapitClient::zapTo_pip(const t_channel_id channel_id)
unsigned int CZapitClient::zapTo_pip(const t_channel_id channel_id, int pip)
{
CZapitMessages::commandZaptoServiceID msg;
@@ -1135,7 +1135,7 @@ void CZapitClient::stopPlayBack(const bool sendpmt)
close_connection();
}
void CZapitClient::stopPip()
void CZapitClient::stopPip(int pip)
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mutex);
send(CZapitMessages::CMD_STOP_PIP);

4
src/zapit/src/zapit.cpp
View File

@@ -680,7 +680,7 @@ bool CZapit::ZapIt(const t_channel_id channel_id, bool forupdate, bool startplay
}
#ifdef ENABLE_PIP
bool CZapit::StopPip()
bool CZapit::StopPip(int pip)
{
if (!g_info.hw_caps->can_pip)
return false;
@@ -706,7 +706,7 @@ bool CZapit::StopPip()
return false;
}
bool CZapit::StartPip(const t_channel_id channel_id)
bool CZapit::StartPip(const t_channel_id channel_id, int pip)
{
if (!g_info.hw_caps->can_pip)
return false;