[gstreamermm: 10/167] renamed baseaudio to audiobase



commit e0a219880cd96ba20f573388950f7ef832af1b4f
Author: Marcin Kolny at Flytronic <marcin kolny flytronic pl>
Date:   Wed Jul 24 12:28:05 2013 +0200

    renamed baseaudio to audiobase

 gstreamer/gstreamermm.h                            |    6 +++---
 gstreamer/src/audiobasesrc.hg                      |    1 +
 gstreamer/src/audiosink.ccg                        |    4 ++--
 gstreamer/src/audiosink.hg                         |   10 +++++-----
 .../extra_defs_gen/generate_plugin_gmmproc_file.cc |    4 ++--
 5 files changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/gstreamer/gstreamermm.h b/gstreamer/gstreamermm.h
index df6366f..5ab1923 100644
--- a/gstreamer/gstreamermm.h
+++ b/gstreamer/gstreamermm.h
@@ -116,12 +116,12 @@
 #include <gstreamermm/audiofilter.h>
 #include <gstreamermm/audiosink.h>
 #include <gstreamermm/audiosrc.h>
-#include <gstreamermm/baseaudiosink.h>
-#include <gstreamermm/baseaudiosrc.h>
+#include <gstreamermm/audiobasesink.h>
+#include <gstreamermm/audiobasesrc.h>
 #include <gstreamermm/cddabasesrc.h>
 #include <gstreamermm/discoverer.h>
 #include <gstreamermm/discovererinfo.h>
-#include <gstreamermm/ringbuffer.h>
+#include <gstreamermm/audioringbuffer.h>
 #include <gstreamermm/videosink.h>
 
 // Base inteface includes
diff --git a/gstreamer/src/audiobasesrc.hg b/gstreamer/src/audiobasesrc.hg
index 8a70d3f..d5bbd71 100644
--- a/gstreamer/src/audiobasesrc.hg
+++ b/gstreamer/src/audiobasesrc.hg
@@ -19,6 +19,7 @@
 
 #include <gst/audio/audio.h>
 #include <gstreamermm/pushsrc.h>
+#include <gstreamermm/audioringbuffer.h>
 _PINCLUDE(gstreamermm/private/pushsrc_p.h)
 
 _DEFS(gstreamermm,gst)
diff --git a/gstreamer/src/audiosink.ccg b/gstreamer/src/audiosink.ccg
index 00ce6b6..50e49f1 100644
--- a/gstreamer/src/audiosink.ccg
+++ b/gstreamer/src/audiosink.ccg
@@ -18,12 +18,12 @@
  */
 
 #include <gst/audio/gstaudiosink.h>
-_PINCLUDE(gstreamermm/private/baseaudiosink_p.h)
+_PINCLUDE(gstreamermm/private/audiobasesink_p.h)
 
 namespace Gst
 {
 
-gboolean AudioSink_Class::prepare_vfunc_callback(GstAudioSink* self, GstRingBufferSpec* spec)
+gboolean AudioSink_Class::prepare_vfunc_callback(GstAudioSink* self, GstAudioRingBufferSpec* spec)
 {
   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 6718b7c..03b76fb 100644
--- a/gstreamer/src/audiosink.hg
+++ b/gstreamer/src/audiosink.hg
@@ -17,9 +17,9 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <gstreamermm/audioringbuffer.h>
 #include <gst/audio/gstaudiosink.h>
-#include <gstreamermm/baseaudiosink.h>
-#include <gstreamermm/ringbuffer.h>
+#include <gstreamermm/audiobasesink.h>
 
 _DEFS(gstreamermm,gst)
 
@@ -47,9 +47,9 @@ namespace Gst
  *
  * @ingroup GstBaseClasses
  */
-class AudioSink : public Gst::BaseAudioSink
+class AudioSink : public Gst::AudioBaseSink
 {
-  _CLASS_GOBJECT(AudioSink, GstAudioSink, GST_AUDIO_SINK, Gst::BaseAudioSink, GstBaseAudioSink)
+  _CLASS_GOBJECT(AudioSink, GstAudioSink, GST_AUDIO_SINK, Gst::AudioBaseSink, GstAudioBaseSink)
 
 public:
   /** vfunc to open the device. No configuration needs to be done at this
@@ -59,7 +59,7 @@ public:
 
   /** vfunc to prepare the device to operate with the specified parameters.
    */
-  virtual bool prepare_vfunc(Gst::RingBufferSpec& spec);
+  virtual bool prepare_vfunc(Gst::AudioRingBufferSpec& spec);
 
   /** vfunc to undo operations done in prepare.
    */
diff --git a/tools/extra_defs_gen/generate_plugin_gmmproc_file.cc 
b/tools/extra_defs_gen/generate_plugin_gmmproc_file.cc
index ad9068e..550c488 100644
--- a/tools/extra_defs_gen/generate_plugin_gmmproc_file.cc
+++ b/tools/extra_defs_gen/generate_plugin_gmmproc_file.cc
@@ -46,7 +46,7 @@ static const char *const wrappedBaseClasses[] =
   "GstAudioFilter",
   "GstAudioSink",
   "GstAudioSrc",
-  "GstBaseAudioSink",
+  "GstAudioBaseSink",
   "GstBaseAudioSrc",
   "GstBaseSink",
   "GstBaseSrc",
@@ -904,7 +904,7 @@ int main(int argc, char** argv)
       cppParentTypeName.compare("AudioFilter") == 0 ||
       cppParentTypeName.compare("AudioSink") == 0 ||
       cppParentTypeName.compare("AudioSrc") == 0 ||
-      cppParentTypeName.compare("BaseAudioSink") == 0 ||
+      cppParentTypeName.compare("AudioBaseSink") == 0 ||
       cppParentTypeName.compare("BaseAudioSrc") == 0 ||
       cppParentTypeName.compare("BaseSink") == 0 ||
       cppParentTypeName.compare("BaseSrc") == 0 ||


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]