comparison finch/gntmedia.c @ 23821:12a16471f94e

Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.

23820:42e17cc5b6d2

	g_object_class_install_property(gobject_class, PROP_SEND_LEVEL,
			g_param_spec_object("send-level",
			"Send level",
			"The GstElement of this media's send 'level'",
			GST_TYPE_ELEMENT,
			G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
	g_object_class_install_property(gobject_class, PROP_RECV_LEVEL,
			g_param_spec_object("recv-level",
			"Receive level",
			"The GstElement of this media's recv 'level'",
			GST_TYPE_ELEMENT,
			G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));

	finch_media_signals[MESSAGE] = g_signal_new("message", G_TYPE_FROM_CLASS(klass),
					G_SIGNAL_RUN_LAST, 0, NULL, NULL,
					g_cclosure_marshal_VOID__STRING,
					G_TYPE_NONE, 1, G_TYPE_STRING);

}

static void
finch_media_ready_cb(PurpleMedia *media, FinchMedia *gntmedia)
{
	GstElement *element = purple_media_get_audio_pipeline(media);
	gst_bus_add_signal_watch(GST_BUS(gst_pipeline_get_bus(GST_PIPELINE(element))));
	g_signal_connect(G_OBJECT(gst_pipeline_get_bus(GST_PIPELINE(element))), "message", G_CALLBACK(level_message_cb), gntmedia);
}

static void

			break;
	}
}

GntWidget *
finch_media_new(PurpleMedia *media, GstElement *sendlevel, GstElement *recvlevel)
{
	return GNT_WIDGET(g_object_new(finch_media_get_type(),
				"media", media,
				"send-level", sendlevel,
				"recv-level", recvlevel,
				"vertical", FALSE,
				"homogeneous", FALSE,
				NULL));
}

}

static void
finch_new_media(PurpleMediaManager *manager, PurpleMedia *media, gpointer null)
{
	GstElement *sendbin, *sendlevel;
	GstElement *recvbin, *recvlevel;
	GntWidget *gntmedia;
	PurpleConversation *conv;

	purple_media_audio_init_src(&sendbin, &sendlevel);
	purple_media_audio_init_recv(&recvbin, &recvlevel);

	purple_media_set_audio_src(media, sendbin);
	purple_media_set_audio_sink(media, recvbin);

	conv = purple_conversation_new(PURPLE_CONV_TYPE_IM,
			purple_connection_get_account(purple_media_get_connection(media)),
			purple_media_get_screenname(media));

	gntmedia = finch_media_new(media, sendlevel, recvlevel);
	g_signal_connect(G_OBJECT(gntmedia), "message", G_CALLBACK(gntmedia_message_cb), conv);
	FINCH_MEDIA(gntmedia)->priv->conv = conv;
	finch_conversation_set_info_widget(conv, gntmedia);
}

23821:12a16471f94e

	g_object_class_install_property(gobject_class, PROP_SEND_LEVEL,
			g_param_spec_object("send-level",
			"Send level",
			"The GstElement of this media's send 'level'",
			GST_TYPE_ELEMENT,
			G_PARAM_READWRITE));
	g_object_class_install_property(gobject_class, PROP_RECV_LEVEL,
			g_param_spec_object("recv-level",
			"Receive level",
			"The GstElement of this media's recv 'level'",
			GST_TYPE_ELEMENT,
			G_PARAM_READWRITE));

	finch_media_signals[MESSAGE] = g_signal_new("message", G_TYPE_FROM_CLASS(klass),
					G_SIGNAL_RUN_LAST, 0, NULL, NULL,
					g_cclosure_marshal_VOID__STRING,
					G_TYPE_NONE, 1, G_TYPE_STRING);

}

static void
finch_media_ready_cb(PurpleMedia *media, FinchMedia *gntmedia)
{
	GstElement *element = purple_media_get_pipeline(media);

	GstElement *sendbin, *sendlevel;
	GstElement *recvbin, *recvlevel;

	GList *sessions = purple_media_get_session_names(media);

	purple_media_audio_init_src(&sendbin, &sendlevel);
	purple_media_audio_init_recv(&recvbin, &recvlevel);

	for (; sessions; sessions = sessions->next) {
		purple_media_set_src(media, sessions->data, sendbin);
		purple_media_set_sink(media, sessions->data, recvbin);
	}
	g_list_free(sessions);

	g_object_set(gntmedia, "send-level", &sendlevel,
		     "recv-level", &recvlevel,
		     NULL);

	gst_bus_add_signal_watch(GST_BUS(gst_pipeline_get_bus(GST_PIPELINE(element))));
	g_signal_connect(G_OBJECT(gst_pipeline_get_bus(GST_PIPELINE(element))), "message", G_CALLBACK(level_message_cb), gntmedia);
}

static void

			break;
	}
}

GntWidget *
finch_media_new(PurpleMedia *media)
{
	return GNT_WIDGET(g_object_new(finch_media_get_type(),
				"media", media,
				"vertical", FALSE,
				"homogeneous", FALSE,
				NULL));
}

}

static void
finch_new_media(PurpleMediaManager *manager, PurpleMedia *media, gpointer null)
{
	GntWidget *gntmedia;
	PurpleConversation *conv;

	conv = purple_conversation_new(PURPLE_CONV_TYPE_IM,
			purple_connection_get_account(purple_media_get_connection(media)),
			purple_media_get_screenname(media));

	gntmedia = finch_media_new(media);
	g_signal_connect(G_OBJECT(gntmedia), "message", G_CALLBACK(gntmedia_message_cb), conv);
	FINCH_MEDIA(gntmedia)->priv->conv = conv;
	finch_conversation_set_info_widget(conv, gntmedia);
}