self["audioLabel"] = Label("n/a")
self["subtitleLabel"] = Label("")
self["chapterLabel"] = Label("")
+ self.last_audioTuple = None
+ self.last_subtitleTuple = None
self.totalChapters = 0
self.currentChapter = 0
self.totalTitles = 0
print "AudioInfoAvail ", repr(audioTuple)
audioString = "%d: %s (%s)" % (audioTuple[0],audioTuple[1],audioTuple[2])
self["audioLabel"].setText(audioString)
- if not self.in_menu:
+ if audioTuple != self.last_audioTuple and not self.in_menu:
self.doShow()
+ self.last_audioTuple = audioTuple
def __osdSubtitleInfoAvail(self):
subtitleTuple = self.service.info().getInfoObject(iServiceInformation.sUser+7)
if subtitleTuple[0] is not 0:
subtitleString = "%d: %s" % (subtitleTuple[0],subtitleTuple[1])
self["subtitleLabel"].setText(subtitleString)
- if not self.in_menu:
+ if subtitleTuple != self.last_subtitleTuple and not self.in_menu:
self.doShow()
+ self.last_subtitleTuple = subtitleTuple
def __chapterUpdated(self):
self.currentChapter = self.service.info().getInfo(iServiceInformation.sCurrentChapter)
def playLastCB(self, answer): # overwrite infobar cuesheet function
print "playLastCB", answer, self.resume_point
- if self.service:
+ if self.service and answer == True:
seek = self.service.seek()
seek.seekTo(self.resume_point)
self.hideAfterResume()
{
eDebug("eServiceDVD::saveCuesheet()");
- struct ddvd_time info;
- ddvd_get_last_time(m_ddvdconfig, &info);
- if ( info.pos_chapter < info.end_chapter )
+ struct ddvd_resume resume_info;
+ ddvd_get_resume_pos(m_ddvdconfig, &resume_info);
+
+ if (resume_info.title)
{
+ struct ddvd_time info;
+ ddvd_get_last_time(m_ddvdconfig, &info);
pts_t pos;
pos = info.pos_hours * 3600;
pos += info.pos_minutes * 60;
pos += info.pos_seconds;
pos *= 90000;
m_cue_pts = pos;
+ eDebug("ddvd_get_resume_pos resume_info.title=%d, chapter=%d, block=%lu, audio_id=%d, audio_lock=%d, spu_id=%d, spu_lock=%d (pts=%llu)",resume_info.title,resume_info.chapter,resume_info.block,resume_info.audio_id, resume_info.audio_lock, resume_info.spu_id, resume_info.spu_lock,m_cue_pts);
+ }
+ else
+ {
+ eDebug("we're in a menu or somewhere else funny. so save cuesheet with pts=0");
+ m_cue_pts = 0;
}
-
- struct ddvd_resume resume_info;
- ddvd_get_resume_pos(m_ddvdconfig, &resume_info);
- eDebug("ddvd_get_resume_pos resume_info.title=%d, chapter=%d, block=%lu, audio_id=%d, audio_lock=%d, spu_id=%d, spu_lock=%d (pts=%llu)",resume_info.title,resume_info.chapter,resume_info.block,resume_info.audio_id, resume_info.audio_lock, resume_info.spu_id, resume_info.spu_lock,m_cue_pts);
char filename[128];
if ( m_ddvd_titlestring[0] != '\0' )