Merge branch 'bug_262_no_more_ask_50hz' into experimental

[enigma2.git] / lib / service / servicemp3.cpp

diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
index d3eaa262874ec7cf6144e9c3ef82a66b49b88875..c0ae42fdc41d02029ae6e4a04b4cc5fa6ce69ca9 100644 (file)
--- a/lib/service/servicemp3.cpp
+++ b/lib/service/servicemp3.cpp
@@ -46,6 +46,7 @@ eServiceFactoryMP3::eServiceFactoryMP3()
                extensions.push_back("mp4");
                extensions.push_back("mov");
                extensions.push_back("m4a");
                extensions.push_back("mp4");
                extensions.push_back("mov");
                extensions.push_back("m4a");

+               extensions.push_back("m2ts");

                sc->addServiceFactory(eServiceFactoryMP3::id, this, extensions);
        }
 
                sc->addServiceFactory(eServiceFactoryMP3::id, this, extensions);
        }
 


@@ -640,7 +641,31 @@ RESULT eServiceMP3::setTrickmode(int trick)
 
 RESULT eServiceMP3::isCurrentlySeekable()
 {
 
 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)
 }
 
 RESULT eServiceMP3::info(ePtr<iServiceInformation>&i)