summaryrefslogtreecommitdiff
path: root/navit/support/espeak/wave.h
diff options
context:
space:
mode:
authorPierre Grandin <grandinp@gmail.com>2019-06-04 10:14:17 -0600
committerPierre Grandin <grandinp@gmail.com>2019-06-04 10:14:17 -0600
commit92a5169423e470e4d1a5f4237cb2112266998d28 (patch)
treebee5f13203e0a0d99c8f6962c82deef9fe772b6e /navit/support/espeak/wave.h
parent5304cda121782db8e1e5e4685ae10780cce36394 (diff)
parentda3e1e0c186dfd6c6566f798811a27d001a7fb1d (diff)
downloadnavit-audio.tar.gz
Merge branch 'trunk' into audioaudio
Diffstat (limited to 'navit/support/espeak/wave.h')
-rw-r--r--navit/support/espeak/wave.h15
1 files changed, 3 insertions, 12 deletions
diff --git a/navit/support/espeak/wave.h b/navit/support/espeak/wave.h
index de8bf1ef8..d1b04a3ab 100644
--- a/navit/support/espeak/wave.h
+++ b/navit/support/espeak/wave.h
@@ -1,22 +1,13 @@
#ifndef WAVE_H
#define WAVE_H
-#ifdef _MSC_VER
-
-typedef __int32 int32_t;
-typedef unsigned __int32 uint32_t;
-typedef __int64 int64_t;
-typedef unsigned __int32 uint64_t;
-
-#else
#ifndef PLATFORM_DOS
#include "stdint.h"
#endif
-#endif
extern int option_device_number;
-extern void wave_init();
+extern int wave_init(int samplerate);
// TBD: the arg could be "alsa", "oss",...
extern void* wave_open(const char* the_api);
@@ -24,7 +15,7 @@ extern size_t wave_write(void* theHandler, char* theMono16BitsWaveBuffer, size_t
extern int wave_close(void* theHandler);
extern void wave_flush(void* theHandler);
extern int wave_is_busy(void* theHandler);
-extern void wave_terminate();
+extern void wave_terminate(void);
extern uint32_t wave_get_read_position(void* theHandler);
extern uint32_t wave_get_write_position(void* theHandler);
@@ -47,6 +38,6 @@ extern void clock_gettime2(struct timespec *ts);
extern void add_time_in_ms(struct timespec *ts, int time_in_ms);
// for tests
-extern void *wave_test_get_write_buffer();
+extern void *wave_test_get_write_buffer(void);
#endif