[gstreamermm] Gst::AudioSrc: minor changes in interface
- From: Marcin Kolny <mkolny src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gstreamermm] Gst::AudioSrc: minor changes in interface
- Date: Sat, 23 Apr 2016 18:27:09 +0000 (UTC)
commit 1ee1b9a25e7ddd25c4ffdb82017068d6fe4979cd
Author: Marcin Kolny <marcin kolny gmail com>
Date: Sat Apr 23 20:20:42 2016 +0200
Gst::AudioSrc: minor changes in interface
* gstreamer/src/audiosrc.{ccg|hg}: update read() vfunc interface.
gstreamer/src/audiosrc.ccg | 12 ++++++------
gstreamer/src/audiosrc.hg | 8 ++++----
2 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/gstreamer/src/audiosrc.ccg b/gstreamer/src/audiosrc.ccg
index 0524491..942055b 100644
--- a/gstreamer/src/audiosrc.ccg
+++ b/gstreamer/src/audiosrc.ccg
@@ -1,6 +1,6 @@
/* gstreamermm - a C++ wrapper for gstreamer
*
- * Copyright 2008 The gstreamermm Development Team
+ * Copyright 2008-2016 The gstreamermm Development Team
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -51,7 +51,7 @@ gboolean AudioSrc_Class::prepare_vfunc_callback(GstAudioSrc* self, GstAudioRingB
}
}
}
-
+
BaseClassType *const base = static_cast<BaseClassType*>(
g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The
original underlying C class).
);
@@ -94,7 +94,7 @@ guint AudioSrc_Class::read_vfunc_callback(GstAudioSrc* self, gpointer data, guin
try // Trap C++ exceptions which would normally be lost because this is a C callback.
{
// Call the virtual member method, which derived classes might override.
- return obj->read_vfunc(data, length, timestamp);
+ return obj->read_vfunc(data, length, *timestamp);
}
catch(...)
{
@@ -102,7 +102,7 @@ guint AudioSrc_Class::read_vfunc_callback(GstAudioSrc* self, gpointer data, guin
}
}
}
-
+
BaseClassType *const base = static_cast<BaseClassType*>(
g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The
original underlying C class).
);
@@ -115,14 +115,14 @@ guint AudioSrc_Class::read_vfunc_callback(GstAudioSrc* self, gpointer data, guin
typedef guint RType;
return RType();
}
-guint Gst::AudioSrc::read_vfunc(const void* data, guint length, ClockTime* timestamp)
+guint Gst::AudioSrc::read_vfunc(const void* data, guint length, Gst::ClockTime& timestamp)
{
BaseClassType *const base = static_cast<BaseClassType*>(
g_type_class_peek_parent(G_OBJECT_GET_CLASS(gobject_)) // Get the parent class of the object class
(The original underlying C class).
);
if(base && base->read)
- return (*base->read)(gobj(),const_cast<void*>(data),length, timestamp);
+ return (*base->read)(gobj(),const_cast<void*>(data),length, ×tamp);
typedef guint RType;
return RType();
diff --git a/gstreamer/src/audiosrc.hg b/gstreamer/src/audiosrc.hg
index 11c0698..1f342b7 100644
--- a/gstreamer/src/audiosrc.hg
+++ b/gstreamer/src/audiosrc.hg
@@ -1,6 +1,6 @@
/* gstreamermm - a C++ wrapper for gstreamer
*
- * Copyright 2008 The gstreamermm Development Team
+ * Copyright 2008-2016 The gstreamermm Development Team
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -16,7 +16,7 @@
* License along with this library; if not, write to the Free
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-
+
#include <gstreamermm/audioringbuffer.h>
#include <gst/audio/gstaudiosrc.h>
#include <gstreamermm/audiobasesrc.h>
@@ -43,7 +43,7 @@ namespace Gst
* with Gst::AudioBaseSrc using a default implementation of a
* Gst::AudioRingBuffer that uses threads.
*
- * Last reviewed on 2006-09-27 (0.10.12)
+ * Last reviewed on 2016-04-23 (1.8.0)
*
* @ingroup GstBaseClasses
*/
@@ -70,7 +70,7 @@ public:
/** vfunc to read samples to the audio device.
*/
- virtual guint read_vfunc(const void* data, guint length, ClockTime* timestamp);
+ virtual guint read_vfunc(const void* data, guint length, Gst::ClockTime& timestamp);
/** vfunc to get the number of samples queued in the device.
*/
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]