Mercurial > pidgin
diff libpurple/media.c @ 26591:178718b181e4
propagate from branch 'im.pidgin.pidgin' (head e7a572653bbe02d5d4ec2efc43c303629911993b)
to branch 'im.pidgin.cpw.darkrain42.xmpp.bosh' (head 96588eb41bf6a5544a8d0ffb7f7f7e5f82b4c38b)
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sun, 12 Apr 2009 00:43:01 +0000 |
| parents | 538b4175fd24 e7861a7978dc |
| children | a8dbbcd069ab |
line wrap: on
line diff
--- a/libpurple/media.c Sat Apr 11 21:20:31 2009 +0000 +++ b/libpurple/media.c Sun Apr 12 00:43:01 2009 +0000 @@ -31,12 +31,15 @@ #include "account.h" #include "marshallers.h" #include "media.h" -#include "media-gst.h" #include "mediamanager.h" #include "network.h" #include "debug.h" +#ifdef USE_GSTREAMER +#include "media-gst.h" +#endif + #ifdef USE_VV #include <gst/farsight/fs-conference-iface.h> @@ -1909,6 +1912,7 @@ } #endif +#ifdef USE_GSTREAMER GstElement * purple_media_get_src(PurpleMedia *media, const gchar *sess_id) { @@ -1921,6 +1925,7 @@ return NULL; #endif } +#endif /* USE_GSTREAMER */ #ifdef USE_VV static PurpleMediaSession * @@ -3035,6 +3040,7 @@ #endif } +#ifdef USE_GSTREAMER GstElement * purple_media_get_tee(PurpleMedia *media, const gchar *session_id, const gchar *participant) @@ -3057,6 +3063,7 @@ return NULL; #endif } +#endif /* USE_GSTREAMER */ gboolean purple_media_transmitter_exists(const gchar *transmitter)