Changeset 1818 in orxonox.OLD

Timestamp:

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

Author:

bensch

Message:

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

Location:

orxonox/branches/bensch

Files:

• orxonox_gui.c (modified) (2 diffs)
• orxonox_gui_audio.c (modified) (3 diffs)
• orxonox_gui_audio.h (modified) (1 diff)
• orxonox_gui_exec.c (modified) (2 diffs)
• orxonox_gui_exec.h (modified) (1 diff)

orxonox/branches/bensch/orxonox_gui.c

@@ -44 +44 @@
         gtk_box_pack_start(GTK_BOX(hbox_video_audio), orxonox_gui_video_frame(orxonox_settings), TRUE, TRUE, 0);        
         
-        gtk_box_pack_start(GTK_BOX(hbox_video_audio), orxonox_gui_audio_frame(), TRUE, TRUE, 0);        
+        gtk_box_pack_start(GTK_BOX(hbox_video_audio), orxonox_gui_audio_frame(orxonox_settings), TRUE, TRUE, 0);        
       }
       gtk_box_pack_start (GTK_BOX (vbox_main), hbox_video_audio, TRUE, TRUE, 0);
@@ -56 +56 @@
         */
         {
-          gtk_box_pack_start(GTK_BOX(hbox_view_exec), orxonox_gui_exec_frame(), TRUE, TRUE, 0); 
+          gtk_box_pack_start(GTK_BOX(hbox_view_exec), orxonox_gui_exec_frame(orxonox_settings), TRUE, TRUE, 0); 
 
         }

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));*/

orxonox/branches/bensch/orxonox_gui_audio.h

@@ -2 +2 @@
 #define _ORXONOX_GUI_AUDIO_H
 
-GtkWidget *orxonox_gui_audio_frame (void);
+GtkWidget *orxonox_gui_audio_frame (struct settings *orxonox_settings);
 
 #endif /* _ORXONOX_GUI_AUDIO_H */

orxonox/branches/bensch/orxonox_gui_exec.c

@@ -1 +1 @@
 #include "orxonox_gui.h"
 
-GtkWidget *orxonox_gui_exec_frame (void)
+GtkWidget *orxonox_gui_exec_frame (struct settings *orxonox_settings)
 {
   GtkWidget *frame;
-  GtkWidget *save_button;
-  GtkWidget *show_button;
+  GtkWidget *save_settings_button;
+  GtkWidget *show_menu_button;
   GtkWidget *start_button;
   GtkWidget *quit_button;
@@ -16 +16 @@
 
         start_button = gtk_button_new_with_label ("Start");
-        /*      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), orxonox_fullscreen);
-         */
         gtk_box_pack_start(GTK_BOX (orxonox_gui_exec_vbox), start_button, TRUE, TRUE, 5);
 
-        save_button = gtk_check_button_new_with_label ("Save Settings");
-        /*      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), orxonox_gui_audio_Enable_sound);
-         */
-        gtk_box_pack_start(GTK_BOX (orxonox_gui_exec_vbox), save_button, TRUE, TRUE, 0);
+        save_settings_button = gtk_check_button_new_with_label ("Save Settings");
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (save_settings_button), orxonox_settings->exec_save_settings);
+        gtk_box_pack_start(GTK_BOX (orxonox_gui_exec_vbox), save_settings_button, TRUE, TRUE, 0);
 
-        show_button = gtk_check_button_new_with_label ("Always show this Menu");
-        /*      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), orxonox_gui_audio_Enable_sound);
-         */
-        gtk_box_pack_start(GTK_BOX (orxonox_gui_exec_vbox), show_button, TRUE, TRUE, 0);
+        show_menu_button = gtk_check_button_new_with_label ("Always show this Menu");
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (show_menu_button), orxonox_settings->exec_show_menu);
+        gtk_box_pack_start(GTK_BOX (orxonox_gui_exec_vbox), show_menu_button, TRUE, TRUE, 0);
         
 

orxonox/branches/bensch/orxonox_gui_exec.h

@@ -2 +2 @@
 #define _ORXONOX_GUI_EXEC_H
 
-GtkWidget *orxonox_gui_exec_frame (void);
+GtkWidget *orxonox_gui_exec_frame (struct settings *orxonox_settings);
 
 #endif /* _ORXONOX_GUI_EXEC_H */