From 71814047036e4347ada045953b58030da5829262 Mon Sep 17 00:00:00 2001 From: David Schleef Date: Tue, 1 Jan 2008 01:18:19 +0000 Subject: 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. --- gst/librfb/rfbdecoder.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'gst/librfb/rfbdecoder.c') diff --git a/gst/librfb/rfbdecoder.c b/gst/librfb/rfbdecoder.c index 878183e1..2c688f0c 100644 --- a/gst/librfb/rfbdecoder.c +++ b/gst/librfb/rfbdecoder.c @@ -61,6 +61,13 @@ RfbDecoder * rfb_decoder_new (void) { RfbDecoder *decoder = g_new0 (RfbDecoder, 1); + static gboolean debug_inited = FALSE; + + if (!debug_inited) { + /* FIXME this is the wrong place to int this */ + GST_DEBUG_CATEGORY_INIT (rfbdecoder_debug, "rfbdecoder", 0, "Rfb source"); + debug_inited = TRUE; + } decoder->fd = -1; @@ -108,6 +115,7 @@ rfb_decoder_connect_tcp (RfbDecoder * decoder, gchar * addr, guint port) if (connect (decoder->fd, (struct sockaddr *) &sa, sizeof (struct sockaddr)) == -1) { close (decoder->fd); + decoder->fd = -1; GST_WARNING ("connection failed"); return FALSE; } @@ -126,8 +134,6 @@ rfb_decoder_connect_tcp (RfbDecoder * decoder, gchar * addr, guint port) gboolean rfb_decoder_iterate (RfbDecoder * decoder) { - GST_DEBUG_CATEGORY_INIT (rfbdecoder_debug, "rfbdecoder", 0, "Rfb source"); - g_return_val_if_fail (decoder != NULL, FALSE); g_return_val_if_fail (decoder->fd != -1, FALSE); -- cgit v1.2.1