Changeset 268 for trunk

Timestamp:

03/12/10 09:06:59 (3 years ago)

Author:

CHDKLover

Message:

Erweiterung des LUA Befehlssatzes um in LUA Skripten Kurven einfach zu nutzen:

• set_curve_file(<file>) Setzt eine neue Kurvendatei, beginnt <file> nicht mit "A/" an wir das std CURVE Verzeichnis als Referenzverzeichnis genommen
• get_curve_file() Ließt die aktuelle Kurvendatei aus
• get_curve_state() Ließt den aktuellen Kurvenstatus aus

set_curve_state() gab es schon

Location:

trunk/core

Files:

• curves.c (modified) (1 diff)
• curves.h (modified) (1 diff)
• luascript.c (modified) (2 diffs)

trunk/core/curves.c

@@ -103 +103 @@
         if((value>=0) && (value<=4)) conf.curve_enable=value;
         curve_init_mode();
+}
+
+void curve_set_file(const char *s) {
+    int l;
+        if(s) {
+        if(strncmp(s,"A/",2)==0) strncpy(conf.curve_file,s,99);
+        else {
+            l=strlen(CURVE_DIR);
+            strcpy(conf.curve_file,CURVE_DIR);
+            conf.curve_file[l]='/';
+            strncpy(&conf.curve_file[l+1],s,99-l-1);
+        }
+        conf.curve_file[99]=0x0;
+        curve_init_mode();
+        }
 }
 

trunk/core/curves.h

@@ -7 +7 @@
 //-------------------------------------------------------------------
 extern void curve_set_mode();
+extern void curve_set_file();
 extern void curve_init_mode();
 extern void curve_apply();

trunk/core/luascript.c

@@ -24 +24 @@
   curve_set_mode(value);
   return 0;
+}
+
+static int luaCB_get_curve_state( lua_State* L )
+{
+  lua_pushnumber(L,conf.curve_enable);
+  return 1;
+}
+
+static int luaCB_set_curve_file( lua_State* L )
+{
+  size_t l;
+  const char *s = luaL_checklstring(L, 1, &l);
+  curve_set_file(s);
+  return 0;
+}
+
+static int luaCB_get_curve_file( lua_State* L )
+{
+  lua_pushstring(L,conf.curve_file);
+  return 1;
 }
 #endif
@@ -1444 +1464 @@
 #ifdef OPT_CURVES
    FUNC(set_curve_state);
+   FUNC(get_curve_state);
+   FUNC(set_curve_file);
+   FUNC(get_curve_file);
 #endif
 // get levent definition by name or id, nil if not found