diff options
author | Tristan Matthews <tristan@sat.qc.ca> | 2008-08-07 08:47:40 +0000 |
---|---|---|
committer | Stefan Kost <ensonic@users.sourceforge.net> | 2008-08-07 08:47:40 +0000 |
commit | 3fcdc01db8d9bfe33b05629a11262a40dfcb410d (patch) | |
tree | 83199e89a7373f3918b8e46e5c8f3bb08b809557 /ext/jack/gstjackaudiosink.c | |
parent | 020d3ca531e152c3986b00474b851cbc216c806f (diff) | |
download | gst-plugins-bad-3fcdc01db8d9bfe33b05629a11262a40dfcb410d.tar.gz gst-plugins-bad-3fcdc01db8d9bfe33b05629a11262a40dfcb410d.tar.bz2 gst-plugins-bad-3fcdc01db8d9bfe33b05629a11262a40dfcb410d.zip |
ext/jack/: Add a jackaudiosrc. Refactor sink slightly for better code reuse.
Original commit message from CVS:
patch by: Tristan Matthews <tristan@sat.qc.ca>
* ext/jack/Makefile.am:
* ext/jack/gstjack.c:
* ext/jack/gstjackaudioclient.c:
* ext/jack/gstjackaudiosink.c:
* ext/jack/gstjackaudiosink.h:
* ext/jack/gstjackaudiosrc.c:
* ext/jack/gstjackaudiosrc.h:
* ext/jack/gstjackringbuffer.h:
Add a jackaudiosrc. Refactor sink slightly for better code reuse.
Fixes #545197.
Diffstat (limited to 'ext/jack/gstjackaudiosink.c')
-rw-r--r-- | ext/jack/gstjackaudiosink.c | 72 |
1 files changed, 1 insertions, 71 deletions
diff --git a/ext/jack/gstjackaudiosink.c b/ext/jack/gstjackaudiosink.c index 05571b2c..ec257deb 100644 --- a/ext/jack/gstjackaudiosink.c +++ b/ext/jack/gstjackaudiosink.c @@ -59,62 +59,11 @@ #include <string.h> #include "gstjackaudiosink.h" +#include "gstjackringbuffer.h" GST_DEBUG_CATEGORY_STATIC (gst_jack_audio_sink_debug); #define GST_CAT_DEFAULT gst_jack_audio_sink_debug -typedef jack_default_audio_sample_t sample_t; - -#define GST_TYPE_JACK_RING_BUFFER \ - (gst_jack_ring_buffer_get_type()) -#define GST_JACK_RING_BUFFER(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_JACK_RING_BUFFER,GstJackRingBuffer)) -#define GST_JACK_RING_BUFFER_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_JACK_RING_BUFFER,GstJackRingBufferClass)) -#define GST_JACK_RING_BUFFER_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_JACK_RING_BUFFER, GstJackRingBufferClass)) -#define GST_JACK_RING_BUFFER_CAST(obj) \ - ((GstJackRingBuffer *)obj) -#define GST_IS_JACK_RING_BUFFER(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_JACK_RING_BUFFER)) -#define GST_IS_JACK_RING_BUFFER_CLASS(klass)\ - (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_JACK_RING_BUFFER)) - -typedef struct _GstJackRingBuffer GstJackRingBuffer; -typedef struct _GstJackRingBufferClass GstJackRingBufferClass; - -struct _GstJackRingBuffer -{ - GstRingBuffer object; - - gint sample_rate; - gint buffer_size; - gint channels; -}; - -struct _GstJackRingBufferClass -{ - GstRingBufferClass parent_class; -}; - -static void gst_jack_ring_buffer_class_init (GstJackRingBufferClass * klass); -static void gst_jack_ring_buffer_init (GstJackRingBuffer * ringbuffer, - GstJackRingBufferClass * klass); -static void gst_jack_ring_buffer_dispose (GObject * object); -static void gst_jack_ring_buffer_finalize (GObject * object); - -static GstRingBufferClass *ring_parent_class = NULL; - -static gboolean gst_jack_ring_buffer_open_device (GstRingBuffer * buf); -static gboolean gst_jack_ring_buffer_close_device (GstRingBuffer * buf); -static gboolean gst_jack_ring_buffer_acquire (GstRingBuffer * buf, - GstRingBufferSpec * spec); -static gboolean gst_jack_ring_buffer_release (GstRingBuffer * buf); -static gboolean gst_jack_ring_buffer_start (GstRingBuffer * buf); -static gboolean gst_jack_ring_buffer_pause (GstRingBuffer * buf); -static gboolean gst_jack_ring_buffer_stop (GstRingBuffer * buf); -static guint gst_jack_ring_buffer_delay (GstRingBuffer * buf); - static gboolean gst_jack_audio_sink_allocate_channels (GstJackAudioSink * sink, gint channels) { @@ -689,25 +638,6 @@ enum PROP_LAST }; -#define GST_TYPE_JACK_CONNECT (gst_jack_connect_get_type()) -static GType -gst_jack_connect_get_type (void) -{ - static GType jack_connect_type = 0; - static const GEnumValue jack_connect[] = { - {GST_JACK_CONNECT_NONE, - "Don't automatically connect ports to physical ports", "none"}, - {GST_JACK_CONNECT_AUTO, - "Automatically connect ports to physical ports", "auto"}, - {0, NULL, NULL}, - }; - - if (!jack_connect_type) { - jack_connect_type = g_enum_register_static ("GstJackConnect", jack_connect); - } - return jack_connect_type; -} - #define _do_init(bla) \ GST_DEBUG_CATEGORY_INIT (gst_jack_audio_sink_debug, "jacksink", 0, "jacksink element"); |