diff options
author | Dave Robillard <dave@drobilla.net> | 2009-06-19 21:03:10 -0400 |
---|---|---|
committer | Dave Robillard <dave@drobilla.net> | 2009-06-19 21:03:10 -0400 |
commit | 23953f27c870c42ce369d717bc15b7f8001691a1 (patch) | |
tree | 19b3999c7b0c36fcefcbbcaaaa9102f612670ca7 /ext/apexsink | |
parent | d365eafd8f2cdb1ded93fe4bd95e568026abf0da (diff) | |
parent | 925e83ee60c5406b2e5f0f39b0da0f90370efc27 (diff) | |
download | gst-plugins-bad-23953f27c870c42ce369d717bc15b7f8001691a1.tar.gz gst-plugins-bad-23953f27c870c42ce369d717bc15b7f8001691a1.tar.bz2 gst-plugins-bad-23953f27c870c42ce369d717bc15b7f8001691a1.zip |
Merge branch 'fdo' into lv2
Diffstat (limited to 'ext/apexsink')
-rw-r--r-- | ext/apexsink/gstapexraop.c | 34 | ||||
-rw-r--r-- | ext/apexsink/gstapexsink.c | 12 |
2 files changed, 33 insertions, 13 deletions
diff --git a/ext/apexsink/gstapexraop.c b/ext/apexsink/gstapexraop.c index 98b7d863..4d07674b 100644 --- a/ext/apexsink/gstapexraop.c +++ b/ext/apexsink/gstapexraop.c @@ -28,6 +28,8 @@ #include "config.h" #endif +#include <string.h> + #include "gstapexraop.h" /* private constants */ @@ -100,7 +102,7 @@ gst_apexraop_send (int desc, void *data, size_t len) static int gst_apexraop_recv (int desc, void *data, size_t len) { - bzero (data, len); + memset (data, 0, len); return recv (desc, data, len, 0); } @@ -345,7 +347,11 @@ gst_apexraop_connect (GstApExRAOP * con) GST_APEX_RAOP_HDR_DEFAULT_LENGTH) <= 0) return GST_RTSP_STS_GONE; - sscanf (hreq, "%*s %d", (int *) &res); + { + int tmp; + sscanf (hreq, "%*s %d", &tmp); + res = (GstRTSPStatusCode) tmp; + } if (res != GST_RTSP_STS_OK) return res; @@ -393,7 +399,11 @@ gst_apexraop_connect (GstApExRAOP * con) GST_APEX_RAOP_HDR_DEFAULT_LENGTH) <= 0) return GST_RTSP_STS_GONE; - sscanf (hreq, "%*s %d", (int *) &res); + { + int tmp; + sscanf (hreq, "%*s %d", &tmp); + res = (GstRTSPStatusCode) tmp; + } if (res != GST_RTSP_STS_OK) return res; @@ -432,7 +442,11 @@ gst_apexraop_connect (GstApExRAOP * con) GST_APEX_RAOP_HDR_DEFAULT_LENGTH) <= 0) return GST_RTSP_STS_GONE; - sscanf (hreq, "%*s %d", (int *) &res); + { + int tmp; + sscanf (hreq, "%*s %d", &tmp); + res = (GstRTSPStatusCode) tmp; + } if (res != GST_RTSP_STS_OK) return res; @@ -553,7 +567,11 @@ gst_apexraop_set_volume (GstApExRAOP * con, const guint volume) GST_APEX_RAOP_HDR_DEFAULT_LENGTH) <= 0) return GST_RTSP_STS_GONE; - sscanf (hreq, "%*s %d", (int *) &res); + { + int tmp; + sscanf (hreq, "%*s %d", &tmp); + res = (GstRTSPStatusCode) tmp; + } return res; } @@ -695,7 +713,11 @@ gst_apexraop_flush (GstApExRAOP * con) GST_APEX_RAOP_HDR_DEFAULT_LENGTH) <= 0) return GST_RTSP_STS_GONE; - sscanf (hreq, "%*s %d", (int *) &res); + { + int tmp; + sscanf (hreq, "%*s %d", &tmp); + res = (GstRTSPStatusCode) tmp; + } return res; } diff --git a/ext/apexsink/gstapexsink.c b/ext/apexsink/gstapexsink.c index 8f98eb00..69f34bcb 100644 --- a/ext/apexsink/gstapexsink.c +++ b/ext/apexsink/gstapexsink.c @@ -30,6 +30,8 @@ #include "config.h" #endif +#include <string.h> + #include "gstapexsink.h" GST_DEBUG_CATEGORY_STATIC (apexsink_debug); @@ -488,7 +490,7 @@ gst_apexsink_prepare (GstAudioSink * asink, GstRingBufferSpec * spec) GST_APEX_RAOP_SAMPLES_PER_FRAME * GST_APEX_RAOP_BYTES_PER_SAMPLE; spec->segtotal = 1; - bzero (spec->silence_sample, sizeof (spec->silence_sample)); + memset (spec->silence_sample, 0, sizeof (spec->silence_sample)); GST_INFO_OBJECT (apexsink, "PREPARE : ApEx sink ready to stream at %dHz, %d bytes per sample, %d channels, %d bytes segments (%dkB/s)", @@ -521,9 +523,7 @@ gst_apexsink_write (GstAudioSink * asink, gpointer data, guint length) static gboolean gst_apexsink_unprepare (GstAudioSink * asink) { - GstApExSink *apexsink = (GstApExSink *) asink; - - GST_INFO_OBJECT (apexsink, "UNPREPARE"); + GST_INFO_OBJECT (asink, "UNPREPARE"); return TRUE; } @@ -532,9 +532,7 @@ gst_apexsink_unprepare (GstAudioSink * asink) static guint gst_apexsink_delay (GstAudioSink * asink) { - GstApExSink *apexsink = (GstApExSink *) asink; - - GST_INFO_OBJECT (apexsink, "DELAY"); + GST_LOG_OBJECT (asink, "DELAY"); return 0; } |