Changeset 52727 in webkit

Timestamp:

Jan 4, 2010 3:04:46 AM (14 years ago)

Author:

Philippe Normand

Message:

2009-12-22 Philippe Normand <​pnormand@igalia.com>

Reviewed by Eric Seidel.

[GTK] G_OBJECT() cast is not necessary for signals connection and properties access
​https://bugs.webkit.org/show_bug.cgi?id=32661

Reverted the SENTINEL / NULL crap :) Hopefully the style-bot won't
complain about NULL usage in g_object_{get,set} anymore.

• platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp: (WebCore::MediaPlayerPrivate::hasVideo): (WebCore::MediaPlayerPrivate::hasAudio): (WebCore::MediaPlayerPrivate::setVolume): (WebCore::MediaPlayerPrivate::setRate): (WebCore::MediaPlayerPrivate::updateStates): (WebCore::MediaPlayerPrivate::createGSTPlayBin):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp (modified) (8 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-22  Philippe Normand  <pnormand@igalia.com>
+
+        Reviewed by Eric Seidel.
+
+        [GTK] G_OBJECT() cast is not necessary for signals connection and properties access
+        https://bugs.webkit.org/show_bug.cgi?id=32661
+
+        Reverted the SENTINEL / NULL crap :) Hopefully the style-bot won't
+        complain about NULL usage in g_object_{get,set} anymore.
+
+        * platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivate::hasVideo):
+        (WebCore::MediaPlayerPrivate::hasAudio):
+        (WebCore::MediaPlayerPrivate::setVolume):
+        (WebCore::MediaPlayerPrivate::setRate):
+        (WebCore::MediaPlayerPrivate::updateStates):
+        (WebCore::MediaPlayerPrivate::createGSTPlayBin):
+
 2010-01-04  Alex Milowski  <alex@milowski.com>
 

trunk/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp

@@ -48 +48 @@
 #include <math.h>
 #include <wtf/gtk/GOwnPtr.h>
-
-#define SENTINEL (void*) 0
 
 using namespace std;
@@ -415 +413 @@
     gint currentVideo = -1;
     if (m_playBin)
-        g_object_get(m_playBin, "current-video", &currentVideo, SENTINEL);
+        g_object_get(m_playBin, "current-video", &currentVideo, NULL);
     return currentVideo > -1;
 }
@@ -423 +421 @@
     gint currentAudio = -1;
     if (m_playBin)
-        g_object_get(m_playBin, "current-audio", &currentAudio, SENTINEL);
+        g_object_get(m_playBin, "current-audio", &currentAudio, NULL);
     return currentAudio > -1;
 }
@@ -432 +430 @@
         return;
 
-    g_object_set(m_playBin, "volume", static_cast<double>(volume), SENTINEL);
+    g_object_set(m_playBin, "volume", static_cast<double>(volume), NULL);
 }
 
@@ -490 +488 @@
         LOG_VERBOSE(Media, "Set rate to %f failed", rate);
     else
-        g_object_set(m_playBin, "mute", mute, SENTINEL);
+        g_object_set(m_playBin, "mute", mute, NULL);
 }
 
@@ -637 +635 @@
         m_networkState = MediaPlayer::Loaded;
 
-        g_object_get(m_playBin, "source", &m_source, SENTINEL);
+        g_object_get(m_playBin, "source", &m_source, NULL);
         if (!m_source)
             LOG_VERBOSE(Media, "m_source is 0");
@@ -928 +926 @@
     gst_object_unref(bus);
 
-    g_object_set(m_playBin, "uri", url.utf8().data(), SENTINEL);
+    g_object_set(m_playBin, "uri", url.utf8().data(), NULL);
 
     g_signal_connect(m_playBin, "notify::volume", G_CALLBACK(mediaPlayerPrivateVolumeChangedCallback), this);
@@ -940 +938 @@
         m_fpsSink = gst_element_factory_make("fpsdisplaysink", "sink");
         if (g_object_class_find_property(G_OBJECT_GET_CLASS(m_fpsSink), "video-sink")) {
-            g_object_set(m_fpsSink, "video-sink", m_videoSink, SENTINEL);
+            g_object_set(m_fpsSink, "video-sink", m_videoSink, NULL);
             g_object_ref_sink(m_fpsSink);
-            g_object_set(m_playBin, "video-sink", m_fpsSink, SENTINEL);
+            g_object_set(m_playBin, "video-sink", m_fpsSink, NULL);
         } else {
             m_fpsSink = 0;
-            g_object_set(m_playBin, "video-sink", m_videoSink, SENTINEL);
+            g_object_set(m_playBin, "video-sink", m_videoSink, NULL);
             LOG(Media, "Can't display FPS statistics, you need gst-plugins-bad >= 0.10.18");
         }
     } else
-        g_object_set(m_playBin, "video-sink", m_videoSink, SENTINEL);
+        g_object_set(m_playBin, "video-sink", m_videoSink, NULL);
 
     g_signal_connect(m_videoSink, "repaint-requested", G_CALLBACK(mediaPlayerPrivateRepaintCallback), this);