Changeset 1817 in orxonox.OLD for orxonox/branches/bensch/orxonox_gui.c

Timestamp:

Apr 14, 2004, 12:25:51 AM (21 years ago)

Author:

bensch

Message:

orxonox/branches/bensch: added default settings and video-init

File:

• orxonox/branches/bensch/orxonox_gui.c (modified) (4 diffs)

orxonox/branches/bensch/orxonox_gui.c

@@ -3 +3 @@
 #include "orxonox_gui_audio.h"
 #include "orxonox_gui_exec.h"
-int verbose;
-int close_window = 0;
-int app_drawed = 0;
+int verbose = 1;
 
 
@@ -16 +14 @@
 int main( int argc, char *argv[] )
   {
-
     GtkWidget *window;
     GtkWidget *vbox_main;
     GtkWidget *hbox_video_audio;
     GtkWidget *hbox_view_exec;
+    struct settings *orxonox_settings;
+    int option_count = 7; /* important: look that this is greater than options in 'struct settings' */
+
+    /* Initialize all settings */
+    
+    orxonox_settings = malloc (option_count*sizeof (int));
+
+    orxonox_gui_file_default (orxonox_settings);
+
 
     gtk_init (&argc, &argv);
@@ -36 +42 @@
       
       {
-        gtk_box_pack_start(GTK_BOX(hbox_video_audio), orxonox_gui_video_frame(), TRUE, TRUE, 0);        
+        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);        
@@ -60 +66 @@
     gtk_widget_show_all  (window);
     
-    app_drawed =1;
     gtk_main ();