changeset 26379:cdce3db4e09f

merge of '09e919e395cff260ab58aee3aec04058c5f128b9' and '19dc1175b3648701e3d873038fbd2bb955afea8f'
author Mike Ruprecht <maiku@soc.pidgin.im>
date Mon, 30 Mar 2009 04:15:52 +0000
parents e9e9ec08e87c (current diff) 452be048bded (diff)
children b0a9c48b5f69
files finch/gntmedia.c
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/finch/gntmedia.c	Mon Mar 30 04:01:14 2009 +0000
+++ b/finch/gntmedia.c	Mon Mar 30 04:15:52 2009 +0000
@@ -401,7 +401,7 @@
 	double input_volume = purple_prefs_get_int(
 			"/purple/media/audio/volume/input")/10.0;
 
-	bin = gst_bin_new("purplesendaudiobin");
+	bin = gst_bin_new("finchdefaultaudiosrc");
 	src = gst_element_factory_make("alsasrc", "asrc");
 	volume = gst_element_factory_make("volume", "purpleaudioinputvolume");
 	g_object_set(volume, "volume", input_volume, NULL);
--- a/pidgin/gtkmedia.c	Mon Mar 30 04:01:14 2009 +0000
+++ b/pidgin/gtkmedia.c	Mon Mar 30 04:15:52 2009 +0000
@@ -892,7 +892,7 @@
 	const gchar *video_device = purple_prefs_get_string(
 			"/purple/media/video/device");
 
-	sendbin = gst_bin_new("purplesendvideobin");
+	sendbin = gst_bin_new("pidgindefaultvideosrc");
 	src = gst_element_factory_make(video_plugin, "purplevideosource");
 	videoscale = gst_element_factory_make("videoscale", NULL);
 	capsfilter = gst_element_factory_make("capsfilter", NULL);
@@ -938,7 +938,7 @@
 	double input_volume = purple_prefs_get_int(
 			"/purple/media/audio/volume/input")/10.0;
 
-	bin = gst_bin_new("purplesendaudiobin");
+	bin = gst_bin_new("pidgindefaultaudiosrc");
 	src = gst_element_factory_make("alsasrc", "asrc");
 	volume = gst_element_factory_make("volume", "purpleaudioinputvolume");
 	g_object_set(volume, "volume", input_volume, NULL);