[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [Phonon/4.4] 8c881c5: Apply version checking to DVD menu support
From: Harald Sitter <sitter.harald () gmail ! com>
Date: 2011-01-01 17:34:56
Message-ID: 20110101173456.8F87DA6092 () git ! kde ! org
[Download RAW message or body]
commit 8c881c503ac8df8a8f73b96f91738a853a9dd441
branch 4.4
Author: Harald Sitter <sitter.harald@gmail.com>
Date: Sun Nov 28 23:03:02 2010 +0100
Apply version checking to DVD menu support parts that were only added in GStreamer 0.10.23
BUG: 258222
diff --git a/gstreamer/mediaobject.cpp b/gstreamer/mediaobject.cpp
index 427f299..3d8059d 100644
--- a/gstreamer/mediaobject.cpp
+++ b/gstreamer/mediaobject.cpp
@@ -546,7 +546,7 @@ void MediaObject::createPipeline()
g_object_set(G_OBJECT(m_videoPipe), "max-size-time", MAX_QUEUE_TIME, (const char*)NULL);
if(!tegraEnv.isEmpty())
{
- g_object_set(G_OBJECT(m_videoPipe), "max-size-time", 33000, (const char*)NULL);
+ g_object_set(G_OBJECT(m_videoPipe), "max-size-time", 33000, (const char*)NULL);
g_object_set(G_OBJECT(m_audioPipe), "max-size-buffers", 1 , (const char*)NULL);
g_object_set(G_OBJECT(m_audioPipe), "max-size-bytes", 0 , (const char*)NULL);
}
@@ -1575,6 +1575,7 @@ void MediaObject::handleBusMessage(const Message &message)
break;
}
+#if GST_VERSION >= GST_VERSION_CHECK(0,10,23,0)
switch (gst_navigation_message_get_type(gstMessage)) {
case GST_NAVIGATION_MESSAGE_MOUSE_OVER: {
gboolean active;
@@ -1588,7 +1589,7 @@ void MediaObject::handleBusMessage(const Message &message)
default:
break;
}
-
+#endif // GST_VERSION
}
void MediaObject::handleEndOfStream()
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic