diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2009-11-06 11:44:06 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2009-11-06 11:44:06 +0100 |
| commit | 37e3c1814cc8ea6ef4eaef9a4bbc5d757d98972f (patch) | |
| tree | 913f60dc751cd28d2c4b5146b17ffbb8b856fe8d /lib/service | |
| parent | e66d0ee5f86946cf2d0c3dc5a0ea369917e0cfd3 (diff) | |
| download | enigma2-37e3c1814cc8ea6ef4eaef9a4bbc5d757d98972f.tar.gz enigma2-37e3c1814cc8ea6ef4eaef9a4bbc5d757d98972f.zip | |
Revert "disable fast winding for non TS mediafiles until we have a usable solution for this.."
This reverts commit b643641e2c6288eff61d0346a3dda82bd820b3b7.
Diffstat (limited to 'lib/service')
| -rw-r--r-- | lib/service/servicedvb.cpp | 2 | ||||
| -rw-r--r-- | lib/service/servicemp3.cpp | 26 | ||||
| -rw-r--r-- | lib/service/servicexine.cpp | 2 |
3 files changed, 3 insertions, 27 deletions
diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp index ddc675e6..1a28fbdd 100644 --- a/lib/service/servicedvb.cpp +++ b/lib/service/servicedvb.cpp @@ -1370,7 +1370,7 @@ RESULT eDVBServicePlay::setTrickmode(int trick) RESULT eDVBServicePlay::isCurrentlySeekable() { - return m_is_pvr || m_timeshift_active ? 3 : 0; // fast forward/backward possible and seeking possible + return m_is_pvr || m_timeshift_active; } RESULT eDVBServicePlay::frontendInfo(ePtr<iFrontendInformation> &ptr) diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp index 52f2bc99..c95609a3 100644 --- a/lib/service/servicemp3.cpp +++ b/lib/service/servicemp3.cpp @@ -641,31 +641,7 @@ RESULT eServiceMP3::setTrickmode(int trick) RESULT eServiceMP3::isCurrentlySeekable() { - int ret = 3; // seeking and fast/slow winding possible - GstElement *sink; - - if (!m_gst_playbin) - return 0; - if (m_state != stRunning) - return 0; - - g_object_get (G_OBJECT (m_gst_playbin), "video-sink", &sink, NULL); - - // disable fast winding yet when a dvbvideosink or dvbaudiosink is used - // for this we must do some changes on different places.. (gstreamer.. our sinks.. enigma2) - if (sink) { - ret &= ~2; // only seeking possible - gst_object_unref(sink); - } - else { - g_object_get (G_OBJECT (m_gst_playbin), "audio-sink", &sink, NULL); - if (sink) { - ret &= ~2; // only seeking possible - gst_object_unref(sink); - } - } - - return ret; + return 1; } RESULT eServiceMP3::info(ePtr<iServiceInformation>&i) diff --git a/lib/service/servicexine.cpp b/lib/service/servicexine.cpp index 6b9adfb9..44e6a6e0 100644 --- a/lib/service/servicexine.cpp +++ b/lib/service/servicexine.cpp @@ -315,7 +315,7 @@ RESULT eServiceXine::setTrickmode(int trick) RESULT eServiceXine::isCurrentlySeekable() { - return 3; + return 1; } RESULT eServiceXine::info(ePtr<iServiceInformation>&i) |
