MediaPlayer: MediaPlayerPrivate registration cleanup
authorphiln@webkit.org <philn@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 20 Feb 2012 08:37:23 +0000 (08:37 +0000)
committerphiln@webkit.org <philn@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 20 Feb 2012 08:37:23 +0000 (08:37 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@108215 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/MediaPlayer.cpp

index 6df82b7..c09f0d3 100644 (file)
@@ -1,3 +1,15 @@
+2012-02-20  Philippe Normand  <pnormand@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  <yurys@chromium.org>
 
         [Chromium] Web Inspector: terminated workers are not removed from dedicated worker list
index 54d7d75..985e27c 100644 (file)
@@ -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 @@ static Vector<MediaPlayerFactory*>& installedMediaEngines()
     if (!enginesQueried) {
         enginesQueried = true;
 
-#if USE(GSTREAMER)
-        MediaPlayerPrivateGStreamer::registerMediaEngine(addMediaEngine);
-#endif
-
 #if USE(AVFOUNDATION)
         if (Settings::isAVFoundationEnabled()) {
 #if PLATFORM(MAC)
@@ -207,7 +204,7 @@ static Vector<MediaPlayerFactory*>& installedMediaEngines()
         }
 #endif
 
-#if !PLATFORM(GTK) && !PLATFORM(EFL) && !(PLATFORM(QT) && USE(GSTREAMER))
+#if defined(PlatformMediaEngineClassName)
         PlatformMediaEngineClassName::registerMediaEngine(addMediaEngine);
 #endif
     }