summaryrefslogtreecommitdiff
path: root/PLUGINS/src/pictures
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2008-01-19 11:21:32 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2008-01-19 11:21:32 +0100
commitb013f4ce83f2787c3d855716a1e81746c227df6f (patch)
tree2624e269e2a6551170879c0ca12f3c53a130cdd8 /PLUGINS/src/pictures
parentdc0665ebf3c7c814f080e28dbd3b5b6b68c3b56e (diff)
downloadvdr-b013f4ce83f2787c3d855716a1e81746c227df6f.tar.gz
vdr-b013f4ce83f2787c3d855716a1e81746c227df6f.tar.bz2
Fixed the Play function in the pictures plugin
Diffstat (limited to 'PLUGINS/src/pictures')
-rw-r--r--PLUGINS/src/pictures/HISTORY5
-rw-r--r--PLUGINS/src/pictures/entry.c7
-rw-r--r--PLUGINS/src/pictures/pictures.c4
-rw-r--r--PLUGINS/src/pictures/player.c3
4 files changed, 15 insertions, 4 deletions
diff --git a/PLUGINS/src/pictures/HISTORY b/PLUGINS/src/pictures/HISTORY
index c04a6280..cc9f5e37 100644
--- a/PLUGINS/src/pictures/HISTORY
+++ b/PLUGINS/src/pictures/HISTORY
@@ -4,3 +4,8 @@ VDR Plugin 'pictures' Revision History
2008-01-13: Version 0.0.1
- Initial revision.
+
+2008-01-19: Version 0.0.2
+
+- Fixed the Play function (when used from a directory in the pictures menu
+ it always started with the next directory).
diff --git a/PLUGINS/src/pictures/entry.c b/PLUGINS/src/pictures/entry.c
index 85156558..e03858c9 100644
--- a/PLUGINS/src/pictures/entry.c
+++ b/PLUGINS/src/pictures/entry.c
@@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
- * $Id: entry.c 1.1 2008/01/13 11:29:27 kls Exp $
+ * $Id: entry.c 1.2 2008/01/18 15:49:51 kls Exp $
*/
#include "entry.h"
@@ -138,6 +138,11 @@ const cPictureEntry *cPictureEntry::NextPicture(const cPictureEntry *This) const
return pe;
}
}
+ else if (IsDirectory()) {
+ const cPictureEntry *p = FirstPicture();
+ if (p)
+ return p;
+ }
if (parent)
return parent->NextPicture(this);
return NULL;
diff --git a/PLUGINS/src/pictures/pictures.c b/PLUGINS/src/pictures/pictures.c
index 8b517476..e3015e40 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 1.1 2008/01/13 11:29:27 kls Exp $
+ * $Id: pictures.c 1.2 2008/01/19 11:20:03 kls Exp $
*/
#include <getopt.h>
@@ -11,7 +11,7 @@
#include "menu.h"
#include "player.h"
-static const char *VERSION = "0.0.1";
+static const char *VERSION = "0.0.2";
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 9e07fc53..b942be52 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 1.1 2008/01/13 11:29:27 kls Exp $
+ * $Id: player.c 1.2 2008/01/19 11:01:58 kls Exp $
*/
#include "player.h"
@@ -95,6 +95,7 @@ cPictureControl::cPictureControl(cPictureEntry *Pictures, const cPictureEntry *P
pictureEntry = PictureEntry;
osd = NULL;
lastPath = "/";
+ slideShowDelay.Set(SlideShowDelay * 1000);
slideShow = SlideShow;
alwaysDisplayCaption = false;
NextPicture(slideShow && pictureEntry->IsDirectory() ? 1 : 0);