summaryrefslogtreecommitdiffstats
path: root/ext/nas
diff options
context:
space:
mode:
authorDavid Schleef <ds@schleef.org>2008-01-01 01:18:19 +0000
committerDavid Schleef <ds@schleef.org>2008-01-01 01:18:19 +0000
commit71814047036e4347ada045953b58030da5829262 (patch)
treee3f942497a9e3099a439a6bb841cad152a4afa82 /ext/nas
parentfdd091e26a7aa2f73ed8c5f2b7c1554f8636ce7d (diff)
downloadgst-plugins-bad-71814047036e4347ada045953b58030da5829262.tar.gz
gst-plugins-bad-71814047036e4347ada045953b58030da5829262.tar.bz2
gst-plugins-bad-71814047036e4347ada045953b58030da5829262.zip
ext/musicbrainz/gsttrm.c: Don't emit signiture when going to READY, because it might not be ready.
Original commit message from CVS: * ext/musicbrainz/gsttrm.c: Don't emit signiture when going to READY, because it might not be ready. * ext/nas/nassink.c: Remove useless call that sleeps for 5 seconds. Yup, it calls sleep(1) 5 times. Go NAS. * gst/librfb/gstrfbsrc.c: * gst/librfb/rfbdecoder.c: Initialize our debug categories properly. * gst/rawparse/gstrawparse.c: Don't register element details for a non-element. Be much more rude when subclass doesn't set a pad template (assert!). Don't unref the pad template; we don't own it. * gst/videosignal/gstvideoanalyse.c: Initialize debug category. * tests/check/Makefile.am: Ignore nassink element in tests because it has unavoidable long timeouts.
Diffstat (limited to 'ext/nas')
-rw-r--r--ext/nas/nassink.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/ext/nas/nassink.c b/ext/nas/nassink.c
index a2ee0575..e2d91d18 100644
--- a/ext/nas/nassink.c
+++ b/ext/nas/nassink.c
@@ -171,12 +171,6 @@ gst_nas_sink_getcaps (GstBaseSink * bsink)
server = nassink->audio;
- if (server == NULL) {
- /* FIXME: is it really a good idea to do a potentially long blocking call
- * like this here? (tpm) */
- server = AuOpenServer (nassink->host, 0, NULL, 0, NULL, NULL);
- }
-
templatecaps = gst_static_pad_template_get_caps (&sink_factory);
if (server == NULL)
@@ -333,8 +327,10 @@ gst_nas_sink_open (GstAudioSink * asink)
/* Open Server */
sink->audio = AuOpenServer (sink->host, 0, NULL, 0, NULL, NULL);
- if (sink->audio == NULL)
+ if (sink->audio == NULL) {
+ GST_DEBUG_OBJECT (sink, "opening failed");
return FALSE;
+ }
sink->flow = AuNone;
sink->need_data = 0;