diff options
| author | Fraxinas <andreas.frisch@multimedia-labs.de> | 2009-05-27 11:36:01 +0200 |
|---|---|---|
| committer | Fraxinas <andreas.frisch@multimedia-labs.de> | 2009-05-27 11:36:01 +0200 |
| commit | 51e789a04f758941668b095fd8b051db2ce58281 (patch) | |
| tree | 2880f280e7f1006f7df12508e3b871c54442d304 /lib/dvb/decoder.cpp | |
| parent | 8e60bdc64c73787b8e7955a6a99ad5afe4a071ef (diff) | |
| parent | 26a9b45a2a0e746739b8fa2ef339dbd716257a0c (diff) | |
| download | enigma2-51e789a04f758941668b095fd8b051db2ce58281.tar.gz enigma2-51e789a04f758941668b095fd8b051db2ce58281.zip | |
Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2
Diffstat (limited to 'lib/dvb/decoder.cpp')
| -rw-r--r-- | lib/dvb/decoder.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/dvb/decoder.cpp b/lib/dvb/decoder.cpp index 82ade40d..6845602d 100644 --- a/lib/dvb/decoder.cpp +++ b/lib/dvb/decoder.cpp @@ -198,6 +198,9 @@ int eDVBAudio::startPid(int pid, int type) case aAACHE: bypass = 9; break; + case aLPCM: + bypass = 6; + break; } eDebugNoNewLine("AUDIO_SET_BYPASS(%d) - ", bypass); @@ -860,7 +863,7 @@ int eTSMPEGDecoder::setState() const char *decoder_states[] = {"stop", "pause", "play", "decoderfastforward", "trickmode", "slowmotion"}; eDebug("decoder state: %s, vpid=%d, apid=%d", decoder_states[m_state], m_vpid, m_apid); - bool changed = !!m_changed; + bool changed = m_changed; #if HAVE_DVB_API_VERSION < 3 bool checkAVSync = m_changed & (changeAudio|changeVideo|changePCR); if (m_changed & changeAudio && m_audio) @@ -1002,7 +1005,7 @@ int eTSMPEGDecoder::setState() } #endif - if (m_changed & (changeState|changeVideo|changeAudio)) + if (changed & (changeState|changeVideo|changeAudio)) { /* play, slowmotion, fast-forward */ int state_table[6][4] = @@ -1015,7 +1018,7 @@ int eTSMPEGDecoder::setState() /* [stateSlowMotion] = */ {1, m_ff_sm_ratio, 0} }; int *s = state_table[m_state]; - if (m_changed & (changeState|changeVideo) && m_video) + if (changed & (changeState|changeVideo) && m_video) { m_video->setSlowMotion(s[1]); m_video->setFastForward(s[2]); @@ -1024,7 +1027,7 @@ int eTSMPEGDecoder::setState() else m_video->freeze(); } - if (m_changed & (changeState|changeAudio) && m_audio) + if (changed & (changeState|changeAudio) && m_audio) { if (s[0]) m_audio->unfreeze(); |