Merge branch 'vuplus_experimental' of code.vuplus.com:/opt/repository/dvbapp into...

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 7c8a660..ec3fdb5
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -1524,7 +1524,7 @@ RESULT eDVBServicePlay::timeshift(ePtr<iTimeshiftService> &ptr)
 {
        ptr = 0;
        if (m_have_video_pid &&  // HACK !!! FIXMEE !! temporary no timeshift on radio services !!
-               (m_timeshift_enabled || !m_is_pvr))
+               (m_timeshift_enabled || (!m_is_pvr&&!m_is_stream)))
        {
                if (!m_timeshift_enabled)
                {

diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 0b85775..0aaaaaa
--- a/lib/service/servicemp3.cpp
+++ b/lib/service/servicemp3.cpp
@@ -696,8 +696,6 @@ RESULT eServiceMP3::isCurrentlySeekable()
                return 0;
        if (m_state != stRunning)
                return 0;
-       if (m_sourceinfo.is_streaming)
-               return 0;
 
        g_object_get (G_OBJECT (m_gst_playbin), "video-sink", &sink, NULL);