Title: [120975] trunk/Source/WebCore
- Revision
- 120975
- Author
- [email protected]
- Date
- 2012-06-21 15:56:56 -0700 (Thu, 21 Jun 2012)
Log Message
[GStreamer] Use setGstElementClassMetadata.
Rubber/stamped by Martin Robinson.
This function was introduced in r120790 but I forgot to actually
use it in that patch.
* platform/graphics/gstreamer/VideoSinkGStreamer.cpp:
(webkit_video_sink_class_init):
* platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (120974 => 120975)
--- trunk/Source/WebCore/ChangeLog 2012-06-21 22:55:42 UTC (rev 120974)
+++ trunk/Source/WebCore/ChangeLog 2012-06-21 22:56:56 UTC (rev 120975)
@@ -1,3 +1,16 @@
+2012-06-21 Philippe Normand <[email protected]>
+
+ [GStreamer] Use setGstElementClassMetadata.
+
+ Rubber/stamped by Martin Robinson.
+
+ This function was introduced in r120790 but I forgot to actually
+ use it in that patch.
+
+ * platform/graphics/gstreamer/VideoSinkGStreamer.cpp:
+ (webkit_video_sink_class_init):
+ * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+
2012-06-21 Erik Arvidsson <[email protected]>
[V8] Use v8::V8::AddImplicitReferences instead of SetHiddenValue
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp (120974 => 120975)
--- trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp 2012-06-21 22:55:42 UTC (rev 120974)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp 2012-06-21 22:56:56 UTC (rev 120975)
@@ -391,14 +391,7 @@
GstElementClass* elementClass = GST_ELEMENT_CLASS(klass);
gst_element_class_add_pad_template(elementClass, gst_static_pad_template_get(&s_sinkTemplate));
-#ifdef GST_API_VERSION_1
- gst_element_class_set_metadata(elementClass,
-#else
- gst_element_class_set_details_simple(elementClass,
-#endif
- "WebKit video sink",
- "Sink/Video", "Sends video data from a GStreamer pipeline to a Cairo surface",
- "Alp Toker <[email protected]>");
+ setGstElementClassMetadata(elementClass, "WebKit video sink", "Sink/Video", "Sends video data from a GStreamer pipeline to a Cairo surface", "Alp Toker <[email protected]>");
g_type_class_add_private(klass, sizeof(WebKitVideoSinkPrivate));
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (120974 => 120975)
--- trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2012-06-21 22:55:42 UTC (rev 120974)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2012-06-21 22:56:56 UTC (rev 120975)
@@ -24,6 +24,7 @@
#include "Document.h"
#include "Frame.h"
#include "GRefPtrGStreamer.h"
+#include "GStreamerVersioning.h"
#include "MediaPlayer.h"
#include "NetworkingContext.h"
#include "NotImplemented.h"
@@ -155,15 +156,8 @@
gst_element_class_add_pad_template(eklass,
gst_static_pad_template_get(&srcTemplate));
-#ifdef GST_API_VERSION_1
- gst_element_class_set_metadata(eklass,
-#else
- gst_element_class_set_details_simple(eklass,
-#endif
- (gchar*) "WebKit Web source element",
- (gchar*) "Source",
- (gchar*) "Handles HTTP/HTTPS uris",
- (gchar*) "Sebastian Dröge <[email protected]>");
+ setGstElementClassMetadata(eklass, "WebKit Web source element", "Source", "Handles HTTP/HTTPS uris",
+ "Sebastian Dröge <[email protected]>");
// icecast stuff
g_object_class_install_property(oklass,
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
