diff options
| author | Jakub Adam <jakub.adam@ktknet.cz> | 2016-07-25 09:27:01 +0200 |
|---|---|---|
| committer | Jakub Adam <jakub.adam@ktknet.cz> | 2016-07-25 09:27:01 +0200 |
| commit | 5f6bc5d252b7c7b2ae1ab1bfc55414f86b38b964 (patch) | |
| tree | 8338bc8e4b697e9da6915c945b9cb8ad733e79dc /libpurple/media.c | |
| parent | 6311090970d908c9a1f6cf9016aa7f28d59d5754 (diff) | |
| download | pidgin-5f6bc5d252b7c7b2ae1ab1bfc55414f86b38b964.tar.gz | |
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 (limited to 'libpurple/media.c')
| -rw-r--r-- | libpurple/media.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/libpurple/media.c b/libpurple/media.c index 46284a9904..f35723fa21 100644 --- 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 *media) #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, const gchar *sess_id) 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(PurpleMedia *media) #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, |