mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-11-01 21:58:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move the clock_gettime2 and add_time_in_ms implementation to event.c to avoid code duplication.

Browse Source
This commit is contained in:
Reece H. Dunn
2015-12-31 16:51:46 +00:00
parent 56bfebe2fd
commit 2e88afeaa0
4 changed files with 27 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libespeak-ng/event.c
+27
View File
@@ -478,3 +478,30 @@ void event_terminate()
thread_inited = 0;
}
}
enum { ONE_BILLION = 1000000000 };
void clock_gettime2(struct timespec *ts)
{
struct timeval tv;
if (!ts)
return;
assert(gettimeofday(&tv, NULL) != -1);
ts->tv_sec = tv.tv_sec;
ts->tv_nsec = tv.tv_usec*1000;
}
void add_time_in_ms(struct timespec *ts, int time_in_ms)
{
if (!ts)
return;
uint64_t t_ns = (uint64_t)ts->tv_nsec + 1000000 * (uint64_t)time_in_ms;
while (t_ns >= ONE_BILLION) {
ts->tv_sec += 1;
t_ns -= ONE_BILLION;
}
ts->tv_nsec = (long int)t_ns;
}
src/libespeak-ng/wave.c
-27
View File
@@ -46,8 +46,6 @@ struct timespec {
};
#endif
enum { ONE_BILLION = 1000000000 };
#ifdef USE_PORTAUDIO
#include "portaudio.h"
@@ -905,28 +903,3 @@ int wave_get_remaining_time(uint32_t sample, uint32_t *time)
}
#endif
void clock_gettime2(struct timespec *ts)
{
struct timeval tv;
if (!ts)
return;
assert(gettimeofday(&tv, NULL) != -1);
ts->tv_sec = tv.tv_sec;
ts->tv_nsec = tv.tv_usec*1000;
}
void add_time_in_ms(struct timespec *ts, int time_in_ms)
{
if (!ts)
return;
uint64_t t_ns = (uint64_t)ts->tv_nsec + 1000000 * (uint64_t)time_in_ms;
while (t_ns >= ONE_BILLION) {
ts->tv_sec += 1;
t_ns -= ONE_BILLION;
}
ts->tv_nsec = (long int)t_ns;
}
src/libespeak-ng/wave_pulse.c
-31
View File
@@ -44,8 +44,6 @@
#endif
#include "wave.h"
enum { ONE_BILLION = 1000000000 };
enum {
/* return value */
PULSE_OK = 0,
@@ -669,32 +667,3 @@ void *wave_test_get_write_buffer()
}
#endif
#ifndef USE_PORTAUDIO
void clock_gettime2(struct timespec *ts)
{
struct timeval tv;
if (!ts)
return;
assert(gettimeofday(&tv, NULL) != -1);
ts->tv_sec = tv.tv_sec;
ts->tv_nsec = tv.tv_usec*1000;
}
void add_time_in_ms(struct timespec *ts, int time_in_ms)
{
if (!ts)
return;
uint64_t t_ns = (uint64_t)ts->tv_nsec + 1000000 * (uint64_t)time_in_ms;
while (t_ns >= ONE_BILLION) {
ts->tv_sec += 1;
t_ns -= ONE_BILLION;
}
ts->tv_nsec = (long int)t_ns;
}
#endif
src/libespeak-ng/wave_sada.c
-26
View File
@@ -32,7 +32,6 @@
#include "wave.h"
enum { ONE_BILLION = 1000000000 };
#define SAMPLE_RATE 22050
#define SAMPLE_SIZE 16
@@ -422,28 +421,3 @@ int wave_get_remaining_time(uint32_t sample, uint32_t *time)
}
#endif
void clock_gettime2(struct timespec *ts)
{
struct timeval tv;
if (!ts)
return;
assert(gettimeofday(&tv, NULL) != -1);
ts->tv_sec = tv.tv_sec;
ts->tv_nsec = tv.tv_usec*1000;
}
void add_time_in_ms(struct timespec *ts, int time_in_ms)
{
if (!ts)
return;
uint64_t t_ns = (uint64_t)ts->tv_nsec + 1000000 * (uint64_t)time_in_ms;
while (t_ns >= ONE_BILLION) {
ts->tv_sec += 1;
t_ns -= ONE_BILLION;
}
ts->tv_nsec = (long int)t_ns;
}