From: Felix Domke <tmbinc@elitedvb.net>
Date: Mon, 25 May 2009 23:26:20 +0000 (+0200)
Subject: Merge branch 'master' of git.opendreambox.org:/git/enigma2
X-Git-Tag: 2.6.0~292^2~1
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/26a9b45a2a0e746739b8fa2ef339dbd716257a0c?hp=-c

Merge branch 'master' of git.opendreambox.org:/git/enigma2
---

26a9b45a2a0e746739b8fa2ef339dbd716257a0c
diff --combined lib/dvb/decoder.cpp
index b406b392,114e3835..6845602d
--- a/lib/dvb/decoder.cpp
+++ b/lib/dvb/decoder.cpp
@@@ -198,6 -198,9 +198,9 @@@ int eDVBAudio::startPid(int pid, int ty
  	case aAACHE:
  		bypass = 9;
  		break;
+ 	case aLPCM:
+ 		bypass = 6;
+ 		break;
  	}
  
  	eDebugNoNewLine("AUDIO_SET_BYPASS(%d) - ", bypass);
@@@ -860,7 -863,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 +1005,7 @@@
  	}
  #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 +1018,7 @@@
  				/* [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 +1027,7 @@@
  			else
  				m_video->freeze();
  		}
 -		if (m_changed & (changeState|changeAudio) && m_audio)
 +		if (changed & (changeState|changeAudio) && m_audio)
  		{
  			if (s[0])
  				m_audio->unfreeze();