--- a/gstreamer_core/libs/gst/controller/gstcontrolsource.c	Wed Mar 31 22:03:18 2010 +0300
+++ b/gstreamer_core/libs/gst/controller/gstcontrolsource.c	Tue Aug 31 15:30:33 2010 +0300
@@ -44,7 +44,7 @@
 #include <glib-object.h>
 #include <gst/gst.h>
 
-#include "gstcontrolsource.h"
+#include "gst/controller/gstcontrolsource.h"
 
 #define GST_CAT_DEFAULT controller_debug
 GST_DEBUG_CATEGORY_EXTERN (GST_CAT_DEFAULT);
@@ -96,7 +96,7 @@
 {
   g_return_val_if_fail (GST_IS_CONTROL_SOURCE (self), FALSE);
 
-  if (self->get_value) {
+  if (G_LIKELY (self->get_value)) {
     return self->get_value (self, timestamp, value);
   } else {
     GST_ERROR ("Not bound to a specific property yet!");
@@ -130,7 +130,7 @@
 {
   g_return_val_if_fail (GST_IS_CONTROL_SOURCE (self), FALSE);
 
-  if (self->get_value_array) {
+  if (G_LIKELY (self->get_value_array)) {
     return self->get_value_array (self, timestamp, value_array);
   } else {
     GST_ERROR ("Not bound to a specific property yet!");