/pidgin/main: 4a3d2c5fc856: media: clear USE_GSTREAMER macro fro...

Changeset: 4a3d2c5fc856c8566ebf3a117220928f53503dca
Author:	 Jakub Adam <[email protected]>
Date:	 2016-07-25 09:27 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/4a3d2c5fc856

Description:

media: clear USE_GSTREAMER macro from V&V source files

USE_VV implies USE_GSTREAMER and so the occurrences of the latter macro
in voice & video sources can be simply replaced with USE_VV (merging any
so created overlapping conditional blocks).

Code meant to be active when USE_VV=1 and USE_GSTREAMER=0 is
inaccessible and can be removed.

diffstat:

 finch/gntmedia.c              |   59 ---------
 libpurple/media.c             |   21 +--
 libpurple/media/backend-fs2.c |    2 -
 libpurple/media/backend-fs2.h |    2 -
 libpurple/mediamanager.c      |   90 +------------
 pidgin/gtkmedia.c             |  275 ------------------------------------------
 6 files changed, 14 insertions(+), 435 deletions(-)

diffs (truncated from 850 to 300 lines):

diff --git a/finch/gntmedia.c b/finch/gntmedia.c
--- a/finch/gntmedia.c
+++ b/finch/gntmedia.c
@@ -408,47 +408,6 @@ call_cmd_cb(PurpleConversation *conv, co
 	return PURPLE_CMD_RET_OK;
 }
 
-#ifndef USE_GSTREAMER
-
-static GstElement *
-create_default_audio_src(PurpleMediaElementInfo *info, PurpleMedia *media,
-		const gchar *session_id, const gchar *participant)
-{
-	GstElement *src;
-	src = gst_element_factory_make("gconfaudiosrc", NULL);
-	if (src == NULL)
-		src = gst_element_factory_make("autoaudiosrc", NULL);
-	if (src == NULL)
-		src = gst_element_factory_make("alsasrc", NULL);
-	if (src == NULL)
-		src = gst_element_factory_make("osssrc", NULL);
-	if (src == NULL)
-		src = gst_element_factory_make("dshowaudiosrc", NULL);
-	if (src == NULL) {
-		purple_debug_error("gntmedia", "Unable to find a suitable "
-				"element for the default audio source.\n");
-		return NULL;
-	}
-	gst_element_set_name(src, "finchdefaultaudiosrc");
-	return src;
-}
-
-static GstElement *
-create_default_audio_sink(PurpleMediaElementInfo *info, PurpleMedia *media,
-		const gchar *session_id, const gchar *participant)
-{
-	GstElement *sink;
-	sink = gst_element_factory_make("gconfaudiosink", NULL);
-	if (sink == NULL)
-		sink = gst_element_factory_make("autoaudiosink",NULL);
-	if (sink == NULL) {
-		purple_debug_error("gntmedia", "Unable to find a suitable "
-				"element for the default audio sink.\n");
-		return NULL;
-	}
-	return sink;
-}
-#endif /* USE_GSTREAMER */
 #endif  /* USE_VV */
 
 void finch_media_manager_init(void)
@@ -457,7 +416,6 @@ void finch_media_manager_init(void)
 	PurpleMediaManager *manager = purple_media_manager_get();
 	PurpleMediaElementInfo *audio_src;
 	PurpleMediaElementInfo *audio_sink;
-#ifdef USE_GSTREAMER
 	const char *pref;
 
 	pref = purple_prefs_get_string(
@@ -481,23 +439,6 @@ void finch_media_manager_init(void)
 		audio_sink = purple_media_manager_get_element_info(manager,
 				pref);
 	}
