From a78e983d5f17a6af4957ad555bdc458d0b70c5b2 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Mon, 21 Oct 2013 00:21:56 +0200 Subject: [PATCH] raspi: improve set_volume --- raspi/avcodec_omx.c | 6 +++--- raspi/avdec.cpp | 6 +----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/raspi/avcodec_omx.c b/raspi/avcodec_omx.c index aaf5b68..5ef1297 100644 --- a/raspi/avcodec_omx.c +++ b/raspi/avcodec_omx.c @@ -96,9 +96,9 @@ next_packet: pthread_mutex_unlock(&pi->omx_active_mutex); goto next_packet; } else if (current->msgtype == MSG_SET_VOLUME) { - fprintf(stderr, "[acodec] SET_VOLUME %lld\n", current->data->PTS); - omx_audio_volume(&pi->audio_render, current->data->PTS); - codec_queue_free_item(codec,current); + fprintf(stderr, "[acodec] SET_VOLUME %ld\n", (long)current->data); + omx_audio_volume(&pi->audio_render, (long)current->data); + free(current); pthread_mutex_unlock(&pi->omx_active_mutex); goto next_packet; } diff --git a/raspi/avdec.cpp b/raspi/avdec.cpp index 96af219..fd17527 100644 --- a/raspi/avdec.cpp +++ b/raspi/avdec.cpp @@ -414,12 +414,8 @@ void aDec::run() int aDec::set_volume(int vol) { - struct packet_t *packet; long volume = (vol - 100) * 60; - packet = (packet_t *)malloc(sizeof(*packet)); - packet->PTS = volume; - packet->buf = NULL; - codec_queue_add_item(&codecs.acodec, packet, MSG_SET_VOLUME); + codec_send_message(&codecs.acodec, MSG_SET_VOLUME, (void *)volume); return 0; }