Merge branch 'upstream' into maemo

[navit-package] / navit / speech.c

diff --git a/navit/speech.c b/navit/speech.c
index c9d44f4..c3e77f0 100644 (file)
--- a/navit/speech.c
+++ b/navit/speech.c
@@ -20,28 +20,39 @@
 #include <glib.h>
 #include <string.h>
 #include "debug.h"
+#include "item.h"
 #include "speech.h"
 #include "plugin.h"
 
 struct speech {
        struct speech_priv *priv;
        struct speech_methods meth;
+    struct attr **attrs;
 };
 
+
 struct speech *
-speech_new(const char *type, const char *data) 
+speech_new(struct attr *parent, struct attr **attrs) 
 {
        struct speech *this_;
-       struct speech_priv *(*speech_new)(const char *data, struct speech_methods *meth);
+       struct speech_priv *(*speech_new)(struct speech_methods *meth, struct attr **attrs, struct attr *parent);
+       struct attr *attr;
 
-       dbg(1,"enter type=%s data=%s\n", type, data);
-        speech_new=plugin_get_speech_type(type);
+    attr=attr_search(attrs, NULL, attr_type);
+       if (! attr) {
+               dbg(0,"type missing\n");
+               return NULL;
+       }
+       dbg(1,"type='%s'\n", attr->u.str);
+        speech_new=plugin_get_speech_type(attr->u.str);
        dbg(1,"new=%p\n", speech_new);
         if (! speech_new) {
+               dbg(0,"wrong type '%s'\n", attr->u.str);
                 return NULL;
        }
        this_=g_new0(struct speech, 1);
-       this_->priv=speech_new(data, &this_->meth);
+       this_->priv=speech_new(&this_->meth, attrs, parent);
+    this_->attrs=attr_list_dup(attrs);
        dbg(1, "say=%p\n", this_->meth.say);
        dbg(1,"priv=%p\n", this_->priv);
        if (! this_->priv) {
@@ -49,6 +60,7 @@ speech_new(const char *type, const char *data)
                return NULL;
        }
        dbg(1,"return %p\n", this_);
+       
        return this_;
 }
 
@@ -58,3 +70,65 @@ speech_say(struct speech *this_, const char *text)
        dbg(1, "this_=%p text='%s' calling %p\n", this_, text, this_->meth.say);
        return (this_->meth.say)(this_->priv, text);
 }
+
+/**
+ * @brief Gets an attribute from a speech plugin
+ *
+ * @param this_ The speech plugin the attribute should be read from
+ * @param type The type of the attribute to be read
+ * @param attr Pointer to an attrib-structure where the attribute should be written to
+ * @param iter (NOT IMPLEMENTED) Used to iterate through all attributes of a type. Set this to NULL to get the first attribute, set this to an attr_iter to get the next attribute
+ * @return True if the attribute type was found, false if not
+ */
+
+int
+speech_get_attr(struct speech *this_, enum attr_type type, struct attr *attr, struct attr_iter *iter)
+{
+    return attr_generic_get_attr(this_->attrs, NULL, type, attr, iter);
+}
+
+/**
+ * @brief Tries to estimate how long it will take to speak a certain string
+ *
+ * This function tries to estimate how long it will take to speak a certain string
+ * passed in str. It relies on the "characters per second"-value passed from the
+ * configuration.
+ *
+ * @param this_ The speech whose speed should be used
+ * @param str The string that should be estimated
+ * @return Time in tenth of seconds or -1 on error
+ */
+int
+speech_estimate_duration(struct speech *this_, char *str)
+{
+       int count;
+       struct attr cps_attr;
+   
+       if (!speech_get_attr(this_,attr_cps,&cps_attr,NULL)) {
+               return -1;
+       }
+
+       count = strlen(str);
+       
+       return (count * 10) / cps_attr.u.num;
+}
+
+/**
+ * @brief Sets an attribute from an speech plugin
+ *
+ * This sets an attribute of a speech plugin, overwriting an attribute of the same type if it
+ * already exists. This function also calls all the callbacks that are registred
+ * to be called when attributes change.
+ *
+ * @param this_ The speech plugin to set the attribute of
+ * @param attr The attribute to set
+ * @return True if the attr could be set, false otherwise
+ */
+
+int
+speech_set_attr(struct speech *this_, struct attr *attr)
+{
+    this_->attrs=attr_generic_set_attr(this_->attrs, attr);
+    //callback_list_call_attr_2(this_->attr_cbl, attr->type, this_, attr);
+    return 1;
+}