diff options
| author | Dave Robillard <dave@drobilla.net> | 2009-06-19 21:01:54 -0400 |
|---|---|---|
| committer | Dave Robillard <dave@drobilla.net> | 2009-06-19 21:01:54 -0400 |
| commit | 925e83ee60c5406b2e5f0f39b0da0f90370efc27 (patch) | |
| tree | ce01d298ed0c5d31853fa43aedc2af0779417816 /ext/apexsink/gstapexraop.c | |
| parent | 7f3bcd484b465d8216ac419754450adf07e9b0d2 (diff) | |
| parent | c70dbe94b5ff9a0993d852605d40c21020c59552 (diff) | |
| download | gst-plugins-bad-925e83ee60c5406b2e5f0f39b0da0f90370efc27.tar.gz gst-plugins-bad-925e83ee60c5406b2e5f0f39b0da0f90370efc27.tar.bz2 gst-plugins-bad-925e83ee60c5406b2e5f0f39b0da0f90370efc27.zip | |
Merge branch 'master' of git://anongit.freedesktop.org/gstreamer/gst-plugins-bad into fdo
Diffstat (limited to 'ext/apexsink/gstapexraop.c')
| -rw-r--r-- | ext/apexsink/gstapexraop.c | 34 |
1 files changed, 28 insertions, 6 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; } |