-#else
-	audio_src = g_object_new(PURPLE_TYPE_MEDIA_ELEMENT_INFO,
-			"id", "finchdefaultaudiosrc",
-			"name", "Finch Default Audio Source",
-			"type", PURPLE_MEDIA_ELEMENT_AUDIO
-					| PURPLE_MEDIA_ELEMENT_SRC
-					| PURPLE_MEDIA_ELEMENT_ONE_SRC
-					| PURPLE_MEDIA_ELEMENT_UNIQUE,
-			"create-cb", create_default_audio_src, NULL);
-	audio_sink = g_object_new(PURPLE_TYPE_MEDIA_ELEMENT_INFO,
-			"id", "finchdefaultaudiosink",
-			"name", "Finch Default Audio Sink",
-			"type", PURPLE_MEDIA_ELEMENT_AUDIO
-					| PURPLE_MEDIA_ELEMENT_SINK
-					| PURPLE_MEDIA_ELEMENT_ONE_SINK,
-			"create-cb", create_default_audio_sink, NULL);
-#endif /* USE_GSTREAMER */
 
 	g_signal_connect(G_OBJECT(manager), "init-media", G_CALLBACK(finch_new_media), NULL);
 	purple_cmd_register("call", "", PURPLE_CMD_P_DEFAULT,
diff --git a/libpurple/media.c b/libpurple/media.c
--- a/libpurple/media.c
+++ b/libpurple/media.c
@@ -27,13 +27,10 @@
 
 #include "debug.h"
 
-#ifdef USE_GSTREAMER
+#ifdef USE_VV
 #include "media/backend-fs2.h"
 #include "marshallers.h"
 #include "media-gst.h"
-#endif
-
-#ifdef USE_VV
 
 /** @copydoc _PurpleMediaSession */
 typedef struct _PurpleMediaSession PurpleMediaSession;
@@ -562,11 +559,10 @@ purple_media_get_session_ids(PurpleMedia
 #endif
 }
 
-#ifdef USE_GSTREAMER
+#ifdef USE_VV
 GstElement *
 purple_media_get_src(PurpleMedia *media, const gchar *sess_id)
 {
-#ifdef USE_VV
 	g_return_val_if_fail(PURPLE_IS_MEDIA(media), NULL);
 
 	if (PURPLE_IS_MEDIA_BACKEND_FS2(media->priv->backend))
@@ -575,11 +571,8 @@ purple_media_get_src(PurpleMedia *media,
 				media->priv->backend), sess_id);
 
 	g_return_val_if_reached(NULL);
-#else
-	return NULL;
-#endif
 }
-#endif /* USE_GSTREAMER */
+#endif /* USE_VV */
 
 PurpleAccount *
 purple_media_get_account(PurpleMedia *media)
@@ -1451,12 +1444,11 @@ purple_media_remove_output_windows(Purpl
 #endif
 }
 
-#ifdef USE_GSTREAMER
+#ifdef USE_VV
 GstElement *
 purple_media_get_tee(PurpleMedia *media,
 		const gchar *session_id, const gchar *participant)
 {
-#ifdef USE_VV
 	g_return_val_if_fail(PURPLE_IS_MEDIA(media), NULL);
 
 	if (PURPLE_IS_MEDIA_BACKEND_FS2(media->priv->backend))
@@ -1465,11 +1457,8 @@ purple_media_get_tee(PurpleMedia *media,
 				media->priv->backend),
 				session_id, participant);
 	g_return_val_if_reached(NULL);
-#else
-	return NULL;
-#endif
 }
-#endif /* USE_GSTREAMER */
+#endif /* USE_VV */
 
 gboolean
 purple_media_send_dtmf(PurpleMedia *media, const gchar *session_id,
diff --git a/libpurple/media/backend-fs2.c b/libpurple/media/backend-fs2.c
--- a/libpurple/media/backend-fs2.c
+++ b/libpurple/media/backend-fs2.c
@@ -2568,7 +2568,6 @@ purple_media_backend_fs2_get_type(void)
 }
 #endif /* USE_VV */
 
-#ifdef USE_GSTREAMER
 GstElement *
 purple_media_backend_fs2_get_src(PurpleMediaBackendFs2 *self,
 		const gchar *sess_id)
@@ -2658,7 +2657,6 @@ purple_media_backend_fs2_set_output_volu
 	}
 #endif /* USE_VV */
 }
-#endif /* USE_GSTREAMER */
 
 #ifdef USE_VV
 static gboolean
diff --git a/libpurple/media/backend-fs2.h b/libpurple/media/backend-fs2.h
--- a/libpurple/media/backend-fs2.h
+++ b/libpurple/media/backend-fs2.h
@@ -58,7 +58,6 @@ typedef struct _PurpleMediaBackendFs2 Pu
  */
 GType purple_media_backend_fs2_get_type(void);
 
-#ifdef USE_GSTREAMER
 /*
  * Temporary function in order to be able to test while
  * integrating with PurpleMedia
@@ -75,7 +74,6 @@ void purple_media_backend_fs2_set_input_
 void purple_media_backend_fs2_set_output_volume(PurpleMediaBackendFs2 *self,
 		const gchar *sess_id, const gchar *who, double level);
 /* end tmp */
-#endif /* USE_GSTREAMER */
 
 G_END_DECLS
 
