Title: [108215] trunk/Source/WebCore
Revision
108215
Author
ph...@webkit.org
Date
2012-02-20 00:37:23 -0800 (Mon, 20 Feb 2012)

Log Message

MediaPlayer: MediaPlayerPrivate registration cleanup
https://bugs.webkit.org/show_bug.cgi?id=78897

Reviewed by Martin Robinson.

* platform/graphics/MediaPlayer.cpp:
(WebCore::installedMediaEngines): Simplified GStreamer Private
player registration by using the PlatformMediaEngineClassName
macro like other players do.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (108214 => 108215)


--- trunk/Source/WebCore/ChangeLog	2012-02-20 08:34:54 UTC (rev 108214)
+++ trunk/Source/WebCore/ChangeLog	2012-02-20 08:37:23 UTC (rev 108215)
@@ -1,3 +1,15 @@
+2012-02-20  Philippe Normand  <pnorm...@igalia.com>
+
+        MediaPlayer: MediaPlayerPrivate registration cleanup
+        https://bugs.webkit.org/show_bug.cgi?id=78897
+
+        Reviewed by Martin Robinson.
+
+        * platform/graphics/MediaPlayer.cpp:
+        (WebCore::installedMediaEngines): Simplified GStreamer Private
+        player registration by using the PlatformMediaEngineClassName
+        macro like other players do.
+
 2012-02-17  Yury Semikhatsky  <yu...@chromium.org>
 
         [Chromium] Web Inspector: terminated workers are not removed from dedicated worker list

Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (108214 => 108215)


--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp	2012-02-20 08:34:54 UTC (rev 108214)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp	2012-02-20 08:37:23 UTC (rev 108215)
@@ -46,6 +46,7 @@
 
 #if USE(GSTREAMER)
 #include "MediaPlayerPrivateGStreamer.h"
+#define PlatformMediaEngineClassName MediaPlayerPrivateGStreamer
 #endif
 
 #if PLATFORM(MAC) || (PLATFORM(QT) && USE(QTKIT))
@@ -193,10 +194,6 @@
     if (!enginesQueried) {
         enginesQueried = true;
 
-#if USE(GSTREAMER)
-        MediaPlayerPrivateGStreamer::registerMediaEngine(addMediaEngine);
-#endif
-
 #if USE(AVFOUNDATION)
         if (Settings::isAVFoundationEnabled()) {
 #if PLATFORM(MAC)
@@ -207,7 +204,7 @@
         }
 #endif
 
-#if !PLATFORM(GTK) && !PLATFORM(EFL) && !(PLATFORM(QT) && USE(GSTREAMER))
+#if defined(PlatformMediaEngineClassName)
         PlatformMediaEngineClassName::registerMediaEngine(addMediaEngine);
 #endif
     }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to