# HG changeset patch # User Mike Ruprecht # Date 1237764271 0 # Node ID cd41e1655a3ed39571f5a239e41db8c8086ec4d7 # Parent 8457de1211f2934ed03213133a25cec907e3734b Remove purple_media_audio_init_* functions. diff -r 8457de1211f2 -r cd41e1655a3e libpurple/media.c --- a/libpurple/media.c Sun Mar 22 23:15:43 2009 +0000 +++ b/libpurple/media.c Sun Mar 22 23:24:31 2009 +0000 @@ -1399,63 +1399,6 @@ } } -void -purple_media_audio_init_src(GstElement **sendbin, GstElement **sendlevel) -{ - GstElement *src; - GstElement *volume; - GstPad *pad; - GstPad *ghost; - const gchar *audio_device = purple_prefs_get_string("/purple/media/audio/device"); - double input_volume = purple_prefs_get_int("/purple/media/audio/volume/input")/10.0; - - g_return_if_fail(sendbin != NULL && sendlevel != NULL); - - *sendbin = gst_bin_new("purplesendaudiobin"); - src = gst_element_factory_make("alsasrc", "asrc"); - volume = gst_element_factory_make("volume", "purpleaudioinputvolume"); - g_object_set(volume, "volume", input_volume, NULL); - *sendlevel = gst_element_factory_make("level", "sendlevel"); - gst_bin_add_many(GST_BIN(*sendbin), src, volume, *sendlevel, NULL); - gst_element_link(src, volume); - gst_element_link(volume, *sendlevel); - pad = gst_element_get_pad(*sendlevel, "src"); - ghost = gst_ghost_pad_new("ghostsrc", pad); - gst_element_add_pad(*sendbin, ghost); - g_object_set(G_OBJECT(*sendlevel), "message", TRUE, NULL); - - if (audio_device != NULL && strcmp(audio_device, "")) - g_object_set(G_OBJECT(src), "device", audio_device, NULL); -} - -void -purple_media_audio_init_recv(GstElement **recvbin, GstElement **recvlevel) -{ - GstElement *sink, *volume, *queue; - GstPad *pad, *ghost; - double output_volume = purple_prefs_get_int( - "/purple/media/audio/volume/output")/10.0; - - g_return_if_fail(recvbin != NULL && recvlevel != NULL); - - *recvbin = gst_bin_new("pidginrecvaudiobin"); - sink = gst_element_factory_make("alsasink", "asink"); - g_object_set(G_OBJECT(sink), "async", FALSE, "sync", FALSE, NULL); - volume = gst_element_factory_make("volume", "purpleaudiooutputvolume"); - g_object_set(volume, "volume", output_volume, NULL); - *recvlevel = gst_element_factory_make("level", "recvlevel"); - queue = gst_element_factory_make("queue", NULL); - gst_bin_add_many(GST_BIN(*recvbin), sink, volume, - *recvlevel, queue, NULL); - gst_element_link(*recvlevel, sink); - gst_element_link(volume, *recvlevel); - gst_element_link(queue, volume); - pad = gst_element_get_pad(queue, "sink"); - ghost = gst_ghost_pad_new("ghostsink", pad); - gst_element_add_pad(*recvbin, ghost); - g_object_set(G_OBJECT(*recvlevel), "message", TRUE, NULL); -} - static void purple_media_new_local_candidate_cb(FsStream *stream, FsCandidate *local_candidate, diff -r 8457de1211f2 -r cd41e1655a3e libpurple/media.h --- a/libpurple/media.h Sun Mar 22 23:15:43 2009 +0000 +++ b/libpurple/media.h Sun Mar 22 23:24:31 2009 +0000 @@ -427,23 +427,6 @@ const gchar *participant); /** - * Creates a default audio source. - * - * @param sendbin Set to the newly created audio source. - * @param sendlevel Set to the newly created level within the audio source. - */ -void purple_media_audio_init_src(GstElement **sendbin, - GstElement **sendlevel); - -/** - * Creates a default audio sink. - * - * @param recvbin Set to the newly created audio sink. - * @param recvlevel Set to the newly created level within the audio sink. - */ -void purple_media_audio_init_recv(GstElement **recvbin, GstElement **recvlevel); - -/** * Adds a stream to a session. * * It only adds a stream to one audio session or video session as