diff --git a/libpurple/mediamanager.c b/libpurple/mediamanager.c
--- a/libpurple/mediamanager.c
+++ b/libpurple/mediamanager.c
@@ -26,12 +26,9 @@
 #include "media.h"
 #include "mediamanager.h"
 
-#ifdef USE_GSTREAMER
+#ifdef USE_VV
 #include "marshallers.h"
 #include "media-gst.h"
-#endif
-
-#ifdef USE_VV
 #include <media/backend-fs2.h>
 
 #include <farstream/fs-element-added-notifier.h>
@@ -72,11 +69,9 @@ struct _PurpleMediaManagerPrivate
 	PurpleMediaElementInfo *audio_src;
 	PurpleMediaElementInfo *audio_sink;
 
-#ifdef USE_GSTREAMER
 #if GST_CHECK_VERSION(1, 4, 0)
 	GstDeviceMonitor *device_monitor;
 #endif /* GST_CHECK_VERSION(1, 4, 0) */
-#endif /* USE_GSTREAMER */
 
 #ifdef HAVE_MEDIA_APPLICATION
 	/* Application data streams */
@@ -119,10 +114,8 @@ static void purple_media_manager_finaliz
 #ifdef HAVE_MEDIA_APPLICATION
 static void free_appdata_info_locked (PurpleMediaAppDataInfo *info);
 #endif
-#ifdef USE_GSTREAMER
 static void purple_media_manager_init_device_monitor(PurpleMediaManager *manager);
 static void purple_media_manager_register_static_elements(PurpleMediaManager *manager);
-#endif
 
 static GObjectClass *parent_class = NULL;
 
@@ -213,9 +206,7 @@ purple_media_manager_class_init (PurpleM
 static void
 purple_media_manager_init (PurpleMediaManager *media)
 {
-#ifdef USE_GSTREAMER
 	GError *error;
-#endif /* USE_GSTREAMER */
 
 	media->priv = PURPLE_MEDIA_MANAGER_GET_PRIVATE(media);
 	media->priv->medias = NULL;
@@ -226,7 +217,6 @@ purple_media_manager_init (PurpleMediaMa
 	media->priv->appdata_info = NULL;
 	g_mutex_init (&media->priv->appdata_mutex);
 #endif
-#ifdef USE_GSTREAMER
 	if (gst_init_check(NULL, NULL, &error)) {
 		purple_media_manager_register_static_elements(media);
 		purple_media_manager_init_device_monitor(media);
@@ -238,7 +228,6 @@ purple_media_manager_init (PurpleMediaMa
 			g_error_free(error);
 		}
 	}
-#endif /* USE_GSTREAMER */
 
 	purple_prefs_add_none("/purple/media");
 	purple_prefs_add_none("/purple/media/audio");
@@ -272,14 +261,12 @@ purple_media_manager_finalize (GObject *
 			(GDestroyNotify) free_appdata_info_locked);
 	g_mutex_clear (&priv->appdata_mutex);
 #endif
-#ifdef USE_GSTREAMER
 #if GST_CHECK_VERSION(1, 4, 0)
 	if (priv->device_monitor) {
 		gst_device_monitor_stop(priv->device_monitor);
 		g_object_unref(priv->device_monitor);
 	}
 #endif /* GST_CHECK_VERSION(1, 4, 0) */
-#endif /* USE_GSTREAMER */
 
 	parent_class->finalize(media);
 }
@@ -332,11 +319,10 @@ pipeline_bus_call(GstBus *bus, GstMessag
 }
 #endif
 
-#ifdef USE_GSTREAMER
+#ifdef USE_VV
 GstElement *
 purple_media_manager_get_pipeline(PurpleMediaManager *manager)
 {
-#ifdef USE_VV
 	g_return_val_if_fail(PURPLE_IS_MEDIA_MANAGER(manager), NULL);
 
 	if (manager->priv->pipeline == NULL) {
@@ -392,11 +378,8 @@ purple_media_manager_get_pipeline(Purple
 	}
 
 	return manager->priv->pipeline;
-#else
-	return NULL;
-#endif
 }
-#endif /* USE_GSTREAMER */
+#endif /* USE_VV */
 
 static PurpleMedia *
 create_media(PurpleMediaManager *manager,
@@ -713,14 +696,9 @@ nonunique_src_unlinked_cb(GstPad *pad, G

_______________________________________________
Commits mailing list
[email protected]
https://pidgin.im/cgi-bin/mailman/listinfo/commits