From 55a41c7c656d284915bea761900707b174b5997a Mon Sep 17 00:00:00 2001
From: Tristan Matthews <le.businessman@gmail.com>
Date: Sat, 28 Apr 2012 17:35:59 -0400
Subject: [PATCH] * #9832: alsa: fix logging
---
daemon/src/audio/alsa/alsalayer.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/daemon/src/audio/alsa/alsalayer.cpp b/daemon/src/audio/alsa/alsalayer.cpp
index 00ecd4aa9e..45f64d023f 100644
--- a/daemon/src/audio/alsa/alsalayer.cpp
+++ b/daemon/src/audio/alsa/alsalayer.cpp
@@ -219,7 +219,7 @@ AlsaLayer::stopStream()
#define ALSA_CALL(call, error) ({ \
int err_code = call; \
if (err_code < 0) \
- ERROR("ALSA: "error": %s", snd_strerror(err_code)); \
+ ERROR(error ": %s", snd_strerror(err_code)); \
err_code; \
})
@@ -321,7 +321,7 @@ bool AlsaLayer::alsa_set_params(snd_pcm_t *pcm_handle)
TRY(snd_pcm_hw_params(HW), "hwparams");
#undef HW
- DEBUG("ALSA: %s using sampling rate %dHz",
+ DEBUG("%s using sampling rate %dHz",
(snd_pcm_stream(pcm_handle) == SND_PCM_STREAM_PLAYBACK) ? "playback" : "capture",
audioSampleRate_);
@@ -370,7 +370,7 @@ AlsaLayer::write(void* buffer, int length, snd_pcm_t * handle)
}
default:
- ERROR("ALSA: unknown write error, dropping frames: %s", snd_strerror(err));
+ ERROR("Unknown write error, dropping frames: %s", snd_strerror(err));
stopPlaybackStream();
break;
}
@@ -405,12 +405,12 @@ AlsaLayer::read(void* buffer, int toCopy)
startCaptureStream();
}
- ERROR("ALSA: XRUN capture ignored (%s)", snd_strerror(err));
+ ERROR("XRUN capture ignored (%s)", snd_strerror(err));
break;
}
case EPERM:
- ERROR("ALSA: Can't capture, EPERM (%s)", snd_strerror(err));
+ ERROR("Can't capture, EPERM (%s)", snd_strerror(err));
prepareCaptureStream();
startCaptureStream();
break;
@@ -456,7 +456,7 @@ AlsaLayer::getAudioDeviceIndexMap(AudioStreamDirection dir) const
snd_ctl_card_info_alloca(&info);
snd_pcm_info_alloca(&pcminfo);
- int numCard = -1 ;
+ int numCard = -1;
std::vector<HwIDPair> audioDevice;
--
GitLab