Browse Source

wave_get_read_position is not used, so remove it

master
Reece H. Dunn 9 years ago
parent
commit
1d91276eac
4 changed files with 0 additions and 62 deletions
  1. 0
    25
      src/libespeak-ng/wave.c
  2. 0
    1
      src/libespeak-ng/wave.h
  3. 0
    10
      src/libespeak-ng/wave_pulse.c
  4. 0
    26
      src/libespeak-ng/wave_sada.c

+ 0
- 25
src/libespeak-ng/wave.c View File

@@ -62,7 +62,6 @@ size_t wave_port_write(void *theHandler, char *theMono16BitsWaveBuffer, size_t t
int wave_port_close(void *theHandler);
int wave_port_is_busy(void *theHandler);
void wave_port_terminate();
uint32_t wave_port_get_read_position(void *theHandler);
uint32_t wave_port_get_write_position(void *theHandler);
void wave_port_flush(void *theHandler);
void wave_port_set_callback_is_output_enabled(t_wave_callback *cb);
@@ -76,7 +75,6 @@ size_t wave_pulse_write(void *theHandler, char *theMono16BitsWaveBuffer, size_t
int wave_pulse_close(void *theHandler);
int wave_pulse_is_busy(void *theHandler);
void wave_pulse_terminate();
uint32_t wave_pulse_get_read_position(void *theHandler);
uint32_t wave_pulse_get_write_position(void *theHandler);
void wave_pulse_flush(void *theHandler);
void wave_pulse_set_callback_is_output_enabled(t_wave_callback *cb);
@@ -125,14 +123,6 @@ void wave_terminate()
wave_port_terminate();
}

uint32_t wave_get_read_position(void *theHandler)
{
if (pulse_running)
return wave_pulse_get_read_position(theHandler);
else
return wave_port_get_read_position(theHandler);
}

uint32_t wave_get_write_position(void *theHandler)
{
if (pulse_running)
@@ -171,7 +161,6 @@ int wave_get_remaining_time(uint32_t sample, uint32_t *time)
#define wave_close wave_port_close
#define wave_is_busy wave_port_is_busy
#define wave_terminate wave_port_terminate
#define wave_get_read_position wave_port_get_read_position
#define wave_get_write_position wave_port_get_write_position
#define wave_flush wave_port_flush
#define wave_set_callback_is_output_enabled wave_port_set_callback_is_output_enabled
@@ -772,13 +761,6 @@ void wave_terminate()
Pa_Terminate();
}

uint32_t wave_get_read_position(void *theHandler)
{
(void)theHandler; // unused

return myReadPosition;
}

uint32_t wave_get_write_position(void *theHandler)
{
(void)theHandler; // unused
@@ -841,13 +823,6 @@ void wave_terminate()
{
}

uint32_t wave_get_read_position(void *theHandler)
{
(void)theHandler; // unused

return 0;
}

uint32_t wave_get_write_position(void *theHandler)
{
(void)theHandler; // unused

+ 0
- 1
src/libespeak-ng/wave.h View File

@@ -33,7 +33,6 @@ extern int wave_close(void *theHandler);
extern void wave_flush(void *theHandler);
extern int wave_is_busy(void *theHandler);
extern void wave_terminate();
extern uint32_t wave_get_read_position(void *theHandler);
extern uint32_t wave_get_write_position(void *theHandler);

// Supply the remaining time in ms before the sample is played

+ 0
- 10
src/libespeak-ng/wave_pulse.c View File

@@ -70,7 +70,6 @@ static t_wave_callback *my_callback_is_output_enabled = NULL;
#define wave_close wave_pulse_close
#define wave_is_busy wave_pulse_is_busy
#define wave_terminate wave_pulse_terminate
#define wave_get_read_position wave_pulse_get_read_position
#define wave_get_write_position wave_pulse_get_write_position
#define wave_flush wave_pulse_flush
#define wave_set_callback_is_output_enabled wave_pulse_set_callback_is_output_enabled
@@ -611,15 +610,6 @@ void wave_terminate()
pthread_mutex_destroy(a_mutex);
}

uint32_t wave_get_read_position(void *theHandler)
{
(void)theHandler; // unused

pa_timing_info a_timing_info = {0};
pulse_playing(&a_timing_info);
return a_timing_info.read_index;
}

uint32_t wave_get_write_position(void *theHandler)
{
(void)theHandler; // unused

+ 0
- 26
src/libespeak-ng/wave_sada.c View File

@@ -296,32 +296,6 @@ void wave_set_callback_is_output_enabled(t_wave_callback *cb)
my_callback_is_output_enabled = cb;
}

// wave_get_read_position
//
// DESCRIPTION:
//
// Concerns the sample which is currently played by the audio layer,
// where 'sample' is a small buffer of synthesized wave data,
// identified so that the user callback could be called when the
// 'sample' is really played. The identifier is returned by
// wave_get_write_position. This method is unused.
//
// PARAMETERS:
//
// theHandler: the audio device file descriptor
//
// RETURNS:
//
// The total number of 16-bit samples played by the audio system
// so far.
//
uint32_t wave_get_read_position(void *theHandler)
{
audio_info_t ainfo;
ioctl((int)theHandler, AUDIO_GETINFO, &ainfo);
return ainfo.play.samples;
}

// wave_get_write_position
//
// DESCRIPTION:

Loading…
Cancel
Save