From 21f3eaf6c98751cc5931ccfd7bc123f7b7ac38f8 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 4 Jun 2006 18:00:00 +0200 Subject: =?UTF-8?q?Version=201.4.0-3=20-=20Fixed=20the=20PremiereContentTr?= =?UTF-8?q?ansmissionDescriptor=20in=20'libsi'=20(thanks=20to=20Stefan=20?= =?UTF-8?q?=20=20Huelswitt).=20-=20Removed=20all=20the=20compatibility=20'?= =?UTF-8?q?#if=20APIVERSNUM...'=20stuff=20and=20instead=20increased=20=20?= =?UTF-8?q?=20the=20API=20version=20number=20-=20plugins=20will=20have=20t?= =?UTF-8?q?o=20be=20recompiled.=20-=20Removed=20the=20call=20to=20pthread?= =?UTF-8?q?=5Fsetschedparam(childTid,=20SCHED=5FRR,=200)=20in=20thread.c,?= =?UTF-8?q?=20=20=20because=20it=20caused=20a=20compiler=20warning=20with?= =?UTF-8?q?=20post-2.4=20glibc=20(reported=20by=20Ville=20Skytt=C3=A4).=20?= =?UTF-8?q?=20=20Since=20the=20third=20parameter=20has=20to=20be=20non-nul?= =?UTF-8?q?l=20to=20have=20any=20effect,=20the=20call=20was=20=20=20presum?= =?UTF-8?q?ably=20a=20NOP,=20anyway.=20-=20Fixed=20the=20'clean-plugins'?= =?UTF-8?q?=20target=20in=20the=20Makefile=20to=20also=20remove=20addition?= =?UTF-8?q?al=20=20=20plugin=20libraries=20(thanks=20to=20Wayne=20Keer).?= =?UTF-8?q?=20-=20Applied=20the=20fixes=20to=20moving=20and=20deleting=20c?= =?UTF-8?q?hannels=20from=20version=201.4.0-2=20to=20the=20=20=20SVDRP=20c?= =?UTF-8?q?ommands=20MOVC=20and=20DELC=20as=20well.=20-=20Fixed=20handling?= =?UTF-8?q?=20the=20display=20of=20the=20'*'=20indicator=20in=20the=20"Wha?= =?UTF-8?q?t's=20on=20now/next=3F"=20=20=20menu,=20so=20that=20events=20th?= =?UTF-8?q?at=20haven't=20been=20"seen"=20in=20the=20data=20stream=20withi?= =?UTF-8?q?n=2030=20=20=20seconds=20won't=20be=20shown=20as=20"running".?= =?UTF-8?q?=20-=20Fixed=20handling=20tabbed=20item=20display=20in=20'skinc?= =?UTF-8?q?urses'.=20-=20Increased=20the=20column=20spacing=20in=20the=20"?= =?UTF-8?q?Recordings"=20menu=20(was=20too=20small=20for=20the=20=20=20'sk?= =?UTF-8?q?incurses'=20plugin).=20-=20When=20the=20'skincurses'=20plugin?= =?UTF-8?q?=20is=20loaded,=20it=20automatically=20sets=20the=20'curses'=20?= =?UTF-8?q?=20=20skin=20as=20the=20current=20one.=20This=20doesn't=20modif?= =?UTF-8?q?y=20the=20Setup.OSDSkin=20parameter,=20so=20=20=20that=20after?= =?UTF-8?q?=20using=20'skincurses'=20(for=20instance=20for=20debugging)=20?= =?UTF-8?q?the=20previously=20=20=20selected=20skin=20will=20be=20used=20a?= =?UTF-8?q?gain.=20-=20Added=20some=20log=20messages=20when=20setting=20th?= =?UTF-8?q?e=20current=20skin.=20-=20Only=20making=20a=20second=20attempt?= =?UTF-8?q?=20to=20set=20the=20current=20skin=20at=20startup=20if=20the=20?= =?UTF-8?q?first=20=20=20attempt=20has=20failed.=20-=20Now=20switching=20t?= =?UTF-8?q?o=20non-VPS=20timers'=20channels=2060=20seconds=20before=20the?= =?UTF-8?q?=20timer=20starts=20=20=20(if=20a=20free=20device=20is=20availa?= =?UTF-8?q?ble),=20to=20allow=20for=20the=20updating=20of=20EPG=20data=20a?= =?UTF-8?q?nd=20CA=20=20=20descriptors=20before=20the=20actual=20recording?= =?UTF-8?q?=20starts.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- svdrp.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) (limited to 'svdrp.c') diff --git a/svdrp.c b/svdrp.c index e0b56e4..0f6060c 100644 --- a/svdrp.c +++ b/svdrp.c @@ -10,7 +10,7 @@ * and interact with the Video Disk Recorder - or write a full featured * graphical interface that sits on top of an SVDRP connection. * - * $Id: svdrp.c 1.95 2006/04/17 09:02:23 kls Exp $ + * $Id: svdrp.c 1.96 2006/06/03 09:17:17 kls Exp $ */ #include "svdrp.h" @@ -550,10 +550,25 @@ void cSVDRP::CmdDELC(const char *Option) return; } } + int CurrentChannelNr = cDevice::CurrentChannel(); + cChannel *CurrentChannel = Channels.GetByNumber(CurrentChannelNr); + if (CurrentChannel && channel == CurrentChannel) { + int n = Channels.GetNextNormal(CurrentChannel->Index()); + if (n < 0) + n = Channels.GetPrevNormal(CurrentChannel->Index()); + CurrentChannel = Channels.Get(n); + CurrentChannelNr = 0; // triggers channel switch below + } Channels.Del(channel); Channels.ReNumber(); Channels.SetModified(true); isyslog("channel %s deleted", Option); + if (CurrentChannel && CurrentChannel->Number() != CurrentChannelNr) { + if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring()) + Channels.SwitchTo(CurrentChannel->Number()); + else + cDevice::SetCurrentChannel(CurrentChannel); + } Reply(250, "Channel \"%s\" deleted", Option); } else @@ -1158,8 +1173,12 @@ void cSVDRP::CmdMOVC(const char *Option) Channels.Move(FromChannel, ToChannel); Channels.ReNumber(); Channels.SetModified(true); - if (CurrentChannel && CurrentChannel->Number() != CurrentChannelNr) - Channels.SwitchTo(CurrentChannel->Number()); + if (CurrentChannel && CurrentChannel->Number() != CurrentChannelNr) { + if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring()) + Channels.SwitchTo(CurrentChannel->Number()); + else + cDevice::SetCurrentChannel(CurrentChannel); + } isyslog("channel %d moved to %d", FromNumber, ToNumber); Reply(250,"Channel \"%d\" moved to \"%d\"", From, To); } -- cgit v1.2.3