summaryrefslogtreecommitdiff
path: root/PLUGINS/src/pictures
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2012-04-28 13:09:42 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2012-04-28 13:09:42 +0200
commit97e242d1b54e0bfac3455ddeded37136156fea36 (patch)
treee82354fa113c552f0bddb1c1a3d1c209ac8258c3 /PLUGINS/src/pictures
parent109586571a3cd6b011b6c2e348e3403a0d37c081 (diff)
downloadvdr-97e242d1b54e0bfac3455ddeded37136156fea36.tar.gz
vdr-97e242d1b54e0bfac3455ddeded37136156fea36.tar.bz2
The new functions cControl::GetRecording() and cControl::GetHeader() can be used to retrieve information about what the current player is playing
Diffstat (limited to 'PLUGINS/src/pictures')
-rw-r--r--PLUGINS/src/pictures/HISTORY4
-rw-r--r--PLUGINS/src/pictures/pictures.c4
-rw-r--r--PLUGINS/src/pictures/player.c7
-rw-r--r--PLUGINS/src/pictures/player.h3
4 files changed, 14 insertions, 4 deletions
diff --git a/PLUGINS/src/pictures/HISTORY b/PLUGINS/src/pictures/HISTORY
index 19c968ad..70f61456 100644
--- a/PLUGINS/src/pictures/HISTORY
+++ b/PLUGINS/src/pictures/HISTORY
@@ -71,3 +71,7 @@ VDR Plugin 'pictures' Revision History
2012-02-27: Version 0.1.2
- Removed an obsolete command line option.
+
+2012-04-2r8 Version 0.1.3
+
+- Added cPictureControl::GetHeader().
diff --git a/PLUGINS/src/pictures/pictures.c b/PLUGINS/src/pictures/pictures.c
index 57121b5e..77df0d9a 100644
--- a/PLUGINS/src/pictures/pictures.c
+++ b/PLUGINS/src/pictures/pictures.c
@@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
- * $Id: pictures.c 2.5 2012/02/27 12:35:45 kls Exp $
+ * $Id: pictures.c 2.6 2012/04/28 11:58:42 kls Exp $
*/
#include <getopt.h>
@@ -11,7 +11,7 @@
#include "menu.h"
#include "player.h"
-static const char *VERSION = "0.1.2";
+static const char *VERSION = "0.1.3";
static const char *DESCRIPTION = trNOOP("A simple picture viewer");
static const char *MAINMENUENTRY = trNOOP("Pictures");
diff --git a/PLUGINS/src/pictures/player.c b/PLUGINS/src/pictures/player.c
index 4b289ac9..6048d4cb 100644
--- a/PLUGINS/src/pictures/player.c
+++ b/PLUGINS/src/pictures/player.c
@@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
- * $Id: player.c 2.1 2011/02/20 17:15:25 kls Exp $
+ * $Id: player.c 2.2 2012/04/28 11:58:15 kls Exp $
*/
#include "player.h"
@@ -204,6 +204,11 @@ void cPictureControl::DisplayCaption(void)
osd->Flush();
}
+cString cPictureControl::GetHeader(void)
+{
+ return tr("Pictures");
+}
+
eOSState cPictureControl::ProcessKey(eKeys Key)
{
switch (Key) {
diff --git a/PLUGINS/src/pictures/player.h b/PLUGINS/src/pictures/player.h
index ab201bd8..7a0b401f 100644
--- a/PLUGINS/src/pictures/player.h
+++ b/PLUGINS/src/pictures/player.h
@@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
- * $Id: player.h 1.1 2008/01/13 11:29:27 kls Exp $
+ * $Id: player.h 2.1 2012/04/28 11:56:01 kls Exp $
*/
#ifndef _PLAYER_H
@@ -39,6 +39,7 @@ private:
public:
cPictureControl(cPictureEntry *Pictures, const cPictureEntry *PictureEntry, bool SlideShow = false);
virtual ~cPictureControl();
+ virtual cString GetHeader(void);
virtual eOSState ProcessKey(eKeys Key);
static bool Active(void) { return active > 0; }
static const char *LastDisplayed(void);