From 1a0beec1bf07e6a12c4030977ed915b55126803b Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sat, 16 Feb 2008 15:41:05 +0100 Subject: [PATCH] Added new cStatus functions to the 'status' plugin --- HISTORY | 1 + PLUGINS/src/status/HISTORY | 4 ++++ PLUGINS/src/status/status.c | 34 ++++++++++++++++++++++++++++++++-- 3 files changed, 37 insertions(+), 2 deletions(-) diff --git a/HISTORY b/HISTORY index f9c2097a..bfe83e74 100644 --- a/HISTORY +++ b/HISTORY @@ -5635,3 +5635,4 @@ Video Disk Recorder Revision History in plugins (thanks to Petri Hintukainen). - Added cStatus::TimerChange() to inform plugins about changes to the list of timers (based on a patch from Benedikt Elser). +- Added new cStatus functions to the 'status' plugin. diff --git a/PLUGINS/src/status/HISTORY b/PLUGINS/src/status/HISTORY index 97bc7e2e..f6520689 100644 --- a/PLUGINS/src/status/HISTORY +++ b/PLUGINS/src/status/HISTORY @@ -40,3 +40,7 @@ VDR Plugin 'status' Revision History - Moved the "all" target in the Makefile before the "Implicit rules", so that a plain "make" will compile everything. + +2008-02-16: Version 0.3.0 + +- Added new cStatus functions. diff --git a/PLUGINS/src/status/status.c b/PLUGINS/src/status/status.c index fa5f0d41..39598713 100644 --- a/PLUGINS/src/status/status.c +++ b/PLUGINS/src/status/status.c @@ -3,13 +3,13 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: status.c 1.9 2007/08/15 13:19:44 kls Exp $ + * $Id: status.c 1.10 2008/02/16 15:41:05 kls Exp $ */ #include #include -static const char *VERSION = "0.2.1"; +static const char *VERSION = "0.3.0"; static const char *DESCRIPTION = "Status monitor test"; static const char *MAINMENUENTRY = NULL; @@ -17,20 +17,30 @@ static const char *MAINMENUENTRY = NULL; class cStatusTest : public cStatus { protected: + virtual void TimerChange(const cTimer *Timer, eTimerChange Change); virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber); virtual void Recording(const cDevice *Device, const char *Name, const char *FileName, bool On); virtual void Replaying(const cControl *Control, const char *Name, const char *FileName, bool On); virtual void SetVolume(int Volume, bool Absolute); + virtual void SetAudioTrack(int Index, const char * const *Tracks); + virtual void SetAudioChannel(int AudioChannel); + virtual void SetSubtitleTrack(int Index, const char * const *Tracks); virtual void OsdClear(void); virtual void OsdTitle(const char *Title); virtual void OsdStatusMessage(const char *Message); virtual void OsdHelpKeys(const char *Red, const char *Green, const char *Yellow, const char *Blue); + virtual void OsdItem(const char *Text, int Index); virtual void OsdCurrentItem(const char *Text); virtual void OsdTextItem(const char *Text, bool Scroll); virtual void OsdChannel(const char *Text); virtual void OsdProgramme(time_t PresentTime, const char *PresentTitle, const char *PresentSubtitle, time_t FollowingTime, const char *FollowingTitle, const char *FollowingSubtitle); }; +void cStatusTest::TimerChange(const cTimer *Timer, eTimerChange Change) +{ + dsyslog("status: cStatusTest::TimerChange %s %d", Timer ? *Timer->ToText(true) : "-", Change); +} + void cStatusTest::ChannelSwitch(const cDevice *Device, int ChannelNumber) { dsyslog("status: cStatusTest::ChannelSwitch %d %d", Device->CardIndex(), ChannelNumber); @@ -51,6 +61,21 @@ void cStatusTest::SetVolume(int Volume, bool Absolute) dsyslog("status: cStatusTest::SetVolume %d %d", Volume, Absolute); } +void cStatusTest::SetAudioTrack(int Index, const char * const *Tracks) +{ + dsyslog("status: cStatusTest::SetAudioTrack %d %s", Index, Tracks[Index]); +} + +void cStatusTest::SetAudioChannel(int AudioChannel) +{ + dsyslog("status: cStatusTest::SetAudioChannel %d", AudioChannel); +} + +void cStatusTest::SetSubtitleTrack(int Index, const char * const *Tracks) +{ + dsyslog("status: cStatusTest::SetSubtitleTrack %d %s", Index, Tracks[Index]); +} + void cStatusTest::OsdClear(void) { dsyslog("status: cStatusTest::OsdClear"); @@ -71,6 +96,11 @@ void cStatusTest::OsdHelpKeys(const char *Red, const char *Green, const char *Ye dsyslog("status: cStatusTest::OsdHelpKeys %s - %s - %s - %s", Red, Green, Yellow, Blue); } +void cStatusTest::OsdItem(const char *Text, int Index) +{ + //dsyslog("status: cStatusTest::OsdItem %s %d", Text, Index); +} + void cStatusTest::OsdCurrentItem(const char *Text) { dsyslog("status: cStatusTest::OsdCurrentItem %s", Text);