summaryrefslogtreecommitdiff
path: root/device.h
diff options
context:
space:
mode:
authorKlaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>2010-02-28 16:07:00 +0100
committerKlaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>2010-02-28 16:07:00 +0100
commit5ce592e54a4aa741444afae8eb80dff47bc355fd (patch)
treebc0cbae41372e945dda8979328b49adba34a9a92 /device.h
parent09a17d56e2a3f975a0467e8da4ca26c946b6ccf7 (diff)
downloadvdr-patches-5ce592e54a4aa741444afae8eb80dff47bc355fd.tar.gz
vdr-patches-5ce592e54a4aa741444afae8eb80dff47bc355fd.tar.bz2
Version 1.7.13
- Updated the Italian OSD texts (thanks to Diego Pierotto). - Changed the position of Sirius 4 to S4.8E in sources.conf (thanks to Alexander Gross). - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg). - Moved the declaration of cMenuCommands to menu.h, so that plugins can use it. - Added a note to the MANUAL, saying that adding new transponders only works if the "EPG scan" is active (suggested by Halim Sahim). - Improved handling frames at the beginning and end of a recording in cDvbPlayer for devices with large buffers (thanks to Reinhard Nissl). - Implemented cDeviceHook to allow plugins more control over which device can provide which transponder (thanks to Reinhard Nissl). - Implemented cDevice::GetCurrentlyTunedTransponder() (thanks to Reinhard Nissl). - Moved strictly necessary Makefile options into Make.global, which is included by all plugins (thanks to Paul Menzel). The Makefiles of existing plugins should be modified like this: ------------------------------------------------------------ --- PLUGINS/src/hello/Makefile 2009/10/18 14:00:07 2.1 +++ PLUGINS/src/hello/Makefile 2010/02/06 14:50:03 2.2 @@ -18,7 +18,7 @@ ### The C++ compiler and options: CXX ?= g++ -CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses +CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses ### The directory environment: @@ -26,6 +26,10 @@ LIBDIR = ../../lib TMPDIR = /tmp +### Make sure that necessary options are included: + +include $(VDRDIR)/Make.global + ### Allow user defined options to overwrite defaults: -include $(VDRDIR)/Make.config ------------------------------------------------------------ - Added device definitions to the diseqc.conf file format, so that certain satellite positions can be limited to a given list of devices. This obsoletes the SOURCECAPS patch. - Keeping subtitles visible when pausing replay (thanks to Rolf Ahrenberg). - Fixed adding new transponders in case there is only a single channel in the channel list (reported by Halim Sahin). - The file name in the "Timers" menu now shows only the base name of the recording without the folder path (if any). Otherwise with long folder paths the actual recording name was not visible at all. - Updated the Romanian OSD texts (thanks to Lucian Muresan). - Exported some libsi functions (thanks to Lucian Muresan). - Improved scalability of the default skins. - Fixed the German translation of "Folder name must not contain '%c'!" (thanks to Frank Schmirler). - Updated the Estonian OSD texts (thanks to Arthur Konovalov). - Plugins can now define new sources. In order to implement this, the following changes were made: + The transponder parameter string is no longer interpreted by cChannel, but rather stored as is and used only by the respective device. That way plugins can use a channel's parameter string to store arbitrary data (see vdr.5). + The new class cSourceParam can be used by plugins to define new sources, and to implement OSD items that will be used in the channel editor for editing the source specific parameters of a channel (see dvbdevice.c for an example of how this is done for the default DVB devices). + Purely numerical values are no longer accepted in the 'source' parameter of a channel. This obsoletes the PLUGINPARAM patch. - Updated the Lithuanian OSD texts (thanks to Valdemaras Pipiras). - cSafeFile::Close() now flushes the file (suggested by Stephan Austermühle). - The option "Setup/DVB/Use Dolby Digital" now only controls whether Dolby Digital tracks appear in the "Audio" menu. Dolby Digital is always recorded. This obsoletes the DOLBYINREC patch.
Diffstat (limited to 'device.h')
-rw-r--r--device.h22
1 files changed, 21 insertions, 1 deletions
diff --git a/device.h b/device.h
index 897de2a..9ce814a 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: device.h 2.19 2010/01/01 15:04:27 kls Exp $
+ * $Id: device.h 2.21 2010/02/06 14:34:41 kls Exp $
*/
#ifndef __DEVICE_H
@@ -88,10 +88,18 @@ class cPlayer;
class cReceiver;
class cLiveSubtitle;
+class cDeviceHook : public cListObject {
+public:
+ cDeviceHook(void);
+ virtual bool DeviceProvidesTransponder(const cDevice *Device, const cChannel *Channel) const;
+ ///< Returns true if the given Device can provide the given Channel's transponder.
+ };
+
/// The cDevice class is the base from which actual devices can be derived.
class cDevice : public cThread {
friend class cLiveSubtitle;
+ friend class cDeviceHook;
private:
static int numDevices;
static int useDevice;
@@ -187,6 +195,13 @@ public:
virtual bool HasDecoder(void) const;
///< Tells whether this device has an MPEG decoder.
+// Device hooks
+
+private:
+ static cList<cDeviceHook> deviceHooks;
+protected:
+ bool DeviceHooksProvidesTransponder(const cChannel *Channel) const;
+
// SPU facilities
private:
@@ -232,6 +247,11 @@ public:
///< actually provide channels must implement this function.
///< The result of this function is used when selecting a device, in order
///< to avoid devices that provide more than one system.
+ virtual const cChannel *GetCurrentlyTunedTransponder(void) const;
+ ///< Returns a pointer to the currently tuned transponder.
+ ///< This is not one of the channels in the global cChannels list, but rather
+ ///< a local copy. The result may be NULL if the device is not tuned to any
+ ///< transponder.
virtual bool IsTunedToTransponder(const cChannel *Channel);
///< Returns true if this device is currently tuned to the given Channel's
///< transponder.