From e36fe18c483b8e520752f61975e44ddd0317a332 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 23 Jan 2005 18:00:00 +0100 Subject: =?UTF-8?q?Version=201.3.19=20-=20Making=20sure=20at=20least=20the?= =?UTF-8?q?=20default=20skin=20is=20available=20at=20program=20start=20in?= =?UTF-8?q?=20case=20a=20=20=20plugin=20needs=20to=20issue=20an=20error=20?= =?UTF-8?q?message=20(thanks=20to=20Achim=20Tuffentshammer=20for=20=20=20r?= =?UTF-8?q?eporting=20a=20crash=20in=20such=20a=20case).=20Also=20checking?= =?UTF-8?q?=20if=20there=20is=20a=20current=20skin=20=20=20in=20cSkins::Me?= =?UTF-8?q?ssage().=20-=20Completed=20the=20Finnish=20OSD=20texts=20and=20?= =?UTF-8?q?fixed=20internationalization=20of=20the=20text=20=20=20for=20"S?= =?UTF-8?q?etup/DVB/Audio=20language(s)"=20(thanks=20to=20Rolf=20Ahrenberg?= =?UTF-8?q?).=20-=20Completed=20the=20Estonian=20OSD=20texts=20and=20switc?= =?UTF-8?q?hed=20to=20iso8859-13=20character=20set=20=20=20(thanks=20to=20?= =?UTF-8?q?Arthur=20Konovalov).=20-=20Made=20cCondWait::SleepMs()=20sleep?= =?UTF-8?q?=20at=20least=203ms=20to=20avoid=20a=20possible=20busy=20wait.?= =?UTF-8?q?=20-=20Fixed=20canceling=20the=20LIRC=20thread=20(thanks=20to?= =?UTF-8?q?=20Marco=20Schl=C3=BC=C3=9Fler=20for=20pointing=20out=20=20=20t?= =?UTF-8?q?his=20one).=20-=20The=20"Green"=20button=20in=20the=20"Main"=20?= =?UTF-8?q?menu=20is=20now=20always=20"Audio",=20since=20the=20audio=20=20?= =?UTF-8?q?=20channel=20might=20be=20changed=20even=20if=20there=20is=20on?= =?UTF-8?q?ly=20one=20actual=20audio=20PID.=20-=20Fixed=20handling=20the?= =?UTF-8?q?=20'-E'=20option=20which=20was=20broken=20in=20version=201.3.18?= =?UTF-8?q?=20(thanks=20to=20=20=20Christian=20Jacobsen=20for=20reporting?= =?UTF-8?q?=20this=20one).=20-=20Added=20'channels.conf.terr'=20entries=20?= =?UTF-8?q?for=20Mainz=20(thanks=20to=20Michael=20Heyse).=20-=20Implemente?= =?UTF-8?q?d=20cDolbyRepacker=20for=20better=20handling=20of=20Dolby=20Dig?= =?UTF-8?q?ital=20PES=20packets=20=20=20(thanks=20to=20Reinhard=20Nissl).?= =?UTF-8?q?=20-=20Fixed=20playing=20files=20with=20PES=20packets=20longer?= =?UTF-8?q?=20than=202048=20byte=20through=20the=20full=20=20=20featured?= =?UTF-8?q?=20DVB=20card=20(thanks=20to=20Marco=20Kremer=20for=20reporting?= =?UTF-8?q?=20this=20one=20and=20providing=20=20=20a=20test=20sample).=20-?= =?UTF-8?q?=20Recording=20and=20Transfer=20Mode=20now=20handle=20more=20th?= =?UTF-8?q?an=202=20audio=20PIDs.=20For=20this=20the=20=20=20interfaces=20?= =?UTF-8?q?of=20the=20following=20functions=20have=20been=20changed:=20=20?= =?UTF-8?q?=20cTransferControl::cTransferControl()=20=20=20cTransfer::cTra?= =?UTF-8?q?nsfer()=20=20=20cRecorder::cRecorder()=20=20=20cReceiver::cRece?= =?UTF-8?q?iver()=20=20=20cRemux::cRemux()=20-=20Fixed=20a=20possible=20ra?= =?UTF-8?q?ce=20condition=20in=20cDevice::Action()=20and=20cTSBuffer::Acti?= =?UTF-8?q?on()=20=20=20(thanks=20to=20Stefan=20Huelswitt).=20-=20Extended?= =?UTF-8?q?=20some=20buffer=20sizes=20to=20allow=20handling=20HDTV=20strea?= =?UTF-8?q?ms=20(thanks=20to=20Reinhard=20=20=20Nissl).=20-=20Added=20'cha?= =?UTF-8?q?nnels.conf.terr'=20entries=20for=20D=C3=BCsseldorf=20and=20K?= =?UTF-8?q?=C3=B6ln=20(thanks=20to=20Walter=20Koch).=20-=20Falling=20back?= =?UTF-8?q?=20to=20'stereo'=20when=20switching=20channels=20in=20case=20th?= =?UTF-8?q?e=20user=20had=20switched=20=20=20to=20'left'=20or=20'right'=20?= =?UTF-8?q?(suggested=20by=20Rolf=20Groppe).=20-=20Completed=20the=20Danis?= =?UTF-8?q?h=20OSD=20texts=20(thanks=20to=20Mogens=20Elneff).=20-=20Record?= =?UTF-8?q?ing=20and=20Transfer=20Mode=20can=20now=20handle=20up=20to=208?= =?UTF-8?q?=20Dolby=20Digital=20tracks=20(thanks=20=20=20to=20Marco=20Schl?= =?UTF-8?q?=C3=BC=C3=9Fler=20for=20a=20patch=20that=20implements=20substre?= =?UTF-8?q?am=20handling=20into=20=20=20cDevice::PlayPesPacket(),=20and=20?= =?UTF-8?q?Reinhard=20Nissl=20for=20adding=20substream=20handling=20to=20?= =?UTF-8?q?=20=20cDolbyRepacker).=20-=20Added=20PlayPes(NULL,=200)=20to=20?= =?UTF-8?q?cTransfer::Action()=20when=20clearing=20the=20transfer=20buffer?= =?UTF-8?q?=20=20=20to=20avoid=20overflows=20(thanks=20to=20Marco=20Schl?= =?UTF-8?q?=C3=BC=C3=9Fler=20for=20pointing=20this=20out).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dvbdevice.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'dvbdevice.c') diff --git a/dvbdevice.c b/dvbdevice.c index 9c7fd38..e8862cb 100644 --- a/dvbdevice.c +++ b/dvbdevice.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: dvbdevice.c 1.113 2005/01/09 13:04:20 kls Exp $ + * $Id: dvbdevice.c 1.116 2005/01/16 12:05:13 kls Exp $ */ #include "dvbdevice.h" @@ -813,7 +813,7 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView) CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true)); } else if (StartTransferMode) - cControl::Launch(new cTransferControl(this, Channel->Vpid(), Channel->Apid(0), Channel->Apid(1), Channel->Dpid(0), Channel->Dpid(1))); + cControl::Launch(new cTransferControl(this, Channel->Vpid(), Channel->Apids(), Channel->Dpids(), Channel->Spids())); return true; } @@ -1111,7 +1111,7 @@ void cDvbDevice::StillPicture(const uchar *Data, int Length) #define MIN_IFRAME 400000 for (int i = MIN_IFRAME / Length + 1; i > 0; i--) { safe_write(fd_video, Data, Length); - cCondWait::SleepMs(1); // allows the buffer to be displayed in case the progress display is active + cCondWait::SleepMs(3); // allows the buffer to be displayed in case the progress display is active } #endif } @@ -1130,12 +1130,12 @@ bool cDvbDevice::Flush(int TimeoutMs) int cDvbDevice::PlayVideo(const uchar *Data, int Length) { - return write(fd_video, Data, Length); + return WriteAllOrNothing(fd_video, Data, Length, 1000, 10); } int cDvbDevice::PlayAudio(const uchar *Data, int Length) { - return write(fd_audio, Data, Length); + return WriteAllOrNothing(fd_audio, Data, Length, 1000, 10); } bool cDvbDevice::OpenDvr(void) -- cgit v1.2.3