pidgin.next.minor: d667c60d: Wraps backend-fs2.c in #ifdefs for when ...

[maiku at pidgin.im]

-----------------------------------------------------------------
Revision: d667c60d4307344e071846ebcf72ed5458183434
Ancestor: 6ec5af93247e0f9a4b5f8cae5a9b60001d89790a
Author: maiku at pidgin.im
Date: 2009-11-18T04:54:15
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/d667c60d4307344e071846ebcf72ed5458183434

Modified files:
        libpurple/media/backend-fs2.c

ChangeLog: 

Wraps backend-fs2.c in #ifdefs for when VV or GSTREAMER is disabled.

Thanks to rekkanoryo for finding this.

-------------- next part --------------
============================================================
--- libpurple/media/backend-fs2.c	6e1e918346836f315ddcbb3f45e8b0086c5301e8
+++ libpurple/media/backend-fs2.c	03f289e150d606c5bf3535e6382a2bdecd29345b
@@ -28,6 +28,7 @@
 
 #include "internal.h"
 
+#ifdef USE_VV
 #include "backend-iface.h"
 #include "debug.h"
 #include "network.h"
@@ -1927,19 +1928,32 @@ purple_media_backend_fs2_set_send_codec(
 
 	return TRUE;
 }
+#else
+GType
+purple_media_backend_fs2_get_type(void)
+{
+	return G_TYPE_NONE;
+}
+#endif /* USE_VV */
 
+#ifdef USE_GSTREAMER
 GstElement *
 purple_media_backend_fs2_get_src(PurpleMediaBackendFs2 *self,
 		const gchar *sess_id)
 {
+#ifdef USE_VV
 	PurpleMediaBackendFs2Session *session = get_session(self, sess_id);
 	return session != NULL ? session->src : NULL;
+#else
+	return NULL;
+#endif
 }
 
 GstElement *
 purple_media_backend_fs2_get_tee(PurpleMediaBackendFs2 *self,
 		const gchar *sess_id, const gchar *who)
 {
+#ifdef USE_VV
 	if (sess_id != NULL && who == NULL) {
 		PurpleMediaBackendFs2Session *session =
 				get_session(self, sess_id);
@@ -1950,13 +1964,16 @@ purple_media_backend_fs2_get_tee(PurpleM
 		return (stream != NULL) ? stream->tee : NULL;
 	}
 
+#endif /* USE_VV */
 	g_return_val_if_reached(NULL);
 }
+#endif /* USE_GSTREAMER */
 
 void
 purple_media_backend_fs2_set_input_volume(PurpleMediaBackendFs2 *self,
 		const gchar *sess_id, double level)
 {
+#ifdef USE_VV
 	PurpleMediaBackendFs2Private *priv;
 	GList *sessions;
 
@@ -1983,13 +2000,14 @@ purple_media_backend_fs2_set_input_volum
 			g_object_set(volume, "volume", level/10.0, NULL);
 		}
 	}
+#endif /* USE_VV */
 }
 
 void
 purple_media_backend_fs2_set_output_volume(PurpleMediaBackendFs2 *self,
 		const gchar *sess_id, const gchar *who, double level)
 {
-	
+#ifdef USE_VV
 	PurpleMediaBackendFs2Private *priv;
 	GList *streams;
 
@@ -2010,4 +2028,5 @@ purple_media_backend_fs2_set_output_volu
 					level/10.0, NULL);
 		}
 	}
+#endif /* USE_VV */
 }