mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-24 09:10:36 +00:00
jack: fix unused-but-set-variable warnings with gcc-4.6
This commit is contained in:
parent
9b93ae0eae
commit
a068133ee7
2 changed files with 49 additions and 38 deletions
|
@ -155,12 +155,8 @@ gst_jack_ring_buffer_get_type (void)
|
||||||
static void
|
static void
|
||||||
gst_jack_ring_buffer_class_init (GstJackRingBufferClass * klass)
|
gst_jack_ring_buffer_class_init (GstJackRingBufferClass * klass)
|
||||||
{
|
{
|
||||||
GObjectClass *gobject_class;
|
|
||||||
GstObjectClass *gstobject_class;
|
|
||||||
GstRingBufferClass *gstringbuffer_class;
|
GstRingBufferClass *gstringbuffer_class;
|
||||||
|
|
||||||
gobject_class = (GObjectClass *) klass;
|
|
||||||
gstobject_class = (GstObjectClass *) klass;
|
|
||||||
gstringbuffer_class = (GstRingBufferClass *) klass;
|
gstringbuffer_class = (GstRingBufferClass *) klass;
|
||||||
|
|
||||||
ring_parent_class = g_type_class_peek_parent (klass);
|
ring_parent_class = g_type_class_peek_parent (klass);
|
||||||
|
@ -188,14 +184,12 @@ jack_process_cb (jack_nframes_t nframes, void *arg)
|
||||||
{
|
{
|
||||||
GstJackAudioSink *sink;
|
GstJackAudioSink *sink;
|
||||||
GstRingBuffer *buf;
|
GstRingBuffer *buf;
|
||||||
GstJackRingBuffer *abuf;
|
|
||||||
gint readseg, len;
|
gint readseg, len;
|
||||||
guint8 *readptr;
|
guint8 *readptr;
|
||||||
gint i, j, flen, channels;
|
gint i, j, flen, channels;
|
||||||
sample_t **buffers, *data;
|
sample_t **buffers, *data;
|
||||||
|
|
||||||
buf = GST_RING_BUFFER_CAST (arg);
|
buf = GST_RING_BUFFER_CAST (arg);
|
||||||
abuf = GST_JACK_RING_BUFFER_CAST (arg);
|
|
||||||
sink = GST_JACK_AUDIO_SINK (GST_OBJECT_PARENT (buf));
|
sink = GST_JACK_AUDIO_SINK (GST_OBJECT_PARENT (buf));
|
||||||
|
|
||||||
channels = buf->spec.channels;
|
channels = buf->spec.channels;
|
||||||
|
@ -588,37 +582,49 @@ gst_jack_ring_buffer_stop (GstRingBuffer * buf)
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if defined (HAVE_JACK_0_120_1) || defined(HAVE_JACK_1_9_7)
|
||||||
static guint
|
static guint
|
||||||
gst_jack_ring_buffer_delay (GstRingBuffer * buf)
|
gst_jack_ring_buffer_delay (GstRingBuffer * buf)
|
||||||
{
|
{
|
||||||
GstJackAudioSink *sink;
|
GstJackAudioSink *sink;
|
||||||
guint i, res = 0;
|
guint i, res = 0;
|
||||||
#if defined (HAVE_JACK_0_120_1) || defined(HAVE_JACK_1_9_7)
|
|
||||||
jack_latency_range_t range;
|
jack_latency_range_t range;
|
||||||
#else
|
|
||||||
guint latency;
|
|
||||||
#endif
|
|
||||||
jack_client_t *client;
|
|
||||||
|
|
||||||
sink = GST_JACK_AUDIO_SINK (GST_OBJECT_PARENT (buf));
|
sink = GST_JACK_AUDIO_SINK (GST_OBJECT_PARENT (buf));
|
||||||
client = gst_jack_audio_client_get_client (sink->client);
|
|
||||||
|
|
||||||
for (i = 0; i < sink->port_count; i++) {
|
for (i = 0; i < sink->port_count; i++) {
|
||||||
#if defined (HAVE_JACK_0_120_1) || defined(HAVE_JACK_1_9_7)
|
|
||||||
jack_port_get_latency_range (sink->ports[i], JackPlaybackLatency, &range);
|
jack_port_get_latency_range (sink->ports[i], JackPlaybackLatency, &range);
|
||||||
if (range.max > res)
|
if (range.max > res)
|
||||||
res = range.max;
|
res = range.max;
|
||||||
#else
|
|
||||||
latency = jack_port_get_total_latency (client, sink->ports[i]);
|
|
||||||
if (latency > res)
|
|
||||||
res = latency;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
GST_LOG_OBJECT (sink, "delay %u", res);
|
GST_LOG_OBJECT (sink, "delay %u", res);
|
||||||
|
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
#else /* !(defined (HAVE_JACK_0_120_1) || defined(HAVE_JACK_1_9_7)) */
|
||||||
|
static guint
|
||||||
|
gst_jack_ring_buffer_delay (GstRingBuffer * buf)
|
||||||
|
{
|
||||||
|
GstJackAudioSink *sink;
|
||||||
|
guint i, res = 0;
|
||||||
|
guint latency;
|
||||||
|
jack_client_t *client;
|
||||||
|
|
||||||
|
sink = GST_JACK_AUDIO_SINK (GST_OBJECT_PARENT (buf));
|
||||||
|
client = gst_jack_audio_client_get_client (sink->client);
|
||||||
|
|
||||||
|
for (i = 0; i < sink->port_count; i++) {
|
||||||
|
latency = jack_port_get_total_latency (client, sink->ports[i]);
|
||||||
|
if (latency > res)
|
||||||
|
res = latency;
|
||||||
|
}
|
||||||
|
|
||||||
|
GST_LOG_OBJECT (sink, "delay %u", res);
|
||||||
|
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
static GstStaticPadTemplate jackaudiosink_sink_factory =
|
static GstStaticPadTemplate jackaudiosink_sink_factory =
|
||||||
GST_STATIC_PAD_TEMPLATE ("sink",
|
GST_STATIC_PAD_TEMPLATE ("sink",
|
||||||
|
@ -682,12 +688,10 @@ static void
|
||||||
gst_jack_audio_sink_class_init (GstJackAudioSinkClass * klass)
|
gst_jack_audio_sink_class_init (GstJackAudioSinkClass * klass)
|
||||||
{
|
{
|
||||||
GObjectClass *gobject_class;
|
GObjectClass *gobject_class;
|
||||||
GstElementClass *gstelement_class;
|
|
||||||
GstBaseSinkClass *gstbasesink_class;
|
GstBaseSinkClass *gstbasesink_class;
|
||||||
GstBaseAudioSinkClass *gstbaseaudiosink_class;
|
GstBaseAudioSinkClass *gstbaseaudiosink_class;
|
||||||
|
|
||||||
gobject_class = (GObjectClass *) klass;
|
gobject_class = (GObjectClass *) klass;
|
||||||
gstelement_class = (GstElementClass *) klass;
|
|
||||||
gstbasesink_class = (GstBaseSinkClass *) klass;
|
gstbasesink_class = (GstBaseSinkClass *) klass;
|
||||||
gstbaseaudiosink_class = (GstBaseAudioSinkClass *) klass;
|
gstbaseaudiosink_class = (GstBaseAudioSinkClass *) klass;
|
||||||
|
|
||||||
|
|
|
@ -176,12 +176,8 @@ gst_jack_ring_buffer_get_type (void)
|
||||||
static void
|
static void
|
||||||
gst_jack_ring_buffer_class_init (GstJackRingBufferClass * klass)
|
gst_jack_ring_buffer_class_init (GstJackRingBufferClass * klass)
|
||||||
{
|
{
|
||||||
GObjectClass *gobject_class;
|
|
||||||
GstObjectClass *gstobject_class;
|
|
||||||
GstRingBufferClass *gstringbuffer_class;
|
GstRingBufferClass *gstringbuffer_class;
|
||||||
|
|
||||||
gobject_class = (GObjectClass *) klass;
|
|
||||||
gstobject_class = (GstObjectClass *) klass;
|
|
||||||
gstringbuffer_class = (GstRingBufferClass *) klass;
|
gstringbuffer_class = (GstRingBufferClass *) klass;
|
||||||
|
|
||||||
ring_parent_class = g_type_class_peek_parent (klass);
|
ring_parent_class = g_type_class_peek_parent (klass);
|
||||||
|
@ -599,37 +595,50 @@ gst_jack_ring_buffer_stop (GstRingBuffer * buf)
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if defined (HAVE_JACK_0_120_1) || defined(HAVE_JACK_1_9_7)
|
||||||
static guint
|
static guint
|
||||||
gst_jack_ring_buffer_delay (GstRingBuffer * buf)
|
gst_jack_ring_buffer_delay (GstRingBuffer * buf)
|
||||||
{
|
{
|
||||||
GstJackAudioSrc *src;
|
GstJackAudioSrc *src;
|
||||||
guint i, res = 0;
|
guint i, res = 0;
|
||||||
#if defined (HAVE_JACK_0_120_1) || defined(HAVE_JACK_1_9_7)
|
|
||||||
jack_latency_range_t range;
|
jack_latency_range_t range;
|
||||||
#else
|
|
||||||
guint latency;
|
|
||||||
#endif
|
|
||||||
jack_client_t *client;
|
|
||||||
|
|
||||||
src = GST_JACK_AUDIO_SRC (GST_OBJECT_PARENT (buf));
|
src = GST_JACK_AUDIO_SRC (GST_OBJECT_PARENT (buf));
|
||||||
client = gst_jack_audio_client_get_client (src->client);
|
|
||||||
|
|
||||||
for (i = 0; i < src->port_count; i++) {
|
for (i = 0; i < src->port_count; i++) {
|
||||||
#if defined (HAVE_JACK_0_120_1) || defined(HAVE_JACK_1_9_7)
|
|
||||||
jack_port_get_latency_range (src->ports[i], JackCaptureLatency, &range);
|
jack_port_get_latency_range (src->ports[i], JackCaptureLatency, &range);
|
||||||
if (range.max > res)
|
if (range.max > res)
|
||||||
res = range.max;
|
res = range.max;
|
||||||
#else
|
|
||||||
latency = jack_port_get_total_latency (client, src->ports[i]);
|
|
||||||
if (latency > res)
|
|
||||||
res = latency;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
GST_DEBUG_OBJECT (src, "delay %u", res);
|
GST_DEBUG_OBJECT (src, "delay %u", res);
|
||||||
|
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
#else /* !(defined (HAVE_JACK_0_120_1) || defined(HAVE_JACK_1_9_7)) */
|
||||||
|
static guint
|
||||||
|
gst_jack_ring_buffer_delay (GstRingBuffer * buf)
|
||||||
|
{
|
||||||
|
GstJackAudioSrc *src;
|
||||||
|
guint i, res = 0;
|
||||||
|
guint latency;
|
||||||
|
jack_client_t *client;
|
||||||
|
|
||||||
|
src = GST_JACK_AUDIO_SRC (GST_OBJECT_PARENT (buf));
|
||||||
|
|
||||||
|
client = gst_jack_audio_client_get_client (src->client);
|
||||||
|
|
||||||
|
for (i = 0; i < src->port_count; i++) {
|
||||||
|
latency = jack_port_get_total_latency (client, src->ports[i]);
|
||||||
|
if (latency > res)
|
||||||
|
res = latency;
|
||||||
|
}
|
||||||
|
|
||||||
|
GST_DEBUG_OBJECT (src, "delay %u", res);
|
||||||
|
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Audiosrc signals and args */
|
/* Audiosrc signals and args */
|
||||||
enum
|
enum
|
||||||
|
@ -700,12 +709,10 @@ static void
|
||||||
gst_jack_audio_src_class_init (GstJackAudioSrcClass * klass)
|
gst_jack_audio_src_class_init (GstJackAudioSrcClass * klass)
|
||||||
{
|
{
|
||||||
GObjectClass *gobject_class;
|
GObjectClass *gobject_class;
|
||||||
GstElementClass *gstelement_class;
|
|
||||||
GstBaseSrcClass *gstbasesrc_class;
|
GstBaseSrcClass *gstbasesrc_class;
|
||||||
GstBaseAudioSrcClass *gstbaseaudiosrc_class;
|
GstBaseAudioSrcClass *gstbaseaudiosrc_class;
|
||||||
|
|
||||||
gobject_class = (GObjectClass *) klass;
|
gobject_class = (GObjectClass *) klass;
|
||||||
gstelement_class = (GstElementClass *) klass;
|
|
||||||
|
|
||||||
gstbasesrc_class = (GstBaseSrcClass *) klass;
|
gstbasesrc_class = (GstBaseSrcClass *) klass;
|
||||||
gstbaseaudiosrc_class = (GstBaseAudioSrcClass *) klass;
|
gstbaseaudiosrc_class = (GstBaseAudioSrcClass *) klass;
|
||||||
|
|
Loading…
Reference in a new issue