summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Schleef <ds@schleef.org>2005-08-13 20:37:52 +0000
committerDavid Schleef <ds@schleef.org>2005-08-13 20:37:52 +0000
commit4cc0df4b27f1844f20af336e3c6df4847a37d478 (patch)
tree82d0b4981e9f0c32c15161b578dc6082627e2e25
parent01a1b91f84ba8e4ac9e01379226f0a3d7309cebb (diff)
downloadgstreamer-plugins-bad-4cc0df4b27f1844f20af336e3c6df4847a37d478.tar.gz
ext/polyp/polypsink.c: This compile fix could have been in my checkout for months. Apparently nobody but me builds t...
Original commit message from CVS: * ext/polyp/polypsink.c: (stream_state_callback), (context_state_callback), (gst_polypsink_link): This compile fix could have been in my checkout for months. Apparently nobody but me builds this.
-rw-r--r--ChangeLog7
-rw-r--r--ext/polyp/polypsink.c6
2 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 898c93daf..cba83828a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-13 David Schleef <ds@schleef.org>
+
+ * ext/polyp/polypsink.c: (stream_state_callback),
+ (context_state_callback), (gst_polypsink_link): This compile fix
+ could have been in my checkout for months. Apparently nobody
+ but me builds this.
+
2005-08-12 Tim-Philipp Müller <tim at centricular dot net>
* ext/jpeg/gstjpegdec.c: (gst_jpegdec_init),
diff --git a/ext/polyp/polypsink.c b/ext/polyp/polypsink.c
index b9e869015..4cd57efff 100644
--- a/ext/polyp/polypsink.c
+++ b/ext/polyp/polypsink.c
@@ -244,6 +244,7 @@ stream_state_callback (struct pa_stream *s, void *userdata)
/* Pass over */
case PA_STREAM_TERMINATED:
default:
+ GST_DEBUG ("stream terminated");
polypsink->mainloop_api->quit (polypsink->mainloop_api, 1);
destroy_context (polypsink);
break;
@@ -284,6 +285,7 @@ context_state_callback (struct pa_context *c, void *userdata)
/* Pass over */
case PA_CONTEXT_TERMINATED:
default:
+ GST_DEBUG ("stream terminated");
polypsink->mainloop_api->quit (polypsink->mainloop_api, 1);
destroy_context (polypsink);
break;
@@ -502,6 +504,7 @@ gst_polypsink_link (GstPad * pad, const GstCaps * caps)
char t[256];
GstElementState state;
int n_channels;
+ int tmp;
polypsink = GST_POLYPSINK (gst_pad_get_parent (pad));
@@ -543,7 +546,8 @@ gst_polypsink_link (GstPad * pad, const GstCaps * caps)
gst_structure_get_int (structure, "channels", &n_channels);
polypsink->sample_spec.channels = n_channels;
- gst_structure_get_int (structure, "rate", &polypsink->sample_spec.rate);
+ gst_structure_get_int (structure, "rate", &tmp);
+ polypsink->sample_spec.rate = tmp;
pa_sample_spec_snprint (t, sizeof (t), &polypsink->sample_spec);
GST_DEBUG ("using format %s", t);