[gstreamermm: 13/167] some minor fixes in build (includes, types)

[Murray Cumming <murrayc src gnome org>]

commit f1d3b98a50c5b8f199e3eacbb263261bf60872be
Author: Marcin Kolny at Flytronic <marcin kolny flytronic pl>
Date:   Wed Jul 24 12:39:04 2013 +0200

    some minor fixes in build (includes, types)

 gstreamer/src/audiosink.ccg |    2 +-
 gstreamer/src/audiosink.hg  |    2 +-
 gstreamer/src/audiosrc.ccg  |    2 +-
 gstreamer/src/audiosrc.hg   |    4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/gstreamer/src/audiosink.ccg b/gstreamer/src/audiosink.ccg
index 3d16086..924060d 100644
--- a/gstreamer/src/audiosink.ccg
+++ b/gstreamer/src/audiosink.ccg
@@ -76,7 +76,7 @@ bool Gst::AudioSink::prepare_vfunc(Gst::AudioRingBufferSpec& spec)
   typedef bool RType;
   return RType();
 }
-guint AudioSink_Class::write_vfunc_callback(GstAudioSink* self, gpointer data, guint length)
+gint AudioSink_Class::write_vfunc_callback(GstAudioSink* self, gpointer data, guint length)
 {
   Glib::ObjectBase *const obj_base = static_cast<Glib::ObjectBase*>(
       Glib::ObjectBase::_get_current_wrapper((GObject*)self));
diff --git a/gstreamer/src/audiosink.hg b/gstreamer/src/audiosink.hg
index 6dcf1d7..4c8a7e9 100644
--- a/gstreamer/src/audiosink.hg
+++ b/gstreamer/src/audiosink.hg
@@ -90,7 +90,7 @@ protected:
   klass->write = &write_vfunc_callback;
   _SECTION(SECTION_PH_VFUNCS)
   static gboolean prepare_vfunc_callback(GstAudioSink* self, GstAudioRingBufferSpec* spec);
-  static guint write_vfunc_callback(GstAudioSink* self, gpointer data, guint length);
+  static gint write_vfunc_callback(GstAudioSink* self, gpointer data, guint length);
   _POP()
 #m4end
 };
diff --git a/gstreamer/src/audiosrc.ccg b/gstreamer/src/audiosrc.ccg
index 00f5750..9d04530 100644
--- a/gstreamer/src/audiosrc.ccg
+++ b/gstreamer/src/audiosrc.ccg
@@ -18,7 +18,7 @@
  */
 
 #include <gst/audio/gstaudiosrc.h>
-_PINCLUDE(gstreamermm/private/baseaudiosrc_p.h)
+_PINCLUDE(gstreamermm/private/audiobasesrc_p.h)
 
 namespace Gst
 {
diff --git a/gstreamer/src/audiosrc.hg b/gstreamer/src/audiosrc.hg
index b3c9f29..717b283 100644
--- a/gstreamer/src/audiosrc.hg
+++ b/gstreamer/src/audiosrc.hg
@@ -18,8 +18,8 @@
  */
  
 #include <gst/audio/gstaudiosrc.h>
-#include <gstreamermm/baseaudiosrc.h>
-#include <gstreamermm/ringbuffer.h>
+#include <gstreamermm/audiobasesrc.h>
+#include <gstreamermm/audioringbuffer.h>
 
 _DEFS(gstreamermm,gst)