changeset
merge of '5f8ab0b75892591263d36ba483eac02b33cd87d9'
Mon, 30 Mar 2009 04:15:52 +0000
- author
- Michael Ruprecht <maiku@pidgin.im>
- date
- Mon, 30 Mar 2009 04:15:52 +0000
- branch
- vv
- changeset 26508
- 293ae425c79f
- parent 26506
- 5f8ab0b75892 (current diff)
- parent 26507
- 629bdcfe9516 (diff)
- child 26510
- 603a46044913
merge of '5f8ab0b75892591263d36ba483eac02b33cd87d9'
and '629bdcfe9516c3f35e386485542d1b3ace8fc33b'
| finch/gntmedia.c | file | annotate | diff | comparison | revisions |
--- 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);
