git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
e638015
)
fix pid changes
author
Felix Domke
<tmbinc@elitedvb.net>
Mon, 25 May 2009 23:25:53 +0000
(
01:25
+0200)
committer
Felix Domke
<tmbinc@elitedvb.net>
Mon, 25 May 2009 23:25:53 +0000
(
01:25
+0200)
lib/dvb/decoder.cpp
patch
|
blob
|
history
diff --git
a/lib/dvb/decoder.cpp
b/lib/dvb/decoder.cpp
index 82ade40d40c036a0fffdc5ca91a7f1447d65fe39..b406b392a0630140badb9511edddb29f0f9f8b62 100644
(file)
--- a/
lib/dvb/decoder.cpp
+++ b/
lib/dvb/decoder.cpp
@@
-860,7
+860,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);
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)
#if HAVE_DVB_API_VERSION < 3
bool checkAVSync = m_changed & (changeAudio|changeVideo|changePCR);
if (m_changed & changeAudio && m_audio)
@@
-1002,7
+1002,7
@@
int eTSMPEGDecoder::setState()
}
#endif
}
#endif
- if (
m_
changed & (changeState|changeVideo|changeAudio))
+ if (changed & (changeState|changeVideo|changeAudio))
{
/* play, slowmotion, fast-forward */
int state_table[6][4] =
{
/* play, slowmotion, fast-forward */
int state_table[6][4] =
@@
-1015,7
+1015,7
@@
int eTSMPEGDecoder::setState()
/* [stateSlowMotion] = */ {1, m_ff_sm_ratio, 0}
};
int *s = state_table[m_state];
/* [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]);
{
m_video->setSlowMotion(s[1]);
m_video->setFastForward(s[2]);
@@
-1024,7
+1024,7
@@
int eTSMPEGDecoder::setState()
else
m_video->freeze();
}
else
m_video->freeze();
}
- if (
m_
changed & (changeState|changeAudio) && m_audio)
+ if (changed & (changeState|changeAudio) && m_audio)
{
if (s[0])
m_audio->unfreeze();
{
if (s[0])
m_audio->unfreeze();