aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorStefan Pluecken <stefan.pluecken@multimedia-labs.de>2010-01-24 13:24:37 +0100
committerStefan Pluecken <stefan.pluecken@multimedia-labs.de>2010-01-24 14:10:09 +0100
commit6c77c3ab8156d72dfd616d83c276ef7f3ca1b1a7 (patch)
treefdc72a5f3554a47ce490d981e4b7fbb13ee1055a /lib
parent6b1138ae6ea57dfb1a345d2a4ad393ba0bc587c8 (diff)
downloadenigma2-6c77c3ab8156d72dfd616d83c276ef7f3ca1b1a7.tar.gz
enigma2-6c77c3ab8156d72dfd616d83c276ef7f3ca1b1a7.zip
fixes bug #288
last playing position for recorded services was stored only if between 1% and 99% of the recording's length. this lead to voodoo for the user, since long recordings naturally have a longer 1% than short ones. so the 1% rule is gone now and we display the position of the marker in the message box, asking the user if playing should continue at this position.
Diffstat (limited to 'lib')
-rw-r--r--lib/python/Screens/InfoBarGenerics.py4
-rw-r--r--lib/service/servicedvb.cpp6
2 files changed, 4 insertions, 6 deletions
diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index f2aff6c6..87631086 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -2015,8 +2015,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 9f10644c..558bf0c2 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;
}