diff options
| author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-01-24 16:02:33 +0000 |
|---|---|---|
| committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-01-24 16:02:33 +0000 |
| commit | e0aa72db6eaec68d938898c5c8241261e572a42a (patch) | |
| tree | d48a210e18ff5e50e73a1dc9d8d101dc8e77c1d2 /navit/speech | |
| parent | 80b5228026ba43de9855a7f9e0ad53fef2396fe0 (diff) | |
| download | navit-svn-e0aa72db6eaec68d938898c5c8241261e572a42a.tar.gz | |
Fix:speech_espeak:MSVC fixes|Thanks chollya
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@3977 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/speech')
| -rw-r--r-- | navit/speech/espeak/speak.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/navit/speech/espeak/speak.c b/navit/speech/espeak/speak.c index 12d2eedd..8bf318c2 100644 --- a/navit/speech/espeak/speak.c +++ b/navit/speech/espeak/speak.c @@ -231,10 +231,11 @@ static LRESULT CALLBACK speech_message_handler( HWND hwnd, UINT uMsg, WPARAM wPa break; case MM_WOM_DONE: { - dbg(2, "Wave buffer done\n"); WAVEHDR *WaveHeader = (WAVEHDR *)lParam; + struct speech_priv* sp_priv; + dbg(2, "Wave buffer done\n"); - struct speech_priv* sp_priv = (struct speech_priv*)WaveHeader->dwUser; + sp_priv = (struct speech_priv*)WaveHeader->dwUser; sp_priv->free_buffers = g_list_append(sp_priv->free_buffers, WaveHeader); if ( sp_priv->state != state_speaking_phase_3) @@ -294,12 +295,13 @@ static void speech_message_dispatcher( struct speech_priv * sp_priv) static void create_buffers(struct speech_priv *sp_priv) { int buffer_counter; + char *buffer_head; SYSTEM_INFO system_info; GetSystemInfo (&system_info); - char *buffer_head = VirtualAlloc(0, system_info.dwPageSize * BUFFERS, MEM_RESERVE, PAGE_NOACCESS); + buffer_head = VirtualAlloc(0, system_info.dwPageSize * BUFFERS, MEM_RESERVE, PAGE_NOACCESS); for (buffer_counter = 0; buffer_counter < BUFFERS; buffer_counter++) { @@ -323,6 +325,7 @@ static DWORD startThread( LPVOID sp_priv) TCHAR *g_szClassName = TEXT("SpeechQueue"); WNDCLASS wc; HWND hwnd; + HWND hWndParent; memset(&wc, 0 , sizeof(WNDCLASS)); @@ -336,7 +339,7 @@ static DWORD startThread( LPVOID sp_priv) return 1; } - HWND hWndParent = NULL; + hWndParent = NULL; #ifndef HAVE_API_WIN32_CE hWndParent = HWND_MESSAGE; #endif @@ -382,8 +385,8 @@ static DWORD startThread( LPVOID sp_priv) static int espeak_say(struct speech_priv *this, const char *text) { - dbg(1, "Speak: '%s'\n", text); char *phrase = g_strdup(text); + dbg(1, "Speak: '%s'\n", text); if (!PostMessage(this->h_queue, msg_say, (WPARAM)this, (LPARAM)phrase)) { |