From aa3aabdaab1cf9b7a1025a18de66d8cdf13594c4 Mon Sep 17 00:00:00 2001 From: max_10 Date: Fri, 1 Dec 2017 11:32:54 +0100 Subject: [PATCH] test Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/99c27ef800224e419e956dbc3cbe995da5c70740 Author: max_10 Date: 2017-12-01 (Fri, 01 Dec 2017) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libarmbox/audio.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libarmbox/audio.cpp b/libarmbox/audio.cpp index 8064633..79470a5 100644 --- a/libarmbox/audio.cpp +++ b/libarmbox/audio.cpp @@ -200,10 +200,11 @@ int cAudio::PrepareClipPlay(int ch, int srate, int bits, int little_endian) const char *mix_dev = getenv("MIX_DEVICE"); lt_debug("%s ch %d srate %d bits %d le %d\n", __FUNCTION__, ch, srate, bits, little_endian); if (clipfd > -1) { - lt_info("%s: clipfd already opened (%d)\n", __FUNCTION__, clipfd); + lt_info("%s: clipfd already opened (%d)\n", __func__, clipfd); return -1; } mixer_num = -1; + mixer_fd = -1; /* a different DSP device can be given with DSP_DEVICE and MIX_DEVICE * if this device cannot be opened, we fall back to the internal OSS device * Example: @@ -215,7 +216,7 @@ int cAudio::PrepareClipPlay(int ch, int srate, int bits, int little_endian) if ((!dsp_dev) || (access(dsp_dev, W_OK))) { if (dsp_dev) lt_info("%s: DSP_DEVICE is set (%s) but cannot be opened," - " fall back to /dev/dsp\n", __func__, dsp_dev); + " fall back to /dev/dsp\n", __func__, dsp_dev); dsp_dev = "/dev/dsp"; } if ((!mix_dev) || (access(mix_dev, W_OK))) {