pidgin.vv: 795a125f: Remove purple_media_get_sink and the sin...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 795a125f81f332aabaccd4892bf8c2cdef31946c
Ancestor: a0f0b3949ad425ea60cdeec2a93016c7b4c1f341
Author: maiku at soc.pidgin.im
Date: 2009-03-22T21:52:20
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/795a125f81f332aabaccd4892bf8c2cdef31946c

Modified files:
        libpurple/media.c libpurple/media.h

ChangeLog: 

Remove purple_media_get_sink and the sink variables in the media structures.
The concept of a single sink per stream is no longer relevant.

-------------- next part --------------
============================================================
--- libpurple/media.c	01dfc80fa11fecb9cfe802a71c307957163dd0f1
+++ libpurple/media.c	067041daa3d9677b128bc1144252f7842ae2bbd6
@@ -56,7 +56,6 @@ struct _PurpleMediaSession
 
 	PurpleMediaSessionType type;
 
-	GstElement *sink;
 	gulong window_id;
 };
 
@@ -65,7 +64,6 @@ struct _PurpleMediaStream
 	PurpleMediaSession *session;
 	gchar *participant;
 	FsStream *stream;
-	GstElement *sink;
 	GstElement *src;
 	GstElement *tee;
 
@@ -1165,15 +1163,6 @@ purple_media_get_src(PurpleMedia *media,
 	return (session != NULL) ? session->src : NULL;
 }
 
-GstElement *
-purple_media_get_sink(PurpleMedia *media, const gchar *sess_id, const gchar *participant)
-{
-	PurpleMediaStream *stream;
-	g_return_val_if_fail(PURPLE_IS_MEDIA(media), NULL);
-	stream = purple_media_get_stream(media, sess_id, participant);
-	return (stream != NULL) ? stream->sink : NULL;
-}
-
 static PurpleMediaSession *
 purple_media_session_from_fs_stream(PurpleMedia *media, FsStream *stream)
 {
@@ -1752,7 +1741,6 @@ purple_media_src_pad_added_cb(FsStream *
 					"liveadder", NULL);
 			sink = purple_media_manager_get_element(priv->manager,
 					PURPLE_MEDIA_RECV_AUDIO);
-			stream->sink = sink;
 		} else if (codec->media_type == FS_MEDIA_TYPE_VIDEO) {
 			stream->src = gst_element_factory_make(
 					"fsfunnel", NULL);
@@ -1773,13 +1761,6 @@ purple_media_src_pad_added_cb(FsStream *
 	gst_pad_link(srcpad, sinkpad);
 	gst_object_unref(sinkpad);
 
-	if (codec->media_type == FS_MEDIA_TYPE_VIDEO &&
-			stream->sink != NULL) {
-		gst_bin_add(GST_BIN(priv->confbin), stream->sink);
-		gst_element_set_state(stream->sink, GST_STATE_PLAYING);
-		gst_element_link(stream->tee, stream->sink);
-	}
-
 	stream->connected_cb_id = purple_timeout_add(0,
 			(GSourceFunc)purple_media_connected_cb, stream);
 }
============================================================
--- libpurple/media.h	8fafc92dea90cbf9c0e928f3ec8ac17970d98def
+++ libpurple/media.h	4c8a04936c2b5f7a965bd9ffd79f24511619d2bf
@@ -352,17 +352,6 @@ GstElement *purple_media_get_src(PurpleM
 GstElement *purple_media_get_src(PurpleMedia *media, const gchar *sess_id);
 
 /**
- * Gets the sink from a stream
- *
- * @param media The media object the session is in.
- * @param sess_id The session id the stream belongs to.
- * @param participant The participant the stream is associated with.
- *
- * @return The sink retrieved.
- */
-GstElement *purple_media_get_sink(PurpleMedia *media, const gchar *sess_id, const gchar *participant);
-
-/**
  * Gets the pipeline from the media session.
  *
  * @param media The media session to retrieve the pipeline from.