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

Pressing the 'Back' button while replaying a DVD now leads to the DVD menu

Browse Source
This commit is contained in:
Klaus Schmidinger 2001-10-21 14:29:03 +02:00
parent 74016967e4
commit a7136cf518
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
HISTORY
View File

@ -829,3 +829,4 @@ Video Disk Recorder Revision History
- Fixed reading timers.conf and channels.conf that contain blanks after numeric - Fixed reading timers.conf and channels.conf that contain blanks after numeric
values. values.
- Fixed handling trick modes near the beginning and end of a recording. - Fixed handling trick modes near the beginning and end of a recording.
- Pressing the "Back" button while replaying a DVD now leads to the DVD menu.

12
menu.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: menu.c 1.130 2001/10/20 11:16:56 kls Exp $ * $Id: menu.c 1.131 2001/10/21 14:28:14 kls Exp $
*/ */
#include "menu.h" #include "menu.h"
@ -1636,11 +1636,12 @@ cMenuDVD::cMenuDVD(void)
dvd->Open(); dvd->Open();
ifo_handle_t *vmg = dvd->openVMG(); ifo_handle_t *vmg = dvd->openVMG();
if (vmg) { if (vmg) {
int lastTitleID = cReplayControl::LastTitleID();
dsyslog(LOG_INFO, "DVD: vmg: %p", vmg);//XXX dsyslog(LOG_INFO, "DVD: vmg: %p", vmg);//XXX
tt_srpt_t *tt_srpt = vmg->tt_srpt; tt_srpt_t *tt_srpt = vmg->tt_srpt;
dsyslog(LOG_INFO, "DVD: tt_srpt: %p", tt_srpt);//XXX dsyslog(LOG_INFO, "DVD: tt_srpt: %p", tt_srpt);//XXX
for (int i = 0; i < tt_srpt->nr_of_srpts; i++) for (int i = 0; i < tt_srpt->nr_of_srpts; i++)
Add(new cMenuDVDItem(i, tt_srpt->title[i].nr_of_ptts)); Add(new cMenuDVDItem(i, tt_srpt->title[i].nr_of_ptts), i == lastTitleID);
} }
} }
SetHelp(tr("Play"), NULL, NULL, NULL); SetHelp(tr("Play"), NULL, NULL, NULL);
@ -2382,6 +2383,11 @@ void cReplayControl::SetDVD(cDVD *DVD, int Title)//XXX
dvd = DVD; dvd = DVD;
titleid = Title; titleid = Title;
} }
int cReplayControl::LastTitleID(void)
{
return titleid;
}
#endif //DVDSUPPORT #endif //DVDSUPPORT
const char *cReplayControl::LastReplayed(void) const char *cReplayControl::LastReplayed(void)
@ -2748,7 +2754,7 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
else else
Show(); Show();
break; break;
case kBack: return osRecordings; case kBack: return fileName ? osRecordings : osDVD;
default: return osUnknown; default: return osUnknown;
} }
} }

3
menu.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: menu.h 1.32 2001/10/20 11:15:26 kls Exp $ * $Id: menu.h 1.33 2001/10/21 14:26:01 kls Exp $
*/ */
#ifndef _MENU_H #ifndef _MENU_H
@ -133,6 +133,7 @@ public:
static void SetRecording(const char *FileName, const char *Title); static void SetRecording(const char *FileName, const char *Title);
#ifdef DVDSUPPORT #ifdef DVDSUPPORT
static void SetDVD(cDVD *DVD, int Title);//XXX static void SetDVD(cDVD *DVD, int Title);//XXX
static int LastTitleID(void);
#endif //DVDSUPPORT #endif //DVDSUPPORT
static const char *LastReplayed(void); static const char *LastReplayed(void);
static void ClearLastReplayed(const char *FileName); static void ClearLastReplayed(const char *FileName);