aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorFelix Domke <felix.domke@multimedia-labs.de>2009-09-03 13:02:04 +0200
committerFelix Domke <felix.domke@multimedia-labs.de>2009-09-03 13:02:04 +0200
commit0963917d08aed832a12fd91148daa1649b4971d5 (patch)
tree3b127d9f8d0dcd1b80a37ef3d8dca3424083366e /lib
parent26ffb5f9f32d3939c8f4bb6601bfed424bd13a14 (diff)
parentc29c26df0e969b7caffe60a30d42e26f8f5cbbf4 (diff)
downloadenigma2-0963917d08aed832a12fd91148daa1649b4971d5.tar.gz
enigma2-0963917d08aed832a12fd91148daa1649b4971d5.zip
Merge branch 'master' of git.opendreambox.org:/git/enigma2
Diffstat (limited to 'lib')
-rw-r--r--lib/service/servicemp3.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
index 149a1906..7d5901e2 100644
--- a/lib/service/servicemp3.cpp
+++ b/lib/service/servicemp3.cpp
@@ -497,6 +497,8 @@ RESULT eServiceMP3::seekTo(pts_t to)
if (!m_gst_playbin)
return -1;
+ eSingleLocker l(m_subs_to_pull_lock); // this is needed to dont handle incomming subtitles during seek!
+
/* convert pts to nanoseconds */
gint64 time_nanoseconds = to * 11111LL;
if (!gst_element_seek (m_gst_playbin, 1.0, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH,
@@ -508,7 +510,6 @@ RESULT eServiceMP3::seekTo(pts_t to)
}
m_subtitle_pages.clear();
- eSingleLocker l(m_subs_to_pull_lock);
m_subs_to_pull = 0;
return 0;