mirror of
https://github.com/VDR4Arch/vdr.git
synced 2023-10-10 13:36:52 +02:00
Pressing the 'Back' button while replaying a DVD now leads to the DVD menu
This commit is contained in:
parent
74016967e4
commit
a7136cf518
1
HISTORY
1
HISTORY
@ -829,3 +829,4 @@ Video Disk Recorder Revision History
|
||||
- Fixed reading timers.conf and channels.conf that contain blanks after numeric
|
||||
values.
|
||||
- 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
12
menu.c
@ -4,7 +4,7 @@
|
||||
* See the main source file 'vdr.c' for copyright information and
|
||||
* 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"
|
||||
@ -1636,11 +1636,12 @@ cMenuDVD::cMenuDVD(void)
|
||||
dvd->Open();
|
||||
ifo_handle_t *vmg = dvd->openVMG();
|
||||
if (vmg) {
|
||||
int lastTitleID = cReplayControl::LastTitleID();
|
||||
dsyslog(LOG_INFO, "DVD: vmg: %p", vmg);//XXX
|
||||
tt_srpt_t *tt_srpt = vmg->tt_srpt;
|
||||
dsyslog(LOG_INFO, "DVD: tt_srpt: %p", tt_srpt);//XXX
|
||||
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);
|
||||
@ -2382,6 +2383,11 @@ void cReplayControl::SetDVD(cDVD *DVD, int Title)//XXX
|
||||
dvd = DVD;
|
||||
titleid = Title;
|
||||
}
|
||||
|
||||
int cReplayControl::LastTitleID(void)
|
||||
{
|
||||
return titleid;
|
||||
}
|
||||
#endif //DVDSUPPORT
|
||||
|
||||
const char *cReplayControl::LastReplayed(void)
|
||||
@ -2748,7 +2754,7 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
|
||||
else
|
||||
Show();
|
||||
break;
|
||||
case kBack: return osRecordings;
|
||||
case kBack: return fileName ? osRecordings : osDVD;
|
||||
default: return osUnknown;
|
||||
}
|
||||
}
|
||||
|
3
menu.h
3
menu.h
@ -4,7 +4,7 @@
|
||||
* See the main source file 'vdr.c' for copyright information and
|
||||
* 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
|
||||
@ -133,6 +133,7 @@ public:
|
||||
static void SetRecording(const char *FileName, const char *Title);
|
||||
#ifdef DVDSUPPORT
|
||||
static void SetDVD(cDVD *DVD, int Title);//XXX
|
||||
static int LastTitleID(void);
|
||||
#endif //DVDSUPPORT
|
||||
static const char *LastReplayed(void);
|
||||
static void ClearLastReplayed(const char *FileName);
|
||||
|
Loading…
Reference in New Issue
Block a user