From 6e1fd835558b4e70ad94a280a209f050ec0f7a75 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 4 Nov 2001 18:00:00 +0100 Subject: =?UTF-8?q?Version=200.98=20-=20Completed=20storing=20the=20curren?= =?UTF-8?q?t=20audio=20volume=20in=20the=20setup.conf=20file=20(thanks=20?= =?UTF-8?q?=20=20to=20Andy=20Grobb).=20-=20Fixed=20closing=20the=20progres?= =?UTF-8?q?s=20display=20with=20the=20"Back"=20key=20when=20in=20trick=20m?= =?UTF-8?q?ode=20=20=20and=20Setup.ShowReplayMode=20is=20enabled=20(thanks?= =?UTF-8?q?=20to=20Stefan=20Huelswitt).=20-=20New=20SVDRP=20commands=20LST?= =?UTF-8?q?R=20and=20DELR=20to=20list=20and=20delete=20recordings=20(thank?= =?UTF-8?q?s=20to=20=20=20Thomas=20Heiligenmann).=20-=20Fixed=20a=20crash?= =?UTF-8?q?=20when=20pressing=20the=20'2'=20button=20while=20replaying=20a?= =?UTF-8?q?=20DVD.=20-=20Updated=20'channels.conf'=20for=20the=20"Bundesli?= =?UTF-8?q?ga"=20channels=20of=20Premiere=20World=20=20=20(thanks=20to=20M?= =?UTF-8?q?el=20Sch=E4chner).=20-=20Changed=20the=20tuning=20code=20to=20u?= =?UTF-8?q?se=20FrontendInfo=20to=20detect=20the=20type=20of=20DVB=20card.?= =?UTF-8?q?=20-=20Removed=20the=20recursion=20stuff=20from=20cThread=20(cM?= =?UTF-8?q?utex=20already=20does=20this).=20-=20Fixed=20handling=20the=20r?= =?UTF-8?q?epeat=20function=20in=20the=20channel=20display.=20-=20Avoiding?= =?UTF-8?q?=20multiple=20EPG=20entries=20for=20the=20same=20event=20(thank?= =?UTF-8?q?s=20to=20Rolf=20Hakenes=20=20=20for=20some=20valuable=20informa?= =?UTF-8?q?tion=20on=20how=20to=20do=20this).=20-=20A=20recording=20on=20t?= =?UTF-8?q?he=20primary=20interface=20can=20now=20be=20stopped=20to=20make?= =?UTF-8?q?=20it=20continue=20=20=20on=20an=20other=20free=20DVB=20card=20?= =?UTF-8?q?(if=20one=20is=20free=20at=20the=20moment).=20See=20MANUAL=20fo?= =?UTF-8?q?r=20=20=20details.=20-=20Added=20some=20missing=20teletext=20PI?= =?UTF-8?q?Ds=20(thanks=20to=20Norbert=20Schmidt).=20-=20Added=20PTS=20to?= =?UTF-8?q?=20the=20converted=20PCM=20audio=20when=20replaying=20a=20DVD?= =?UTF-8?q?=20(thanks=20to=20Andreas=20=20=20Schultz).=20Now=20the=20audio?= =?UTF-8?q?=20and=20video=20of=20a=20DVD=20replayed=20over=20the=20DVB=20c?= =?UTF-8?q?ard's=20A/V=20=20=20out=20should=20always=20be=20in=20sync.=20-?= =?UTF-8?q?=20Fixed=20handling=20the=20"Power"=20key=20in=20case=20Setup.M?= =?UTF-8?q?inUserInactivity=20is=20set=20to=200=20to=20=20=20disable=20aut?= =?UTF-8?q?omatic=20shutdown.=20-=20Added=20a=20fifth=20parameter=20to=20t?= =?UTF-8?q?he=20'shutdown'=20call=20that=20indicates=20the=20reason=20for?= =?UTF-8?q?=20=20=20this=20shutdown=20request=20(see=20INSTALL).=20-=20Fix?= =?UTF-8?q?ed=20releasing=20'index'=20memory=20after=20recording=20or=20pl?= =?UTF-8?q?ayback.=20-=20Fixed=20ejecting=20a=20DVD=20while=20it=20is=20be?= =?UTF-8?q?ing=20replayed.=20-=20Removed=20all=20video=20overlay=20stuff?= =?UTF-8?q?=20from=20cDvbApi=20and=20SVDRP.=20Guido=20Fiala's=20new=20=20?= =?UTF-8?q?=20'kvdr'=20version=200.4=20now=20does=20these=20things=20itsel?= =?UTF-8?q?f.=20As=20a=20consequence=20of=20this=20you=20=20=20will=20now?= =?UTF-8?q?=20need=20to=20use=20kvdr=200.4=20or=20later.=20-=20The=20devic?= =?UTF-8?q?e=20/dev/video=20is=20now=20opened=20only=20if=20necessary=20(t?= =?UTF-8?q?o=20GRAB=20an=20image),=20=20=20allowing=20other=20programs=20(?= =?UTF-8?q?like=20'kvdr',=20for=20instance)=20to=20use=20that=20device.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vdr.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'vdr.c') diff --git a/vdr.c b/vdr.c index ce86fd0..886b091 100644 --- a/vdr.c +++ b/vdr.c @@ -22,7 +22,7 @@ * * The project's page is at http://www.cadsoft.de/people/kls/vdr * - * $Id: vdr.c 1.86 2001/10/20 11:18:38 kls Exp $ + * $Id: vdr.c 1.89 2001/11/03 12:23:45 kls Exp $ */ #include @@ -483,7 +483,7 @@ int main(int argc, char *argv[]) time_t Now = time(NULL); if (Now - LastActivity > ACTIVITYTIMEOUT) { // Shutdown: - if (Shutdown && Setup.MinUserInactivity && Now - LastActivity > Setup.MinUserInactivity * 60) { + if (Shutdown && (Setup.MinUserInactivity || LastActivity == 1) && Now - LastActivity > Setup.MinUserInactivity * 60) { cTimer *timer = Timers.GetNextActiveTimer(); time_t Next = timer ? timer->StartTime() : 0; time_t Delta = timer ? Next - Now : 0; @@ -503,11 +503,12 @@ int main(int argc, char *argv[]) dsyslog(LOG_INFO, "next timer event at %s", ctime(&Next)); if (WatchdogTimeout > 0) signal(SIGALRM, SIG_IGN); - if (Interface->Confirm(tr("Press any key to cancel shutdown"), LastActivity == 1 ? 5 : SHUTDOWNWAIT, true)) { + bool UserShutdown = key == kPower; + if (Interface->Confirm(tr("Press any key to cancel shutdown"), UserShutdown ? 5 : SHUTDOWNWAIT, true)) { int Channel = timer ? timer->channel : 0; const char *File = timer ? timer->file : ""; char *cmd; - asprintf(&cmd, "%s %ld %ld %d '%s'", Shutdown, Next, Delta, Channel, File); + asprintf(&cmd, "%s %ld %ld %d '%s' %d", Shutdown, Next, Delta, Channel, File, UserShutdown); isyslog(LOG_INFO, "executing '%s'", cmd); SystemExec(cmd); delete cmd; @@ -529,6 +530,7 @@ int main(int argc, char *argv[]) if (Interrupted) isyslog(LOG_INFO, "caught signal %d", Interrupted); Setup.CurrentChannel = cDvbApi::CurrentChannel(); + Setup.CurrentVolume = cDvbApi::CurrentVolume(); Setup.Save(); cVideoCutter::Stop(); delete Menu; -- cgit v1.2.3