Changeset 514 for trunk/core/conf.c

Timestamp:

09/16/08 00:58:42 (5 years ago)

Author:

reyalp

Message:

merged old-trunk 491:502. russian.lng not updated, since it is very out of date in this tree already.

File:

• trunk/core/conf.c (modified) (3 diffs)

trunk/core/conf.c

@@ -63 +63 @@
 static int def_batt_volts_max, def_batt_volts_min;
 static OSD_pos def_histo_pos, def_dof_pos, def_batt_icon_pos, def_space_icon_pos, def_space_hor_pos, def_space_ver_pos, def_batt_txt_pos, def_space_txt_pos, 
-               def_mode_state_pos, def_mode_raw_pos, def_mode_video_pos, def_mode_ev_pos, def_values_pos, def_clock_pos, def_temp_pos;
+               def_mode_state_pos, def_mode_raw_pos, def_mode_video_pos, def_mode_ev_pos, def_values_pos, def_clock_pos, def_ev_video_pos, def_temp_pos;
 static int def_user_menu_vars[USER_MENU_ITEMS] = {0};
 
@@ -362 +362 @@
                         
                         
+    CONF_INFO(215, conf.ev_video_pos,           CONF_DEF_PTR,   ptr:&def_ev_video_pos, NULL),
 };
 #define CONF_NUM (sizeof(conf_info)/sizeof(conf_info[0]))
@@ -448 +449 @@
     def_temp_pos.x=vid_get_bitmap_screen_width()-9*FONT_WIDTH-2;
     def_temp_pos.y=1*FONT_HEIGHT;
+    def_ev_video_pos.x=18;
+    def_ev_video_pos.y=80;
+
 }