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

don't execute ci "hack", if calling from movieplayer

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: a2193c9e44
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
FlatTV
2016-10-25 18:05:02 +02:00
parent 54c9128b89
commit 0fd68eb6a7
5 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/movieplayer.cpp
View File

@@ -224,6 +224,9 @@ void CMoviePlayerGui::cutNeutrino()
if (isUPNP) if (isUPNP)
return; return;
//NI
CZapit::getInstance()->setMoviePlayer(true);// let CCamManager::SetMode know, the call is from MoviePlayer
g_Zapit->lockPlayBack(); g_Zapit->lockPlayBack();
//NI if (!isWebTV) //NI if (!isWebTV)
//NI g_Sectionsd->setPauseScanning(true); //NI g_Sectionsd->setPauseScanning(true);

12
src/zapit/include/zapit/capmt.h
View File

@@ -94,8 +94,10 @@ class CCamManager
static CCamManager * manager; static CCamManager * manager;
bool SetMode(t_channel_id id, enum runmode mode, bool enable, bool force_update = false); bool SetMode(t_channel_id id, enum runmode mode, bool enable, bool force_update = false);
void StopCam(t_channel_id id, CCam *cam); void StopCam(t_channel_id id, CCam *cam);
bool useCI; //NI //NI
unsigned int rmode; //NI bool mp;
bool useCI;
unsigned int rmode;
enum ci_aktive { enum ci_aktive {
CI_OFF, CI_OFF,
CI_ON, CI_ON,
@@ -111,8 +113,10 @@ class CCamManager
void SetCITuner(int tuner); void SetCITuner(int tuner);
int GetCITuner(void) { return tunerno; }; int GetCITuner(void) { return tunerno; };
void EnableChannelFilter(bool enable) { filter_channels = enable; }; void EnableChannelFilter(bool enable) { filter_channels = enable; };
bool getUseCI() { return useCI; }; //NI //NI
bool getChannelFilter() { return filter_channels; }; //NI bool getUseCI() { return useCI; };
bool getChannelFilter() { return filter_channels; };
void enableMoviePlayer(bool enable) { mp = enable; };
}; };
#endif /* __capmt_h__ */ #endif /* __capmt_h__ */

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

@@ -275,5 +275,6 @@ class CZapit : public OpenThreads::Thread
std::list<std::string> *GetWebTVXML(void) { return webtv_xml; } std::list<std::string> *GetWebTVXML(void) { return webtv_xml; }
//NI //NI
bool getUseChannelFilter(); bool getUseChannelFilter();
void setMoviePlayer(bool enable);
}; };
#endif /* __zapit_h__ */ #endif /* __zapit_h__ */

12
src/zapit/src/capmt.cpp
View File

@@ -172,8 +172,10 @@ CCamManager::CCamManager()
channel_map.clear(); channel_map.clear();
tunerno = -1; tunerno = -1;
filter_channels = false; filter_channels = false;
useCI = false; //NI //NI
rmode = CI_OFF; //NI useCI = false;
rmode = CI_OFF;
mp = false;
} }
CCamManager::~CCamManager() CCamManager::~CCamManager()
@@ -283,11 +285,13 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start
CZapitChannel * chan = CServiceManager::getInstance()->GetCurrentChannel(); CZapitChannel * chan = CServiceManager::getInstance()->GetCurrentChannel();
INFO(" ##NI: GetCurrentChannel (%s)\n",chan->getName().c_str()); INFO(" ##NI: GetCurrentChannel (%s)\n",chan->getName().c_str());
//NI - this is a hack for rezaping to the recording channel //NI - this is a hack for rezaping to the recording channe
if((!mode || (mode && !chan->scrambled)) && (!start && rmode==CI_ON)){ //if commig from movieplayer, disable hack
if(!mp && ( (!mode || (mode && !chan->scrambled)) && (!start && rmode==CI_ON)) ){
INFO(" ##NI: HACK: disabling TS\n"); INFO(" ##NI: HACK: disabling TS\n");
cCA::GetInstance()->SetTS(CA_DVBCI_TS_INPUT_DISABLED); cCA::GetInstance()->SetTS(CA_DVBCI_TS_INPUT_DISABLED);
} }
mp = false;
#endif #endif
} }

5
src/zapit/src/zapit.cpp
View File

@@ -2474,6 +2474,11 @@ bool CZapit::getUseChannelFilter()
{ {
return CCamManager::getInstance()->getChannelFilter(); return CCamManager::getInstance()->getChannelFilter();
} }
//NI
void CZapit::setMoviePlayer(bool enable)
{
CCamManager::getInstance()->enableMoviePlayer(enable);
}
void CZapit::run() void CZapit::run()
{ {