/pidgin/main: 3f81450a2df5: mediamanager: add info argument to P...

Changeset: 3f81450a2df52aafcb71ef994d9a9b13277abd60
Author:	 Jakub Adam <[email protected]>
Date:	 2016-06-21 14:59 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/3f81450a2df5

Description:

mediamanager: add info argument to PurpleMediaElementCreateCallback

diffstat:

 finch/gntmedia.c         |  4 ++--
 libpurple/media-gst.h    |  5 +++--
 libpurple/mediamanager.c |  6 +++---
 pidgin/gtkmedia.c        |  8 ++++----
 4 files changed, 12 insertions(+), 11 deletions(-)

diffs (105 lines):

diff --git a/finch/gntmedia.c b/finch/gntmedia.c
--- a/finch/gntmedia.c
+++ b/finch/gntmedia.c
@@ -409,7 +409,7 @@ call_cmd_cb(PurpleConversation *conv, co
 }
 
 static GstElement *
-create_default_audio_src(PurpleMedia *media,
+create_default_audio_src(PurpleMediaElementInfo *info, PurpleMedia *media,
 		const gchar *session_id, const gchar *participant)
 {
 	GstElement *src;
@@ -432,7 +432,7 @@ create_default_audio_src(PurpleMedia *me
 }
 
 static GstElement *
-create_default_audio_sink(PurpleMedia *media,
+create_default_audio_sink(PurpleMediaElementInfo *info, PurpleMedia *media,
 		const gchar *session_id, const gchar *participant)
 {
 	GstElement *sink;
diff --git a/libpurple/media-gst.h b/libpurple/media-gst.h
--- a/libpurple/media-gst.h
+++ b/libpurple/media-gst.h
@@ -49,8 +49,9 @@
 typedef struct _PurpleMediaElementInfo PurpleMediaElementInfo;
 typedef struct _PurpleMediaElementInfoClass PurpleMediaElementInfoClass;
 
-typedef GstElement *(*PurpleMediaElementCreateCallback)(PurpleMedia *media,
-			const gchar *session_id, const gchar *participant);
+typedef GstElement *(*PurpleMediaElementCreateCallback)(
+		PurpleMediaElementInfo *info, PurpleMedia *media,
+		const gchar *session_id, const gchar *participant);
 
 /**
  * PurpleMediaElementType:
diff --git a/libpurple/mediamanager.c b/libpurple/mediamanager.c
--- a/libpurple/mediamanager.c
+++ b/libpurple/mediamanager.c
@@ -876,7 +876,7 @@ media_established_cb (PurpleMedia *media
 }
 
 static GstElement *
-create_send_appsrc(PurpleMedia *media,
+create_send_appsrc(PurpleMediaElementInfo *element_info, PurpleMedia *media,
 		const gchar *session_id, const gchar *participant)
 {
 	PurpleMediaManager *manager = purple_media_manager_get ();
@@ -1022,7 +1022,7 @@ appsink_destroyed (PurpleMediaAppDataInf
 }
 
 static GstElement *
-create_recv_appsink(PurpleMedia *media,
+create_recv_appsink(PurpleMediaElementInfo *element_info, PurpleMedia *media,
 		const gchar *session_id, const gchar *participant)
 {
 	PurpleMediaManager *manager = purple_media_manager_get ();
@@ -2122,7 +2122,7 @@ purple_media_element_info_call_create(Pu
 	g_return_val_if_fail(PURPLE_IS_MEDIA_ELEMENT_INFO(info), NULL);
 	g_object_get(info, "create-cb", &create, NULL);
 	if (create)
-		return create(media, session_id, participant);
+		return create(info, media, session_id, participant);
 #endif
 	return NULL;
 }
diff --git a/pidgin/gtkmedia.c b/pidgin/gtkmedia.c
--- a/pidgin/gtkmedia.c
+++ b/pidgin/gtkmedia.c
@@ -1309,7 +1309,7 @@ create_configured_vv_element(const gchar
 }
 
 static GstElement *
-create_default_video_src(PurpleMedia *media,
+create_default_video_src(PurpleMediaElementInfo *info, PurpleMedia *media,
 		const gchar *session_id, const gchar *participant)
 {
 	GstElement *sendbin, *src;
@@ -1361,7 +1361,7 @@ create_default_video_src(PurpleMedia *me
 }
 
 static GstElement *
-create_default_video_sink(PurpleMedia *media,
+create_default_video_sink(PurpleMediaElementInfo *info, PurpleMedia *media,
 		const gchar *session_id, const gchar *participant)
 {
 	GstElement *sink;
@@ -1381,7 +1381,7 @@ create_default_video_sink(PurpleMedia *m
 }
 
 static GstElement *
-create_default_audio_src(PurpleMedia *media,
+create_default_audio_src(PurpleMediaElementInfo *info, PurpleMedia *media,
 		const gchar *session_id, const gchar *participant)
 {
 	GstElement *src;
@@ -1412,7 +1412,7 @@ create_default_audio_src(PurpleMedia *me
 }
 
 static GstElement *
-create_default_audio_sink(PurpleMedia *media,
+create_default_audio_sink(PurpleMediaElementInfo *info, PurpleMedia *media,
 		const gchar *session_id, const gchar *participant)
 {
 	GstElement *sink;

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