diff options
| -rw-r--r-- | audio_hw.c | 9 | ||||
| -rw-r--r-- | audio_out.c | 11 |
2 files changed, 3 insertions, 17 deletions
@@ -295,7 +295,7 @@ int audio_hw_open(const hw_module_t *module, const char *name, goto error_device; } - rc = yamaha_mc1n2_audio_routine_init(tinyalsa_audio_device->mc1n2_pdata); + rc = yamaha_mc1n2_audio_init(tinyalsa_audio_device->mc1n2_pdata); if(rc < 0) { LOGE("Failed to init Yamaha-MC1N2-Audio"); } @@ -312,13 +312,6 @@ int audio_hw_open(const hw_module_t *module, const char *name, LOGE("Failed to set default mixer route"); } -#ifdef YAMAHA_MC1N2_AUDIO - rc = yamaha_mc1n2_audio_routine_route_init(tinyalsa_audio_device->mc1n2_pdata); - if(rc < 0) { - LOGE("Failed to init Yamaha-MC1N2-Audio route"); - } -#endif - tinyalsa_audio_device->mixer = tinyalsa_mixer; *device = &(dev->common); diff --git a/audio_out.c b/audio_out.c index 13a71a5..40226c3 100644 --- a/audio_out.c +++ b/audio_out.c @@ -211,7 +211,7 @@ static int audio_out_standby(struct audio_stream *stream) #ifdef YAMAHA_MC1N2_AUDIO if(!stream_out->standby) { - rc = yamaha_mc1n2_audio_routine_route_stop(stream_out->device->mc1n2_pdata); + rc = yamaha_mc1n2_audio_output_stop(stream_out->device->mc1n2_pdata); if(rc < 0) { LOGE("Failed to set Yamaha-MC1N2-Audio route"); } @@ -322,7 +322,7 @@ static ssize_t audio_out_write(struct audio_stream_out *stream, if(stream_out->standby) { #ifdef YAMAHA_MC1N2_AUDIO - rc = yamaha_mc1n2_audio_routine_route_start(stream_out->device->mc1n2_pdata); + rc = yamaha_mc1n2_audio_output_start(stream_out->device->mc1n2_pdata); if(rc < 0) { LOGE("Failed to set Yamaha-MC1N2-Audio route"); } @@ -464,13 +464,6 @@ int audio_hw_open_output_stream(struct audio_hw_device *dev, goto error_stream; } -#ifdef YAMAHA_MC1N2_AUDIO - rc = yamaha_mc1n2_audio_routine_postopen(tinyalsa_audio_device->mc1n2_pdata); - if(rc < 0) { - LOGE("Failed to init Yamaha-MC1N2-Audio route"); - } -#endif - audio_out_pcm_close(tinyalsa_audio_stream_out); tinyalsa_audio_stream_out->standby = 1; |