mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-03 10:51:05 +02:00
zapit: remove some commented code
Origin commit data
------------------
Commit: ac8b42a6d0
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-12-19 (Thu, 19 Dec 2019)
Origin message was:
------------------
- zapit: remove some commented code
This commit is contained in:
@@ -2399,10 +2399,8 @@ void CZapit::leaveStandby(void)
|
|||||||
}
|
}
|
||||||
standby = false;
|
standby = false;
|
||||||
if (current_channel) {
|
if (current_channel) {
|
||||||
#if !HAVE_ARM_HARDWARE
|
|
||||||
/* tune channel, with stopped playback to not bypass the parental PIN check */
|
/* tune channel, with stopped playback to not bypass the parental PIN check */
|
||||||
ZapIt(live_channel_id, false, false);
|
ZapIt(live_channel_id, false, false);
|
||||||
#endif
|
|
||||||
if (IS_WEBCHAN(live_channel_id)) {
|
if (IS_WEBCHAN(live_channel_id)) {
|
||||||
CZapitChannel* newchannel = CServiceManager::getInstance()->FindChannel(last_channel_id);
|
CZapitChannel* newchannel = CServiceManager::getInstance()->FindChannel(last_channel_id);
|
||||||
CFrontend * fe = newchannel ? CFEManager::getInstance()->allocateFE(newchannel) : NULL;
|
CFrontend * fe = newchannel ? CFEManager::getInstance()->allocateFE(newchannel) : NULL;
|
||||||
@@ -2646,10 +2644,6 @@ void CZapit::setMoviePlayer(bool enable)
|
|||||||
|
|
||||||
void CZapit::run()
|
void CZapit::run()
|
||||||
{
|
{
|
||||||
//if HAVE_SPARK_HARDWARE
|
|
||||||
#if 0
|
|
||||||
bool v_stopped = false;
|
|
||||||
#endif
|
|
||||||
set_threadname("zap:main");
|
set_threadname("zap:main");
|
||||||
printf("[zapit] starting... tid %ld\n", syscall(__NR_gettid));
|
printf("[zapit] starting... tid %ld\n", syscall(__NR_gettid));
|
||||||
|
|
||||||
@@ -2695,33 +2689,6 @@ void CZapit::run()
|
|||||||
SendEvent(CZapitClient::EVT_PMT_CHANGED, &channel_id, sizeof(channel_id));
|
SendEvent(CZapitClient::EVT_PMT_CHANGED, &channel_id, sizeof(channel_id));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//if HAVE_SPARK_HARDWARE
|
|
||||||
#if 0
|
|
||||||
/* hack: stop videodecoder if the tuner looses lock
|
|
||||||
* at least the h264 decoder seems unhappy if he runs out of data...
|
|
||||||
* ...until we fix the driver, let's work around it here.
|
|
||||||
* theoretically, a "retune()" function could also be implemented here
|
|
||||||
* for the case that the driver cannot re-lock the tuner (DiSEqC problem,
|
|
||||||
* unicable collision, .... */
|
|
||||||
if (live_fe->tuned)
|
|
||||||
{
|
|
||||||
if (!live_fe->getStatus() && !v_stopped)
|
|
||||||
{
|
|
||||||
fprintf(stderr, "[zapit] LOST LOCK! stopping video...\n");
|
|
||||||
videoDecoder->Stop(false);
|
|
||||||
v_stopped = true;
|
|
||||||
}
|
|
||||||
else if (live_fe->getStatus())
|
|
||||||
{
|
|
||||||
if (v_stopped)
|
|
||||||
{
|
|
||||||
fprintf(stderr, "[zapit] reacquired LOCK! starting video...\n");
|
|
||||||
videoDecoder->Start();
|
|
||||||
}
|
|
||||||
v_stopped = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
/* yuck, don't waste that much cpu time :) */
|
/* yuck, don't waste that much cpu time :) */
|
||||||
usleep(0);
|
usleep(0);
|
||||||
|
Reference in New Issue
Block a user