Changeset 1534 for branches/reyalp-flt/core/conf.c

Timestamp:

01/08/12 12:12:13 (17 months ago)

Author:

philmoz

Message:

Re-work of new module system for review.

File:

• branches/reyalp-flt/core/conf.c (modified) (9 diffs)

branches/reyalp-flt/core/conf.c

@@ -7 +7 @@
 #include "raw.h"
 #include "modules.h"
+#include "module_load.h"
 #include "gui_draw.h"
 #include "gui_osd.h"
@@ -38 +39 @@
 
 //-------------------------------------------------------------------
-Conf conf;
+Conf conf = { MAKE_API_VERSION(1,0) };
 
 int state_shooting_progress = SHOOTING_PROGRESS_NONE;
@@ -69 +70 @@
 static void conf_change_menu_symbol_rbf_file();
 static void conf_change_alt_mode_button();
-static void conf_change_grid_file();
 static void conf_change_video_bitrate();
 static void conf_change_dng_ext();
@@ -148 +148 @@
 /* !!! Do NOT change ID for items defined already! Append a new one at the end! !!! */
     CONF_INFO(  1, conf.show_osd,               CONF_DEF_VALUE, i:1, NULL),
-    CONF_INFO(  2, conf.save_raw,               CONF_DEF_VALUE, i:0, NULL),
+    CONF_INFO(  2, conf.save_raw,               CONF_DEF_VALUE, i:0, conf_change_dng),
     CONF_INFO(  3, conf.script_shoot_delay,     CONF_DEF_VALUE, i:0, NULL),
     CONF_INFO(  4, conf.show_histo,             CONF_DEF_VALUE, i:0, NULL),
@@ -216 +216 @@
     CONF_INFO( 67, conf.alt_prevent_shutdown,   CONF_DEF_VALUE, i:ALT_PREVENT_SHUTDOWN_ALT, conf_update_prevent_shutdown),
     CONF_INFO( 68, conf.show_grid_lines,        CONF_DEF_VALUE, i:0, NULL),
-    CONF_INFO( 69, conf.grid_lines_file,        CONF_CHAR_PTR,   ptr:"", conf_change_grid_file),
+    CONF_INFO( 69, conf.grid_lines_file,        CONF_CHAR_PTR,   ptr:"", NULL),
     CONF_INFO( 70, conf.raw_nr,                 CONF_DEF_VALUE, i:NOISE_REDUCTION_AUTO_CANON, NULL),
     CONF_INFO( 71, conf.grid_force_color,       CONF_DEF_VALUE, i:0, NULL),
@@ -426 +426 @@
     case  66: conf_change_menu_rbf_file(); break;
     case  67: conf_update_prevent_shutdown(); break;
-    case  69: conf_change_grid_file(); break;
     case 101: conf_change_video_bitrate(); break;
     case 183: conf_change_menu_symbol_rbf_file(); break;
     case 194: conf_change_script_file(); break;
+    case 2:
     case 226: conf_change_dng(); break;
     case 235: conf_change_dng_ext(); break;
@@ -477 +477 @@
 }
 
-static void conf_change_grid_file() {
-    grid_lines_load(conf.grid_lines_file);
-}
-
 static void conf_change_video_bitrate() {
     shooting_video_bitrate_change(conf.video_bitrate);
@@ -487 +483 @@
 void conf_change_dng(void){
 #if DNG_SUPPORT
- if (conf.dng_raw) {
+ if (conf.save_raw && conf.dng_raw) {
         if ( !module_dng_load(LIBDNG_OWNED_BY_RAW) )
                 return;
@@ -668 +664 @@
                    memcpy(conf_info[i].var, buf+offs, size);
                    conf_info_func(conf_info[i].id);
-                   //if (conf_info[i].func) {
-                   //    conf_info[i].func();
-                   //}
                 }
                 offs += size;