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

zapit: revert commit 1519

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1522 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
satbaby
2011-06-05 14:11:26 +00:00
parent d6b5571a12
commit fdb93a49bf
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/zapit/src/zapit.cpp
View File

@@ -109,7 +109,7 @@ bool playing = false;
char pipzap = 0; char pipzap = 0;
bool g_list_changed = false; // flag to indicate, allchans was changed bool g_list_changed = false; // flag to indicate, allchans was changed
int sig_delay = 2; // seconds between signal check int sig_delay = 2; // seconds between signal check
bool mute_true_false = false;
/* variables for EN 50494 (a.k.a Unicable) */ /* variables for EN 50494 (a.k.a Unicable) */
int uni_scr = -1; /* the unicable SCR address, -1 == no unicable */ int uni_scr = -1; /* the unicable SCR address, -1 == no unicable */
int uni_qrg = 0; /* the unicable frequency in MHz, 0 == from spec */ int uni_qrg = 0; /* the unicable frequency in MHz, 0 == from spec */
@@ -1615,14 +1615,10 @@ DBG("NVOD insert %llx\n", CREATE_CHANNEL_ID_FROM_SERVICE_ORIGINALNETWORK_TRANSPO
//if(!audioDecoder) audioDecoder = new CAudio(); //if(!audioDecoder) audioDecoder = new CAudio();
if(!audioDecoder) break; if(!audioDecoder) break;
//printf("[zapit] mute %d\n", msgBoolean.truefalse); //printf("[zapit] mute %d\n", msgBoolean.truefalse);
if (msgBoolean.truefalse){ if (msgBoolean.truefalse)
audioDecoder->mute(); audioDecoder->mute();
mute_true_false = true; else
}
else{
audioDecoder->unmute(); audioDecoder->unmute();
mute_true_false = false;
}
break; break;
} }
@@ -1977,8 +1973,6 @@ int startPlayBack(CZapitChannel *thisChannel)
printf("[zapit] starting %s audio\n", audioStr); printf("[zapit] starting %s audio\n", audioStr);
audioDemux->Start(); audioDemux->Start();
audioDecoder->Start(); audioDecoder->Start();
if(!mute_true_false)
audioDecoder->unmute();
} }
/* start video */ /* start video */
@@ -2011,8 +2005,7 @@ int stopPlayBack(bool stop_camd)
} }
ca->SendPMT(0, (unsigned char*) "", 0, CA_SLOT_TYPE_SMARTCARD); ca->SendPMT(0, (unsigned char*) "", 0, CA_SLOT_TYPE_SMARTCARD);
} }
if(!standby && !mute_true_false)
audioDecoder->mute();
printf("stopPlayBack: standby %d forced %d\n", standby, playbackStopForced); printf("stopPlayBack: standby %d forced %d\n", standby, playbackStopForced);
//if(standby || !playing) //if(standby || !playing)