From: ghost Date: Wed, 27 Jan 2010 09:49:53 +0000 (+0100) Subject: Merge remote branch 'origin/bug_288_remove_no_resume_on_minor_start_cutpoints' X-Git-Tag: 2.8.0~79 X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/34f11d5064546dd47b7cfde226f4267a7f83741d?hp=c75e82f378fef9e9a1c500ffb1696ba02d8fbd9a Merge remote branch 'origin/bug_288_remove_no_resume_on_minor_start_cutpoints' --- diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py index 7ae0b123..ca9ba550 100644 --- a/lib/python/Screens/InfoBarGenerics.py +++ b/lib/python/Screens/InfoBarGenerics.py @@ -2014,8 +2014,10 @@ class InfoBarCueSheetSupport: if last is not None: self.resume_point = last + + l = last / 90000 if config.usage.on_movie_start.value == "ask": - Notifications.AddNotificationWithCallback(self.playLastCB, MessageBox, _("Do you want to resume this playback?"), timeout=10) + Notifications.AddNotificationWithCallback(self.playLastCB, MessageBox, _("Do you want to resume this playback?") + "\n" + (_("Resume position at %s") % ("%d:%02d:%02d" % (l/3600, l%3600/60, l%60))), timeout=10) elif config.usage.on_movie_start.value == "resume": # TRANSLATORS: The string "Resuming playback" flashes for a moment # TRANSLATORS: at the start of a movie, when the user has selected diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp index 615329c9..1a3cb0e0 100644 --- a/lib/service/servicedvb.cpp +++ b/lib/service/servicedvb.cpp @@ -1128,11 +1128,7 @@ RESULT eDVBServicePlay::stop() if (length) { - int perc = play_position * 100LL / length; - - /* only store last play position when between 1% and 99% */ - if ((1 < perc) && (perc < 99)) - m_cue_entries.insert(cueEntry(play_position, 3)); /* last play position */ + m_cue_entries.insert(cueEntry(play_position, 3)); /* last play position */ } m_cuesheet_changed = 1; }