Mercurial > pidgin.yaz

comparison pidgin/gtkmedia.c @ 26497:da3f44d6cd52

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change volume preference and make sure it exists.
author Mike Ruprecht <maiku@soc.pidgin.im>
date Fri, 03 Apr 2009 06:11:34 +0000
parents a198f064a42c
children beb22a90bf5d
comparison
equal deleted inserted replaced
26496:a820c03b9d4e 26497:da3f44d6cd52
571 571
572 static void 572 static void
573 pidgin_media_input_volume_changed(GtkRange *range, PurpleMedia *media) 573 pidgin_media_input_volume_changed(GtkRange *range, PurpleMedia *media)
574 { 574 {
575 double val = (double)gtk_range_get_value(GTK_RANGE(range)); 575 double val = (double)gtk_range_get_value(GTK_RANGE(range));
576 purple_prefs_set_int("/purple/media/audio/volume/input", val); 576 purple_prefs_set_int("/pidgin/media/audio/volume/input", val);
577 val /= 10.0; 577 val /= 10.0;
578 purple_media_set_input_volume(media, NULL, val); 578 purple_media_set_input_volume(media, NULL, val);
579 } 579 }
580 580
581 static void 581 static void
582 pidgin_media_output_volume_changed(GtkRange *range, PurpleMedia *media) 582 pidgin_media_output_volume_changed(GtkRange *range, PurpleMedia *media)
583 { 583 {
584 double val = (double)gtk_range_get_value(GTK_RANGE(range)); 584 double val = (double)gtk_range_get_value(GTK_RANGE(range));
585 purple_prefs_set_int("/purple/media/audio/volume/output", val); 585 purple_prefs_set_int("/pidgin/media/audio/volume/output", val);
586 val /= 10.0; 586 val /= 10.0;
587 purple_media_set_output_volume(media, NULL, NULL, val); 587 purple_media_set_output_volume(media, NULL, NULL, val);
588 } 588 }
589 589
590 static void 590 static void
702 if (type & PURPLE_MEDIA_RECV_AUDIO) { 702 if (type & PURPLE_MEDIA_RECV_AUDIO) {
703 GtkWidget *volume = gtk_hscale_new_with_range(0.0, 100.0, 5.0); 703 GtkWidget *volume = gtk_hscale_new_with_range(0.0, 100.0, 5.0);
704 gtk_range_set_increments(GTK_RANGE(volume), 5.0, 25.0); 704 gtk_range_set_increments(GTK_RANGE(volume), 5.0, 25.0);
705 gtk_range_set_value(GTK_RANGE(volume), 705 gtk_range_set_value(GTK_RANGE(volume),
706 purple_prefs_get_int( 706 purple_prefs_get_int(
707 "/purple/media/audio/volume/output")); 707 "/pidgin/media/audio/volume/output"));
708 gtk_scale_set_draw_value(GTK_SCALE(volume), FALSE); 708 gtk_scale_set_draw_value(GTK_SCALE(volume), FALSE);
709 g_signal_connect (G_OBJECT(volume), "value-changed", 709 g_signal_connect (G_OBJECT(volume), "value-changed",
710 G_CALLBACK(pidgin_media_output_volume_changed), 710 G_CALLBACK(pidgin_media_output_volume_changed),
711 media); 711 media);
712 gtk_box_pack_end(GTK_BOX(recv_widget), 712 gtk_box_pack_end(GTK_BOX(recv_widget),
737 737
738 volume = gtk_hscale_new_with_range(0.0, 100.0, 5.0); 738 volume = gtk_hscale_new_with_range(0.0, 100.0, 5.0);
739 gtk_range_set_increments(GTK_RANGE(volume), 5.0, 25.0); 739 gtk_range_set_increments(GTK_RANGE(volume), 5.0, 25.0);
740 gtk_range_set_value(GTK_RANGE(volume), 740 gtk_range_set_value(GTK_RANGE(volume),
741 purple_prefs_get_int( 741 purple_prefs_get_int(
742 "/purple/media/audio/volume/input")); 742 "/pidgin/media/audio/volume/input"));
743 gtk_scale_set_draw_value(GTK_SCALE(volume), FALSE); 743 gtk_scale_set_draw_value(GTK_SCALE(volume), FALSE);
744 g_signal_connect (G_OBJECT(volume), "value-changed", 744 g_signal_connect (G_OBJECT(volume), "value-changed",
745 G_CALLBACK (pidgin_media_input_volume_changed), 745 G_CALLBACK (pidgin_media_input_volume_changed),
746 media); 746 media);
747 gtk_box_pack_end(GTK_BOX(send_widget), 747 gtk_box_pack_end(GTK_BOX(send_widget),
1014 const gchar *session_id, const gchar *participant) 1014 const gchar *session_id, const gchar *participant)
1015 { 1015 {
1016 GstElement *bin, *src, *volume, *level; 1016 GstElement *bin, *src, *volume, *level;
1017 GstPad *pad, *ghost; 1017 GstPad *pad, *ghost;
1018 double input_volume = purple_prefs_get_int( 1018 double input_volume = purple_prefs_get_int(
1019 "/purple/media/audio/volume/input")/10.0; 1019 "/pidgin/media/audio/volume/input")/10.0;
1020 1020
1021 src = gst_element_factory_make("gconfaudiosrc", NULL); 1021 src = gst_element_factory_make("gconfaudiosrc", NULL);
1022 if (src == NULL) 1022 if (src == NULL)
1023 src = gst_element_factory_make("autoaudiosrc", NULL); 1023 src = gst_element_factory_make("autoaudiosrc", NULL);
1024 if (src == NULL) 1024 if (src == NULL)
1053 const gchar *session_id, const gchar *participant) 1053 const gchar *session_id, const gchar *participant)
1054 { 1054 {
1055 GstElement *bin, *sink, *volume, *level, *queue; 1055 GstElement *bin, *sink, *volume, *level, *queue;
1056 GstPad *pad, *ghost; 1056 GstPad *pad, *ghost;
1057 double output_volume = purple_prefs_get_int( 1057 double output_volume = purple_prefs_get_int(
1058 "/purple/media/audio/volume/output")/10.0; 1058 "/pidgin/media/audio/volume/output")/10.0;
1059 1059
1060 sink = gst_element_factory_make("gconfaudiosink", NULL); 1060 sink = gst_element_factory_make("gconfaudiosink", NULL);
1061 if (sink == NULL) 1061 if (sink == NULL)
1062 sink = gst_element_factory_make("autoaudiosink",NULL); 1062 sink = gst_element_factory_make("autoaudiosink",NULL);
1063 if (sink == NULL) { 1063 if (sink == NULL) {
1137 purple_debug_info("gtkmedia", "Registering media element types\n"); 1137 purple_debug_info("gtkmedia", "Registering media element types\n");
1138 purple_media_manager_set_active_element(manager, default_video_src); 1138 purple_media_manager_set_active_element(manager, default_video_src);
1139 purple_media_manager_set_active_element(manager, default_video_sink); 1139 purple_media_manager_set_active_element(manager, default_video_sink);
1140 purple_media_manager_set_active_element(manager, default_audio_src); 1140 purple_media_manager_set_active_element(manager, default_audio_src);
1141 purple_media_manager_set_active_element(manager, default_audio_sink); 1141 purple_media_manager_set_active_element(manager, default_audio_sink);
1142
1143 purple_prefs_add_none("/pidgin/media");
1144 purple_prefs_add_none("/pidgin/media/audio");
1145 purple_prefs_add_none("/pidgin/media/audio/volume");
1146 purple_prefs_add_int("/pidgin/media/audio/volume/input", 10);
1147 purple_prefs_add_int("/pidgin/media/audio/volume/output", 10);
1142 #endif 1148 #endif
1143 } 1149 }
1144 1150