summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2012-03-13 10:20:42 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2012-03-13 10:20:42 +0100
commit4dcbf19ea239f90d646893d9580c4edf90386036 (patch)
tree3b0c4c472f5899c397efca95166104932d36246b
parented10aaf68bbd519856430b7f6e6223a243feffc0 (diff)
downloadvdr-4dcbf19ea239f90d646893d9580c4edf90386036.tar.gz
vdr-4dcbf19ea239f90d646893d9580c4edf90386036.tar.bz2
The new function cDevice::DeviceName() returns a string identifying the name of the given device
-rw-r--r--HISTORY4
-rw-r--r--device.c7
-rw-r--r--device.h5
-rw-r--r--dvbdevice.c7
-rw-r--r--dvbdevice.h3
5 files changed, 21 insertions, 5 deletions
diff --git a/HISTORY b/HISTORY
index 22c3b0f2..6631f125 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7010,7 +7010,7 @@ Video Disk Recorder Revision History
which is higher than any normal table id that is broadcast in the EIT data.
See PLUGINS.html, section "Electronic Program Guide" for more information.
-2012-03-12: Version 1.7.27
+2012-03-13: Version 1.7.27
- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
- Changed the Green button in the "Edit timer" menu from "Once" to "Single"
@@ -7033,3 +7033,5 @@ Video Disk Recorder Revision History
in their Makefiles.
- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
- Improved fast forwarding to the end of a timeshift recording.
+- The new function cDevice::DeviceName() returns a string identifying the name of
+ the given device.
diff --git a/device.c b/device.c
index 8c527aac..00645cfc 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: device.c 2.57 2012/03/07 14:17:49 kls Exp $
+ * $Id: device.c 2.58 2012/03/13 09:48:14 kls Exp $
*/
#include "device.h"
@@ -162,6 +162,11 @@ int cDevice::DeviceNumber(void) const
return -1;
}
+cString cDevice::DeviceName(void) const
+{
+ return "";
+}
+
void cDevice::MakePrimaryDevice(bool On)
{
if (!On) {
diff --git a/device.h b/device.h
index 0d9ac3ac..987dfd2f 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.37 2012/03/06 12:13:46 kls Exp $
+ * $Id: device.h 2.38 2012/03/13 10:17:16 kls Exp $
*/
#ifndef __DEVICE_H
@@ -201,6 +201,9 @@ public:
///< Returns the card index of this device (0 ... MAXDEVICES - 1).
int DeviceNumber(void) const;
///< Returns the number of this device (0 ... numDevices).
+ virtual cString DeviceName(void) const;
+ ///< Returns a string identifying the name of this device.
+ ///< The default implementation returns an empty string.
virtual bool HasDecoder(void) const;
///< Tells whether this device has an MPEG decoder.
virtual bool AvoidRecording(void) const { return false; }
diff --git a/dvbdevice.c b/dvbdevice.c
index 4c9268f4..d7f3c499 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: dvbdevice.c 2.67 2012/03/08 09:49:58 kls Exp $
+ * $Id: dvbdevice.c 2.68 2012/03/13 09:50:56 kls Exp $
*/
#include "dvbdevice.h"
@@ -1090,6 +1090,11 @@ bool cDvbDevice::Probe(int Adapter, int Frontend)
return true;
}
+cString cDvbDevice::DeviceName(void) const
+{
+ return frontendInfo.name;
+}
+
bool cDvbDevice::Initialize(void)
{
new cDvbSourceParam('A', "ATSC");
diff --git a/dvbdevice.h b/dvbdevice.h
index 85b0d9cf..c53a2086 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: dvbdevice.h 2.24 2012/02/29 12:20:51 kls Exp $
+ * $Id: dvbdevice.h 2.25 2012/03/13 10:11:15 kls Exp $
*/
#ifndef __DVBDEVICE_H
@@ -138,6 +138,7 @@ public:
int Adapter(void) const { return adapter; }
int Frontend(void) const { return frontend; }
virtual bool Ready(void);
+ virtual cString DeviceName(void) const;
static bool BondDevices(const char *Bondings);
///< Bonds the devices as defined in the given Bondings string.
///< A bonding is a sequence of device numbers (starting at 1),