From 8be5a7b7b2617ec0eb8b2ad038c7b60b416c62f3 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 14 Jul 2002 11:03:30 +0200 Subject: [PATCH] Changed the symantics of the Name parameter in cStatus::Recording() and cStatus::Replaying() --- HISTORY | 5 +++++ menu.c | 7 ++++--- status.h | 13 ++++++++----- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/HISTORY b/HISTORY index 995dacc9..26c8bb0d 100644 --- a/HISTORY +++ b/HISTORY @@ -1369,3 +1369,8 @@ Video Disk Recorder Revision History cPlayer and cControl have been given the functions GetIndex() and GetReplayMode() to allow access to the player's status. - Added cOsd::OpenRaw() to create a raw OSD (needed for displaying SPUs). +- Changed the symantics of the Name parameter in cStatus::Recording() and + cStatus::Replaying(). It is no longer the full directory name of the recording, + but rather just the basic name. This has been changed to allow players that can't + provide a name to simply use a string that describes the player type (like, e.g., + "DVD"). diff --git a/menu.c b/menu.c index 2a5f2fee..0404b873 100644 --- a/menu.c +++ b/menu.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: menu.c 1.201 2002/06/23 11:07:19 kls Exp $ + * $Id: menu.c 1.202 2002/07/14 10:55:37 kls Exp $ */ #include "menu.h" @@ -2442,7 +2442,7 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer) recorder = new cRecorder(fileName, ch->ca, timer->priority, ch->vpid, ch->apid1, ch->apid2, ch->dpid1, ch->dpid2); if (device->AttachReceiver(recorder)) { Recording.WriteSummary(); - cStatus::MsgRecording(device, fileName); + cStatus::MsgRecording(device, Recording.Name()); Interface->DisplayRecording(device->CardIndex(), true); } else @@ -2688,7 +2688,8 @@ cReplayControl::cReplayControl(void) timeoutShow = 0; timeSearchActive = false; marks.Load(fileName); - cStatus::MsgReplaying(this, fileName); + cRecording Recording(fileName); + cStatus::MsgReplaying(this, Recording.Name()); } cReplayControl::~cReplayControl() diff --git a/status.h b/status.h index b72b2027..8041f8cd 100644 --- a/status.h +++ b/status.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: status.h 1.4 2002/07/13 10:48:50 kls Exp $ + * $Id: status.h 1.5 2002/07/14 10:54:39 kls Exp $ */ #ifndef __STATUS_H @@ -25,11 +25,14 @@ protected: // If ChannelNumber is 0, this is before the channel is being switched, // otherwise ChannelNumber is the number of the channel that has been switched to. virtual void Recording(const cDevice *Device, const char *Name) {} - // The given DVB device has started recording Name. Name is the full directory - // name of the recording. If Name is NULL, the recording has ended. + // The given DVB device has started recording Name. Name is the name of the + // recording, without any directory path. + // If Name is NULL, the recording has ended. virtual void Replaying(const cControl *Control, const char *Name) {} - // The given player control has started replaying Name. Name is the full directory - // name of the recording. If Name is NULL, the replay has ended. + // The given player control has started replaying Name. Name is the name of the + // recording, without any directory path. In case of a player that can't provide + // a name, Name can be a string that identifies the player type (like, e.g., "DVD"). + // If Name is NULL, the replay has ended. virtual void SetVolume(int Volume, bool Absolute) {} // The volume has been set to the given value, either // absolutely or relative to the current volume.