From 9599a8fd8a6724e55ec4ad2ba2c975c0850073d9 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sat, 27 May 2000 18:00:00 +0200 Subject: Version 0.05 - Support for more than one DVB card. - Simultaneous record and replay (with two DVB cards). - Instant recordings no longer get the name "instant". They now get the name of the channel, with a prepended '@' character. - Timers that are not given an explicit Name now use the channel name with a prepended '@' character. - If an instant recording is currently active, the Main menu now contains an option to stop that recording. - Timers are now only processed when the Menu is not active. So after editing a timer the effect will take place only after the menu has been closed. In order to avoid missing a timer event by inadvertently leaving the menu open, the menu will be closed automatically after about two minutes of inactivity. - If a recording is currently being replayed, the Main menu now contains an option to stop replaying. - Displaying the recording DVB interface status in the decimal points of the RCU display. - Reduced the number of remote control keys. Modified the key assignments for the PC keyboard to better resemble the "up-down-left-right-ok" layout on menu controlling remote control units. --- dvbapi.h | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) (limited to 'dvbapi.h') diff --git a/dvbapi.h b/dvbapi.h index 91e554e..e0c74b0 100644 --- a/dvbapi.h +++ b/dvbapi.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: dvbapi.h 1.8 2000/04/24 15:31:07 kls Exp $ + * $Id: dvbapi.h 1.10 2000/05/20 14:50:43 kls Exp $ */ #ifndef __DVBAPI_H @@ -43,10 +43,29 @@ enum eDvbColor { clrBackground, class cDvbApi { private: int videoDev; + cDvbApi(const char *FileName); public: - cDvbApi(void); ~cDvbApi(); +#define MAXDVBAPI 2 + static int NumDvbApis; +private: + static cDvbApi *dvbApi[MAXDVBAPI]; +public: + static cDvbApi *PrimaryDvbApi; + static cDvbApi *GetDvbApi(int Ca = 0); + // Selects a free DVB device, starting with the highest device number. + // If Ca is nor 0, the device with the given number will be returned + // if it is not currently recording. + int Index(void); + // Returns the index of this DvbApi. + static bool Init(void); + // Initializes the DVB API and probes for existing DVB devices. + // Must be called before accessing any DVB functions. + static void Cleanup(void); + // Closes down all DVB devices. + // Must be called at the end of the program. + // On Screen Display facilities private: @@ -72,7 +91,7 @@ public: // Progress Display facilities private: - int lastProgress; + int lastProgress, lastTotal; char *replayTitle; public: bool ShowProgress(bool Initial = false); @@ -91,7 +110,6 @@ private: dvbSkip, dvbGetIndex, }; - bool isMainProcess; pid_t pidRecord, pidReplay; int fromRecord, toRecord; int fromReplay, toReplay; @@ -133,5 +151,5 @@ public: // beginning of the recording. bool GetIndex(int *Current, int *Total = NULL); }; - + #endif //__DVBAPI_H -- cgit v1.2.3