Converting speech.c to new speechd api

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@55 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/src/phrase.c b/navit/src/phrase.c
index f1f18af..761de5a 100644 (file)
--- a/navit/src/phrase.c
+++ b/navit/src/phrase.c
@@ -21,6 +21,6 @@ phrase_route_calculated(void *speech, void *route)
 
         eta=route_get_eta(route);
 
-        speech_sayf(speech,"Die Route wurde berechnet. Geschätzte Ankunftszeit %d Uhr %d  Entfernung %4.0f Kilometer", eta->tm_hour,eta->tm_min,route_get_len(route)/1000);
+        speech_sayf(speech,"Die Route wurde berechnet, geschätzte Ankunftszeit %d Uhr %d  Entfernung %4.0f Kilometer", eta->tm_hour,eta->tm_min,route_get_len(route)/1000);
 
 }

diff --git a/navit/src/popup.c b/navit/src/popup.c
index b55ed86..6aaaef2 100644 (file)
--- a/navit/src/popup.c
+++ b/navit/src/popup.c
@@ -118,6 +118,7 @@ popup_set_position(struct popup_item *item, void *param)
        struct popup_item *ref=param;
        struct popup *popup=ref->param;
        printf("Position %s\n", ref->text);
+       g_assert(popup->co->vehicle != NULL);
        vehicle_set_position(popup->co->vehicle, &popup->c);    
 }
 

diff --git a/navit/src/speech.c b/navit/src/speech.c
index 0cb39e1..fa9ab33 100644 (file)
--- a/navit/src/speech.c
+++ b/navit/src/speech.c
@@ -1,5 +1,5 @@
 /* speechd simple client program
- * CVS revision: $Id: speech.c,v 1.3 2005-12-02 13:26:31 martin-s Exp $
+ * CVS revision: $Id: speech.c,v 1.4 2006-01-03 21:37:48 martin-s Exp $
  * Author: Tomas Cerha <cerha@brailcom.cz> */
 
 #include <sys/types.h>
@@ -18,25 +18,24 @@
 #include "speech.h"
 
 struct speech {
-       int sockfd;
+#ifdef HAVE_LIBSPEECHD
+       SPDConnection *conn;
+#endif
 };
 
 struct speech *
 speech_new(void) {
 #ifdef HAVE_LIBSPEECHD
        struct speech *this;
-       int sockfd;
+       SPDConnection *conn;
 
-#ifdef SPD_FATAL
-       sockfd = spd_open("map","main",NULL);
-#else
-       sockfd = spd_init("map","main");
-#endif
-       if (sockfd == 0) 
+       conn = spd_open("navit","main",NULL,SPD_MODE_SINGLE);
+       if (! conn) 
                return NULL;
        this=g_new(struct speech,1);
        if (this) {
-               this->sockfd=sockfd;
+               this->conn=conn;
+               spd_set_punctuation(conn, SPD_PUNCT_NONE);
        }
        return this;
 #else
@@ -49,7 +48,7 @@ speech_say(struct speech *this, char *text) {
 #ifdef HAVE_LIBSPEECHD
        int err;
 
-       err = spd_sayf(this->sockfd, 2, text);
+       err = spd_sayf(this->conn, SPD_MESSAGE, text);
        if (err != 1)
                return 1;
 #endif
@@ -72,7 +71,7 @@ speech_sayf(struct speech *this, char *format, ...) {
 int 
 speech_destroy(struct speech *this) {
 #ifdef HAVE_LIBSPEECHD
-       spd_close(this->sockfd);
+       spd_close(this->conn);
        g_free(this);
 #endif
        return 0;