comparison pidgin/gtkmedia.c @ 26462:b0a9c48b5f69

merge of '2d0e977ba883c0b9d24d52360839cfed7cf1f2a6' and 'e9514d92cd62759a80a75f93b308e4fd05afe673'
author Mike Ruprecht <maiku@soc.pidgin.im>
date Mon, 30 Mar 2009 04:15:53 +0000
parents aa85cf759b98 452be048bded
children f42892982e30
comparison
equal deleted inserted replaced
26456:aa85cf759b98 26462:b0a9c48b5f69
890 const gchar *video_plugin = purple_prefs_get_string( 890 const gchar *video_plugin = purple_prefs_get_string(
891 "/purple/media/video/plugin"); 891 "/purple/media/video/plugin");
892 const gchar *video_device = purple_prefs_get_string( 892 const gchar *video_device = purple_prefs_get_string(
893 "/purple/media/video/device"); 893 "/purple/media/video/device");
894 894
895 sendbin = gst_bin_new("purplesendvideobin"); 895 sendbin = gst_bin_new("pidgindefaultvideosrc");
896 src = gst_element_factory_make(video_plugin, "purplevideosource"); 896 src = gst_element_factory_make(video_plugin, "purplevideosource");
897 videoscale = gst_element_factory_make("videoscale", NULL); 897 videoscale = gst_element_factory_make("videoscale", NULL);
898 capsfilter = gst_element_factory_make("capsfilter", NULL); 898 capsfilter = gst_element_factory_make("capsfilter", NULL);
899 899
900 /* It was recommended to set the size <= 352x288 and framerate <= 20 */ 900 /* It was recommended to set the size <= 352x288 and framerate <= 20 */
936 const gchar *audio_device = purple_prefs_get_string( 936 const gchar *audio_device = purple_prefs_get_string(
937 "/purple/media/audio/device"); 937 "/purple/media/audio/device");
938 double input_volume = purple_prefs_get_int( 938 double input_volume = purple_prefs_get_int(
939 "/purple/media/audio/volume/input")/10.0; 939 "/purple/media/audio/volume/input")/10.0;
940 940
941 bin = gst_bin_new("purplesendaudiobin"); 941 bin = gst_bin_new("pidgindefaultaudiosrc");
942 src = gst_element_factory_make("alsasrc", "asrc"); 942 src = gst_element_factory_make("alsasrc", "asrc");
943 volume = gst_element_factory_make("volume", "purpleaudioinputvolume"); 943 volume = gst_element_factory_make("volume", "purpleaudioinputvolume");
944 g_object_set(volume, "volume", input_volume, NULL); 944 g_object_set(volume, "volume", input_volume, NULL);
945 level = gst_element_factory_make("level", "sendlevel"); 945 level = gst_element_factory_make("level", "sendlevel");
946 gst_bin_add_many(GST_BIN(bin), src, volume, level, NULL); 946 gst_bin_add_many(GST_BIN(bin), src, volume, level, NULL);
1018 PURPLE_MEDIA_ELEMENT_AUDIO /* type */ 1018 PURPLE_MEDIA_ELEMENT_AUDIO /* type */
1019 | PURPLE_MEDIA_ELEMENT_SINK 1019 | PURPLE_MEDIA_ELEMENT_SINK
1020 | PURPLE_MEDIA_ELEMENT_ONE_SINK, 1020 | PURPLE_MEDIA_ELEMENT_ONE_SINK,
1021 create_default_audio_sink, /* create */ 1021 create_default_audio_sink, /* create */
1022 }; 1022 };
1023 #endif /* USE_VV */
1023 1024
1024 void 1025 void
1025 pidgin_medias_init(void) 1026 pidgin_medias_init(void)
1026 { 1027 {
1028 #ifdef USE_VV
1027 PurpleMediaManager *manager = purple_media_manager_get(); 1029 PurpleMediaManager *manager = purple_media_manager_get();
1028 g_signal_connect(G_OBJECT(manager), "init-media", 1030 g_signal_connect(G_OBJECT(manager), "init-media",
1029 G_CALLBACK(pidgin_media_new_cb), NULL); 1031 G_CALLBACK(pidgin_media_new_cb), NULL);
1030 1032
1031 purple_debug_info("gtkmedia", "Registering media element types\n"); 1033 purple_debug_info("gtkmedia", "Registering media element types\n");
1032 purple_media_manager_set_active_element(manager, &default_video_src); 1034 purple_media_manager_set_active_element(manager, &default_video_src);
1033 purple_media_manager_set_active_element(manager, &default_video_sink); 1035 purple_media_manager_set_active_element(manager, &default_video_sink);
1034 purple_media_manager_set_active_element(manager, &default_audio_src); 1036 purple_media_manager_set_active_element(manager, &default_audio_src);
1035 purple_media_manager_set_active_element(manager, &default_audio_sink); 1037 purple_media_manager_set_active_element(manager, &default_audio_sink);
1036 } 1038 #endif
1037 1039 }
1038 #endif /* USE_VV */ 1040