Mercurial > pidgin

comparison libpurple/mediamanager.c @ 32766:fd1b4bbefc6b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Port to Farstream Farstream is the new name of Farsight. The changes to support Farstream are from ocrete. rlaager modified the patch to retain the Farsight code using #ifdef HAVE_FARSIGHT. committer: Richard Laager <rlaager@wiktel.com>
author olivier.crete@collabora.com
date Thu, 05 Apr 2012 03:18:40 +0000
parents d72d728226dc
children
comparison
equal deleted inserted replaced
32765:60bd913072f7 32766:fd1b4bbefc6b
37 #endif 37 #endif
38 38
39 #ifdef USE_VV 39 #ifdef USE_VV
40 #include <media/backend-fs2.h> 40 #include <media/backend-fs2.h>
41 41
42 #ifdef HAVE_FARSIGHT
42 #include <gst/farsight/fs-element-added-notifier.h> 43 #include <gst/farsight/fs-element-added-notifier.h>
44 #else
45 #include <farstream/fs-element-added-notifier.h>
46 #endif
43 #include <gst/interfaces/xoverlay.h> 47 #include <gst/interfaces/xoverlay.h>
44 48
45 /** @copydoc _PurpleMediaManagerPrivate */ 49 /** @copydoc _PurpleMediaManagerPrivate */
46 typedef struct _PurpleMediaManagerPrivate PurpleMediaManagerPrivate; 50 typedef struct _PurpleMediaManagerPrivate PurpleMediaManagerPrivate;
47 /** @copydoc _PurpleMediaOutputWindow */ 51 /** @copydoc _PurpleMediaOutputWindow */