+2006-09-25 Wim Taymans <wim@fluendo.com>
+
+ * gst/autodetect/gstautoaudiosink.c:
+ (gst_auto_audio_sink_base_init), (gst_auto_audio_sink_class_init),
+ (gst_auto_audio_sink_find_best):
+ * gst/autodetect/gstautovideosink.c: (gst_auto_video_sink_detect):
+ Small cleanups.
+ don't try to set "sync" property when it is not available.
+
2006-09-25 Tim-Philipp Müller <tim at centricular dot net>
Patch by: Peter Kjellerstedt <pkj at axis com>
"Sink/Audio",
"Wrapper audio sink for automatically detected audio sink",
"Ronald Bultje <rbultje@ronald.bitfreak.net>");
+
static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
gst_element_class_add_pad_template (eklass,
gst_static_pad_template_get (&sink_template));
+
gst_element_class_set_details (eklass, &gst_auto_audio_sink_details);
}
static void
gst_auto_audio_sink_class_init (GstAutoAudioSinkClass * klass)
{
- GstElementClass *eklass = GST_ELEMENT_CLASS (klass);
+ GstElementClass *eklass;
+
+ eklass = GST_ELEMENT_CLASS (klass);
eklass->change_state = GST_DEBUG_FUNCPTR (gst_auto_audio_sink_change_state);
}
GST_ELEMENT_WARNING (sink, RESOURCE, NOT_FOUND, (NULL),
("Failed to find a usable audio sink"));
choice = gst_element_factory_make ("fakesink", "fake-audio-sink");
- g_object_set (choice, "sync", TRUE, NULL);
+ if (g_object_class_find_property (G_OBJECT_GET_CLASS (choice), "sync"))
+ g_object_set (choice, "sync", TRUE, NULL);
gst_element_set_state (choice, GST_STATE_READY);
}
}
/* find element */
GST_DEBUG_OBJECT (sink, "Creating new kid");
- if (!(esink = gst_auto_video_sink_find_best (sink))) {
- GST_ELEMENT_ERROR (sink, LIBRARY, INIT, (NULL),
- ("Failed to find a supported video sink"));
- return FALSE;
- }
+ if (!(esink = gst_auto_video_sink_find_best (sink)))
+ goto no_sink;
sink->kid = esink;
gst_bin_add (GST_BIN (sink), esink);
GST_DEBUG_OBJECT (sink, "done changing auto video sink");
return TRUE;
+
+ /* ERRORS */
+no_sink:
+ {
+ GST_ELEMENT_ERROR (sink, LIBRARY, INIT, (NULL),
+ ("Failed to find a supported video sink"));
+ return FALSE;
+ }
}
static GstStateChangeReturn