pidgin: 693f34ae: Handle sources for Windows better.
maiku at pidgin.im
maiku at pidgin.im
Thu Aug 13 03:32:01 EDT 2009
-----------------------------------------------------------------
Revision: 693f34aeef5794c9381068260ba79c542090e3fb
Ancestor: 6efd674e15e25031b7c75130eccb16208cc0f02c
Author: maiku at pidgin.im
Date: 2009-08-13T07:21:12
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/693f34aeef5794c9381068260ba79c542090e3fb
Modified files:
pidgin/gtkmedia.c
ChangeLog:
Handle sources for Windows better.
-------------- next part --------------
============================================================
--- pidgin/gtkmedia.c 3b813c9d216bf7fc967b585c92c498ebb8205ae7
+++ pidgin/gtkmedia.c 37e2464f3339608dc58ef7349e8b51d384db3aff
@@ -882,6 +882,14 @@ create_default_video_src(PurpleMedia *me
GstPad *ghost;
GstCaps *caps;
+#ifdef _WIN32
+ /* autovideosrc doesn't pick ksvideosrc for some reason */
+ src = gst_element_factory_make("ksvideosrc", NULL);
+ if (src == NULL)
+ src = gst_element_factory_make("dshowvideosrc", NULL);
+ if (src == NULL)
+ src = gst_element_factory_make("autovideosrc", NULL);
+#else
src = gst_element_factory_make("gconfvideosrc", NULL);
if (src == NULL)
src = gst_element_factory_make("autovideosrc", NULL);
@@ -889,10 +897,7 @@ create_default_video_src(PurpleMedia *me
src = gst_element_factory_make("v4l2src", NULL);
if (src == NULL)
src = gst_element_factory_make("v4lsrc", NULL);
- if (src == NULL)
- src = gst_element_factory_make("ksvideosrc", NULL);
- if (src == NULL)
- src = gst_element_factory_make("dshowvideosrc", NULL);
+#endif
if (src == NULL) {
purple_debug_error("gtkmedia", "Unable to find a suitable "
"element for the default video source.\n");
More information about the Commits
mailing list