mirror of
https://github.com/vdr-projects/vdr.git
synced 2025-03-01 10:50:46 +00:00
fc4c8740a7
- Fixed the declaration of cSubtitleObject::Decode8BppCodeString() (thanks to Gregoire Favre). - The new setup option "Miscellaneous/Emergency exit" can be used to turn off the automatic restart of VDR in case a recording fails for some reason. - The kInfo key is now propagated to any open menu, so that it can react to it in a context sensitive manner (suggested by Andreas Brugger). If there is no menu open it will show the info of the current broadcast or replay. - cTimeMs now uses the monotonic clock, if available (thanks to Petri Hintukainen). - Fixed cVector::Clear() and cStringList::Clear(). - Added cString::Truncate(). - Fixed the "i18n:" target in the "newplugin" script, so that it can create the initial *.pot file. - Fixed handling the '-l' option. - Fixed error handling in cCuttingThread::Action() (thanks to Udo Richter). - Fixed a loss of the date display in the "classic" skin's main menu (reported by Andreas Brugger). - Added a missing setting of lastFreeMB in cMenuMain::Update() (reported by Andreas Brugger). - Added '-Wno-parentheses' to the compiler options in order to avoid silly compiler warnings for expressions like 'a || b && c', where GCC 4.3 wants to force the programmer to write 'a || (b && c)', while everybody knows that '&&' links stronger than '||' (reported by Tobias Grimm). - Updated the Hungarian language texts (thanks to István Füley). - Fixed displaying weekday names in the Schedule menu if the system uses UTF-8 (reported by Jiri Dobry). - The new plugin "pictures" implements a simple picture viewer. See PLUGINS/src/pictures/README for details. - The automatic shutdown is now suppressed if the remote control is currently disabled (suggested by Helmut Auer, implemented by Udo Richter). - 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 channel (thanks to Benjamin Hess).
130 lines
3.4 KiB
C
130 lines
3.4 KiB
C
/*
|
|
* menu.c: A menu for still pictures
|
|
*
|
|
* See the README file for copyright information and how to reach the author.
|
|
*
|
|
* $Id: menu.c 1.1 2008/01/13 11:35:18 kls Exp $
|
|
*/
|
|
|
|
#include "menu.h"
|
|
#include <vdr/tools.h>
|
|
#include "entry.h"
|
|
#include "player.h"
|
|
|
|
char PictureDirectory[PATH_MAX] = "";
|
|
|
|
static bool PathStartsWith(const char *Path, const char *Name)
|
|
{
|
|
if (Path && Name) {
|
|
while (*Name) {
|
|
if (*Path++ != *Name++)
|
|
return false;
|
|
}
|
|
if (*Path && *Path != '/')
|
|
return false;
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
static const char *NextLevel(const char *Path)
|
|
{
|
|
if (Path) {
|
|
const char *p = strchr(Path, '/');
|
|
return p ? p + 1 : NULL;
|
|
}
|
|
return Path;
|
|
}
|
|
|
|
cPictureEntry *cPictureMenu::pictures = NULL;
|
|
|
|
cPictureMenu::cPictureMenu(const cPictureEntry *PictureEntry, const char *Path)
|
|
:cOsdMenu(tr("Pictures"))
|
|
{
|
|
pictureEntry = PictureEntry;
|
|
if (!pictureEntry)
|
|
pictureEntry = pictures = new cPictureEntry(PictureDirectory, NULL, true);
|
|
if (pictureEntry->Parent()) {
|
|
if (!pictureEntry->Parent()->Parent())
|
|
SetTitle(pictureEntry->Name()); // Year
|
|
else
|
|
SetTitle(cString::sprintf("%s: %s", pictureEntry->Parent()->Name(), *HandleUnderscores(pictureEntry->Name()))); // Year/Description
|
|
}
|
|
Set(Path);
|
|
}
|
|
|
|
cPictureMenu::~cPictureMenu()
|
|
{
|
|
if (pictures && pictureEntry && !pictureEntry->Parent())
|
|
DELETENULL(pictures);
|
|
}
|
|
|
|
void cPictureMenu::Set(const char *Path)
|
|
{
|
|
Clear();
|
|
const cList<cPictureEntry> *l = pictureEntry->Entries();
|
|
if (l) {
|
|
for (const cPictureEntry *e = l->First(); e; e = l->Next(e)) {
|
|
cString Name = HandleUnderscores(e->Name());
|
|
if (!e->IsDirectory())
|
|
Name.Truncate(-4); // don't display the ".mpg" extension
|
|
Add(new cOsdItem(HandleUnderscores(Name)), PathStartsWith(Path, e->Name()));
|
|
}
|
|
}
|
|
SetHelp(Count() ? trVDR("Button$Play") : NULL, NULL, NULL, cPictureControl::Active() ? trVDR("Button$Stop") : NULL);
|
|
if (Current() >= 0) {
|
|
const char *p = NextLevel(Path);
|
|
if (p)
|
|
SelectItem(p);
|
|
}
|
|
}
|
|
|
|
eOSState cPictureMenu::SelectItem(const char *Path, bool SlideShow)
|
|
{
|
|
cOsdItem *Item = Get(Current());
|
|
if (Item) {
|
|
const cList<cPictureEntry> *l = pictureEntry->Entries();
|
|
if (l) {
|
|
cPictureEntry *pe = l->Get(Current());
|
|
if (pe) {
|
|
if (SlideShow) {
|
|
cControl::Launch(new cPictureControl(pictures, pe, true));
|
|
pictures = NULL; // cPictureControl takes ownership
|
|
return osEnd;
|
|
}
|
|
if (pe->IsDirectory())
|
|
return AddSubMenu(new cPictureMenu(pe, Path));
|
|
else if (!Path) {
|
|
cControl::Launch(new cPictureControl(pictures, pe));
|
|
pictures = NULL; // cPictureControl takes ownership
|
|
return osEnd;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return osContinue;
|
|
}
|
|
|
|
eOSState cPictureMenu::ProcessKey(eKeys Key)
|
|
{
|
|
eOSState state = cOsdMenu::ProcessKey(Key);
|
|
if (state == osUnknown) {
|
|
switch (Key) {
|
|
case kRed:
|
|
case kPlay: return SelectItem(NULL, true);
|
|
case kBlue:
|
|
case kStop: if (cPictureControl::Active())
|
|
return osStopReplay;
|
|
break;
|
|
case kOk: return SelectItem();
|
|
default: break;
|
|
}
|
|
}
|
|
return state;
|
|
}
|
|
|
|
cPictureMenu *cPictureMenu::CreatePictureMenu(void)
|
|
{
|
|
return new cPictureMenu(NULL, cPictureControl::LastDisplayed());
|
|
}
|