aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2011-07-10 22:17:12 -0700
committerChris Robinson <[email protected]>2011-07-10 22:17:12 -0700
commit717a0592ba1386b2f676503fe5646bfe3071e393 (patch)
tree1809117c524d93e0055f9afbb3e693b5041f2b7c
parenta67aff220fd084265360865d64e02c3e15bbacf2 (diff)
Use logging macros in the oss backend
-rw-r--r--Alc/oss.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/Alc/oss.c b/Alc/oss.c
index c81829aa..b82e3bb5 100644
--- a/Alc/oss.c
+++ b/Alc/oss.c
@@ -98,7 +98,7 @@ static ALuint OSSProc(ALvoid *ptr)
{
if(errno != EAGAIN && errno != EWOULDBLOCK && errno != EINTR)
{
- AL_PRINT("write failed: %s\n", strerror(errno));
+ ERROR("write failed: %s\n", strerror(errno));
aluHandleDisconnect(pDevice);
break;
}
@@ -131,7 +131,7 @@ static ALuint OSSCaptureProc(ALvoid *ptr)
amt = read(data->fd, data->mix_data, data->data_size);
if(amt < 0)
{
- AL_PRINT("read failed: %s\n", strerror(errno));
+ ERROR("read failed: %s\n", strerror(errno));
aluHandleDisconnect(pDevice);
break;
}
@@ -166,7 +166,7 @@ static ALCboolean oss_open_playback(ALCdevice *device, const ALCchar *deviceName
if(data->fd == -1)
{
free(data);
- AL_PRINT("Could not open %s: %s\n", driver, strerror(errno));
+ ERROR("Could not open %s: %s\n", driver, strerror(errno));
return ALC_FALSE;
}
@@ -243,14 +243,14 @@ static ALCboolean oss_reset_playback(ALCdevice *device)
if(0)
{
err:
- AL_PRINT("%s failed: %s\n", err, strerror(errno));
+ ERROR("%s failed: %s\n", err, strerror(errno));
return ALC_FALSE;
}
#undef CHECKERR
if((int)ChannelsFromDevFmt(device->FmtChans) != numChannels)
{
- AL_PRINT("Failed to set %s, got %d channels instead\n", DevFmtChannelsString(device->FmtChans), numChannels);
+ ERROR("Failed to set %s, got %d channels instead\n", DevFmtChannelsString(device->FmtChans), numChannels);
return ALC_FALSE;
}
@@ -258,14 +258,14 @@ static ALCboolean oss_reset_playback(ALCdevice *device)
(ossFormat == AFMT_U8 && device->FmtType == DevFmtUByte) ||
(ossFormat == AFMT_S16_NE && device->FmtType == DevFmtShort)))
{
- AL_PRINT("Failed to set %s output, got OSS format %#x\n", DevFmtTypeString(device->FmtType), ossFormat);
+ ERROR("Failed to set %s samples, got OSS format %#x\n", DevFmtTypeString(device->FmtType), ossFormat);
return ALC_FALSE;
}
if(device->Frequency != (ALuint)ossSpeed)
{
if((device->Flags&DEVICE_FREQUENCY_REQUEST))
- AL_PRINT("Failed to set %dhz, got %dhz instead\n", device->Frequency, ossSpeed);
+ ERROR("Failed to set %dhz, got %dhz instead\n", device->Frequency, ossSpeed);
device->Flags &= ~DEVICE_FREQUENCY_REQUEST;
device->Frequency = ossSpeed;
}
@@ -301,7 +301,7 @@ static void oss_stop_playback(ALCdevice *device)
data->killNow = 0;
if(ioctl(data->fd, SNDCTL_DSP_RESET) != 0)
- AL_PRINT("Error resetting device: %s\n", strerror(errno));
+ ERROR("Error resetting device: %s\n", strerror(errno));
free(data->mix_data);
data->mix_data = NULL;
@@ -336,7 +336,7 @@ static ALCboolean oss_open_capture(ALCdevice *device, const ALCchar *deviceName)
if(data->fd == -1)
{
free(data);
- AL_PRINT("Could not open %s: %s\n", driver, strerror(errno));
+ ERROR("Could not open %s: %s\n", driver, strerror(errno));
return ALC_FALSE;
}
@@ -354,7 +354,7 @@ static ALCboolean oss_open_capture(ALCdevice *device, const ALCchar *deviceName)
case DevFmtUShort:
case DevFmtFloat:
free(data);
- AL_PRINT("%s capture samples not supported on OSS\n", DevFmtTypeString(device->FmtType));
+ ERROR("%s capture samples not supported on OSS\n", DevFmtTypeString(device->FmtType));
return ALC_FALSE;
}
@@ -382,7 +382,7 @@ static ALCboolean oss_open_capture(ALCdevice *device, const ALCchar *deviceName)
if(0)
{
err:
- AL_PRINT("%s failed: %s\n", err, strerror(errno));
+ ERROR("%s failed: %s\n", err, strerror(errno));
close(data->fd);
free(data);
return ALC_FALSE;
@@ -391,7 +391,7 @@ static ALCboolean oss_open_capture(ALCdevice *device, const ALCchar *deviceName)
if((int)ChannelsFromDevFmt(device->FmtChans) != numChannels)
{
- AL_PRINT("Failed to set %s, got %d channels instead\n", DevFmtChannelsString(device->FmtChans), numChannels);
+ ERROR("Failed to set %s, got %d channels instead\n", DevFmtChannelsString(device->FmtChans), numChannels);
close(data->fd);
free(data);
return ALC_FALSE;
@@ -401,7 +401,7 @@ static ALCboolean oss_open_capture(ALCdevice *device, const ALCchar *deviceName)
(ossFormat == AFMT_U8 && device->FmtType == DevFmtUByte) ||
(ossFormat == AFMT_S16_NE && device->FmtType == DevFmtShort)))
{
- AL_PRINT("Failed to set %s output, got OSS format %#x\n", DevFmtTypeString(device->FmtType), ossFormat);
+ ERROR("Failed to set %s samples, got OSS format %#x\n", DevFmtTypeString(device->FmtType), ossFormat);
close(data->fd);
free(data);
return ALC_FALSE;
@@ -410,7 +410,7 @@ static ALCboolean oss_open_capture(ALCdevice *device, const ALCchar *deviceName)
data->ring = CreateRingBuffer(frameSize, device->UpdateSize * device->NumUpdates);
if(!data->ring)
{
- AL_PRINT("ring buffer create failed\n");
+ ERROR("Ring buffer create failed\n");
close(data->fd);
free(data);
return ALC_FALSE;