From: Felix Domke <tmbinc@elitedvb.net>
Date: Wed, 11 Feb 2009 11:52:48 +0000 (+0100)
Subject: Merge branch 'master' of /home/tmbinc/enigma2-git into tmbinc/FixTimingBugs
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=bbfcb7ea1f040d030277e2b6f2efa9ea0967bf2b

Merge branch 'master' of /home/tmbinc/enigma2-git into tmbinc/FixTimingBugs

Conflicts:

	lib/dvb/decoder.cpp
---

bbfcb7ea1f040d030277e2b6f2efa9ea0967bf2b
diff --cc lib/dvb/decoder.cpp
index 66b923a,065a49c..f73dbdd
--- a/lib/dvb/decoder.cpp
+++ b/lib/dvb/decoder.cpp
@@@ -190,11 -190,15 +190,15 @@@ int eDVBAudio::startPid(int pid, int ty
  	case aDTS:
  		bypass = 2;
  		break;
- 		*/
+ 	case aAAC:
+ 		bypass = 8;
+ 		break;
+ 	case aAACHE:
+ 		bypass = 9;
+ 		break;
  	}
  
 -	eDebugNoNewLine("AUDIO_SET_BYPASS - ");
 +	eDebugNoNewLine("AUDIO_SET_BYPASS(%d) - ", bypass);
  	if (::ioctl(m_fd, AUDIO_SET_BYPASS_MODE, bypass) < 0)
  		eDebug("failed (%m)");
  	else
@@@ -291,7 -303,8 +295,9 @@@ eDVBAudio::~eDVBAudio(
  DEFINE_REF(eDVBVideo);
  
  eDVBVideo::eDVBVideo(eDVBDemux *demux, int dev)
- 	:m_demux(demux), m_dev(dev)
 -	:m_demux(demux), m_dev(dev), m_is_slow_motion(0), m_is_fast_forward(0), m_is_freezed(0)
 -	,m_width(-1), m_height(-1), m_framerate(-1), m_aspect(-1), m_progressive(-1)
++<<<<<<< HEAD:lib/dvb/decoder.cpp
++	: m_demux(demux), m_dev(dev),
++	m_width(-1), m_height(-1), m_framerate(-1), m_aspect(-1), m_progressive(-1)
  {
  	char filename[128];
  #if HAVE_DVB_API_VERSION < 3
diff --cc lib/dvb/dvb.cpp
index 28012e7,2460943..c320fc7
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@@ -1336,13 -1328,13 +1337,13 @@@ void eDVBChannel::getNextSourceSpan(off
  				eDebug("AP relative seeking failed!");
  			} else
  			{
 -				eDebug("next ap is %llx\n", pts);
  				pts = nextap;
 +				eDebug("next ap is %llx\n", pts);
  			}
  		}
- 		
+ 
  		off_t offset = 0;
 -		if (m_tstools.getOffset(offset, pts))
 +		if (m_tstools.getOffset(offset, pts, -1))
  		{
  			eDebug("get offset for pts=%lld failed!", pts);
  			continue;