diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2009-11-05 11:37:29 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2009-11-05 11:37:29 +0100 |
| commit | b643641e2c6288eff61d0346a3dda82bd820b3b7 (patch) | |
| tree | d29fc06215b58721a020da7d49b0da7709cbd586 /lib/service | |
| parent | aaeba87c8ee1b528dc9660dab9c6980155e878d4 (diff) | |
| download | enigma2-b643641e2c6288eff61d0346a3dda82bd820b3b7.tar.gz enigma2-b643641e2c6288eff61d0346a3dda82bd820b3b7.zip | |
disable fast winding for non TS mediafiles until we have a usable solution for this..
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, 27 insertions, 3 deletions
diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp index 1a28fbdd..ddc675e6 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; + return m_is_pvr || m_timeshift_active ? 3 : 0; // fast forward/backward possible and seeking possible } RESULT eDVBServicePlay::frontendInfo(ePtr<iFrontendInformation> &ptr) diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp index 34d09363..e684e393 100644 --- a/lib/service/servicemp3.cpp +++ b/lib/service/servicemp3.cpp @@ -635,7 +635,31 @@ RESULT eServiceMP3::setTrickmode(int trick) RESULT eServiceMP3::isCurrentlySeekable() { - return 1; + 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; } RESULT eServiceMP3::info(ePtr<iServiceInformation>&i) diff --git a/lib/service/servicexine.cpp b/lib/service/servicexine.cpp index 44e6a6e0..6b9adfb9 100644 --- a/lib/service/servicexine.cpp +++ b/lib/service/servicexine.cpp @@ -315,7 +315,7 @@ RESULT eServiceXine::setTrickmode(int trick) RESULT eServiceXine::isCurrentlySeekable() { - return 1; + return 3; } RESULT eServiceXine::info(ePtr<iServiceInformation>&i) |
