diff options
author | David Schleef <ds@schleef.org> | 2008-01-01 01:18:19 +0000 |
---|---|---|
committer | David Schleef <ds@schleef.org> | 2008-01-01 01:18:19 +0000 |
commit | 71814047036e4347ada045953b58030da5829262 (patch) | |
tree | e3f942497a9e3099a439a6bb841cad152a4afa82 /gst/librfb | |
parent | fdd091e26a7aa2f73ed8c5f2b7c1554f8636ce7d (diff) | |
download | gst-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 'gst/librfb')
-rw-r--r-- | gst/librfb/gstrfbsrc.c | 8 | ||||
-rw-r--r-- | gst/librfb/rfbdecoder.c | 10 |
2 files changed, 13 insertions, 5 deletions
diff --git a/gst/librfb/gstrfbsrc.c b/gst/librfb/gstrfbsrc.c index d3f799cd..0df0555f 100644 --- a/gst/librfb/gstrfbsrc.c +++ b/gst/librfb/gstrfbsrc.c @@ -86,7 +86,11 @@ static gboolean gst_rfb_src_event (GstBaseSrc * bsrc, GstEvent * event); static GstFlowReturn gst_rfb_src_create (GstPushSrc * psrc, GstBuffer ** outbuf); -GST_BOILERPLATE (GstRfbSrc, gst_rfb_src, GstPushSrc, GST_TYPE_PUSH_SRC); +#define DEBUG_INIT(bla) \ + GST_DEBUG_CATEGORY_INIT (rfbsrc_debug, "rfbsrc", 0, "rfb src element"); + +GST_BOILERPLATE_FULL (GstRfbSrc, gst_rfb_src, GstPushSrc, GST_TYPE_PUSH_SRC, + DEBUG_INIT); static void gst_rfb_src_base_init (gpointer g_class) @@ -148,8 +152,6 @@ gst_rfb_src_class_init (GstRfbSrcClass * klass) gstbasesrc_class->stop = GST_DEBUG_FUNCPTR (gst_rfb_src_stop); gstbasesrc_class->event = GST_DEBUG_FUNCPTR (gst_rfb_src_event); gstpushsrc_class->create = GST_DEBUG_FUNCPTR (gst_rfb_src_create); - - GST_DEBUG_CATEGORY_INIT (rfbsrc_debug, "rfbsrc", 0, "Rfb source"); } static void 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); |