Index: talkbox/trunk/tools/genlang
===================================================================
--- talkbox.orig/trunk/tools/genlang	2007-10-09 22:45:44.000000000 +0200
+++ talkbox/trunk/tools/genlang	2007-10-10 11:36:18.000000000 +0200
@@ -529,6 +529,20 @@
 /* this contains the concatenation of all strings, separated by \\0 chars */
 extern const unsigned char language_builtin[];
 
+#include "${prefix}_enum.h"
+
+MOO
+    ;
+
+    close(HFILE);
+
+    open(HFILE, ">${prefix}_enum.h") ||
+        die "couldn't create file ${prefix}_enum.h\n";
+
+    print HFILE <<MOO
+/* This file was automatically generated using genlang */
+#ifndef _LANG_ENUM_H_
+#define _LANG_ENUM_H_
 /* The enum below contains all available strings */
 enum \{
 MOO
@@ -573,8 +587,13 @@
         printf HFILE ("    %s,\n", $name);
     }
 
-    # Output end of enum
-    print HFILE "\n};\n/* end of generated enum list */\n";
+    # Output end of lang_enum.h
+    print HFILE <<MOO
+};
+/* end of generated enum list */
+#endif /* _LANG_ENUM_H_ */
+MOO
+    ;
 
     # Output the target phrases for the source file
     for $i (1 .. $idcount) {
Index: talkbox/trunk/tools/configure
===================================================================
--- talkbox.orig/trunk/tools/configure	2007-10-09 22:45:44.000000000 +0200
+++ talkbox/trunk/tools/configure	2007-10-10 11:36:18.000000000 +0200
@@ -1895,7 +1895,8 @@
 
 clean:
 	\$(SILENT)echo Cleaning build directory
-	\$(SILENT)rm -rf rockbox.zip TAGS @APPS@ firmware comsim sim lang.[ch]\
+	\$(SILENT)rm -rf rockbox.zip TAGS @APPS@ firmware comsim sim \
+	          lang.[ch] lang_enum.h \
                   manual *.pdf *.a credits.raw @OUTPUT@ bitmaps pluginbitmaps \
                   @ARCHOSROM@ @FLASHFILE@ UI256.bmp rockbox-full.zip \
 	          html txt rockbox-manual*.zip sysfont.h rockbox-info.txt \
Index: talkbox/trunk/apps/plugin.c
===================================================================
--- talkbox.orig/trunk/apps/plugin.c	2007-10-10 00:01:24.000000000 +0200
+++ talkbox/trunk/apps/plugin.c	2007-10-10 11:37:35.000000000 +0200
@@ -236,6 +238,18 @@
     mkdir,
     rmdir,
 
+    /* talking */
+    is_voice_queued,
+    talk_id,
+    talk_file,
+    talk_number,
+    talk_value,
+    talk_spell,
+    talk_menus_enabled,
+    talk_disable_menus,
+    talk_enable_menus,
+    do_shutup,
+
     /* kernel/ system */
     PREFIX(sleep),
     yield,
@@ -515,8 +529,6 @@
     flush_icache,
     invalidate_icache,
 #endif
-    talk_disable_menus,
-    talk_enable_menus,
 
     button_queue_count,
 
Index: talkbox/trunk/apps/plugin.h
===================================================================
--- talkbox.orig/trunk/apps/plugin.h	2007-10-10 00:01:24.000000000 +0200
+++ talkbox/trunk/apps/plugin.h	2007-10-10 11:36:53.000000000 +0200
@@ -50,6 +50,9 @@
 #include "audio.h"
 #include "mp3_playback.h"
 #include "talk.h"
+#ifdef PLUGIN
+#include "lang_enum.h"
+#endif
 #ifdef RB_PROFILE
 #include "profile.h"
 #endif
@@ -112,12 +115,12 @@
 #define PLUGIN_MAGIC 0x526F634B /* RocK */
 
 /* increase this every time the api struct changes */
-#define PLUGIN_API_VERSION 80
+#define PLUGIN_API_VERSION 81
 
 /* update this to latest version if a change to the api struct breaks
    backwards compatibility (and please take the opportunity to sort in any
    new function which are "waiting" at the end of the function table) */
-#define PLUGIN_MIN_API_VERSION 76
+#define PLUGIN_MIN_API_VERSION 81
 
 /* plugin return codes */
 enum plugin_status {
@@ -324,6 +329,18 @@
     int (*mkdir)(const char *name);
     int (*rmdir)(const char *name);
 
+    /* talking */
+    bool (*is_voice_queued)(void);
+    int (*talk_id)(long id, bool enqueue);
+    int (*talk_file)(const char* filename, bool enqueue);
+    int (*talk_number)(long n, bool enqueue);
+    int (*talk_value)(long n, int unit, bool enqueue);
+    int (*talk_spell)(const char* spell, bool enqueue);
+    bool (*talk_menus_enabled)(void);
+    void (*talk_disable_menus)(void);
+    void (*talk_enable_menus)(void);
+    int (*do_shutup)(void);
+
     /* kernel/ system */
     void (*PREFIX(sleep))(int ticks);
     void (*yield)(void);
@@ -633,9 +650,6 @@
     void (*invalidate_icache)(void);
 #endif
 
-    void (*talk_disable_menus)(void);
-    void (*talk_enable_menus)(void);
-
     int (*button_queue_count)(void);
 };