Changeset 1818 in orxonox.OLD for orxonox/branches/bensch/orxonox_gui_audio.c

Timestamp:

Apr 14, 2004, 12:38:24 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/bensch: added init to audio and exec.

File:

• orxonox/branches/bensch/orxonox_gui_audio.c (modified) (3 diffs)

orxonox/branches/bensch/orxonox_gui_audio.c

@@ -1 +1 @@
 #include "orxonox_gui.h"
 
-GtkWidget *orxonox_gui_audio_frame (void)
+GtkWidget *orxonox_gui_audio_frame (struct settings *orxonox_settings)
 {
   GtkWidget *frame;
-  GtkWidget *button;
+  GtkWidget *enable_sound_button;
   GtkWidget *label;
   GtkWidget *music_volume_slider;
@@ -15 +15 @@
     {
 
-        button = gtk_check_button_new_with_label ("Enable Sound");
-        /*      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), orxonox_gui_audio_Enable_sound);
-         */
-        gtk_box_pack_start(GTK_BOX (orxonox_gui_audio_vbox), button, TRUE, TRUE, 0);
+        enable_sound_button = gtk_check_button_new_with_label ("Enable Sound");
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (enable_sound_button), orxonox_settings->audio_enable_sound);
+        gtk_box_pack_start(GTK_BOX (orxonox_gui_audio_vbox), enable_sound_button, TRUE, TRUE, 0);
 
         label=gtk_label_new ("Music Volume");
         gtk_box_pack_start (GTK_BOX(orxonox_gui_audio_vbox), label, TRUE, TRUE, 0);
         music_volume_slider = gtk_hscale_new_with_range (0,100,5);
-        /* gtk_range_set_value ( GTK_RANGE (music_volume_slider), compress.video_filter_crop_slider[0]);*/
+        gtk_range_set_value ( GTK_RANGE (music_volume_slider), orxonox_settings->audio_music_volume);
         gtk_range_set_update_policy ( GTK_RANGE (music_volume_slider), GTK_UPDATE_DISCONTINUOUS);
         /* g_signal_connect (GTK_RANGE (music_volume_slider), "valume_changed", G_CALLBACK (video_filter_crop_slider_changed), GINT_TO_POINTER (0));*/
@@ -31 +30 @@
         gtk_box_pack_start (GTK_BOX(orxonox_gui_audio_vbox), label, TRUE, TRUE, 0);
         effects_volume_slider = gtk_hscale_new_with_range (0,100,5);
-        /* gtk_range_set_value ( GTK_RANGE (effects_volume_slider), compress.video_filter_crop_slider[0]);*/
+        gtk_range_set_value ( GTK_RANGE (effects_volume_slider), orxonox_settings->audio_effects_volume);
         gtk_range_set_update_policy ( GTK_RANGE (effects_volume_slider), GTK_UPDATE_DISCONTINUOUS);
         /* g_signal_connect (GTK_RANGE (effects_volume_slider), "valume_changed", G_CALLBACK (video_filter_crop_slider_changed), GINT_TO_POINTER (0));*/