frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed the Play function in the pictures plugin

Browse Source
This commit is contained in:
Klaus Schmidinger 2008-01-19 11:21:32 +01:00
parent dc0665ebf3
commit b013f4ce83
5 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HISTORY
View File

@ -5563,3 +5563,7 @@ Video Disk Recorder Revision History
- Added a section about "Logging" to PLUGINS.html (suggested by Torsten Kunkel). - Added a section about "Logging" to PLUGINS.html (suggested by Torsten Kunkel).
- Enhanced the SVDRP command CLRE to allow clearing the EPG data of a particular - Enhanced the SVDRP command CLRE to allow clearing the EPG data of a particular
channel (thanks to Benjamin Hess). channel (thanks to Benjamin Hess).
2008-01-19: Version 1.5.14
- Fixed the Play function in the pictures plugin.

5
PLUGINS/src/pictures/HISTORY
View File

@ -4,3 +4,8 @@ VDR Plugin 'pictures' Revision History
2008-01-13: Version 0.0.1 2008-01-13: Version 0.0.1
- Initial revision. - 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).

7
PLUGINS/src/pictures/entry.c
View File

@ -3,7 +3,7 @@
* *
* See the README file for copyright information and how to reach the author. * 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" #include "entry.h"
@ -138,6 +138,11 @@ const cPictureEntry *cPictureEntry::NextPicture(const cPictureEntry *This) const
return pe; return pe;
} }
} }
else if (IsDirectory()) {
const cPictureEntry *p = FirstPicture();
if (p)
return p;
}
if (parent) if (parent)
return parent->NextPicture(this); return parent->NextPicture(this);
return NULL; return NULL;

4
PLUGINS/src/pictures/pictures.c
View File

@ -3,7 +3,7 @@
* *
* See the README file for copyright information and how to reach the author. * 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> #include <getopt.h>
@ -11,7 +11,7 @@
#include "menu.h" #include "menu.h"
#include "player.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 *DESCRIPTION = trNOOP("A simple picture viewer");
static const char *MAINMENUENTRY = trNOOP("Pictures"); static const char *MAINMENUENTRY = trNOOP("Pictures");

3
PLUGINS/src/pictures/player.c
View File

@ -3,7 +3,7 @@
* *
* See the README file for copyright information and how to reach the author. * 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" #include "player.h"
@ -95,6 +95,7 @@ cPictureControl::cPictureControl(cPictureEntry *Pictures, const cPictureEntry *P
pictureEntry = PictureEntry; pictureEntry = PictureEntry;
osd = NULL; osd = NULL;
lastPath = "/"; lastPath = "/";
slideShowDelay.Set(SlideShowDelay * 1000);
slideShow = SlideShow; slideShow = SlideShow;
alwaysDisplayCaption = false; alwaysDisplayCaption = false;
NextPicture(slideShow && pictureEntry->IsDirectory() ? 1 : 0); NextPicture(slideShow && pictureEntry->IsDirectory() ? 1 : 0);