aboutsummaryrefslogtreecommitdiffstats
path: root/src/audioOutputs
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2008-09-29 02:35:09 -0700
committerEric Wong <normalperson@yhbt.net>2008-09-29 04:05:48 -0700
commitfcbcdd9869e3147fe4a30ba808af294f680c9373 (patch)
treeccc1799d04cbf2501032107384a81094e18c615a /src/audioOutputs
parentc7930c993e4624e4e6d9a50cdea448b432a2bf05 (diff)
downloadmpd-fcbcdd9869e3147fe4a30ba808af294f680c9373.tar.gz
mpd-fcbcdd9869e3147fe4a30ba808af294f680c9373.tar.xz
mpd-fcbcdd9869e3147fe4a30ba808af294f680c9373.zip
Switch to C99 types (retaining compat with old compilers)
Seeing the "mpd_" prefix _everywhere_ is mind-numbing as the mind needs to retrain itself to skip over the first 4 tokens of a type to get to its meaning. So avoid having extra characters on my terminal to make it easier to follow code at 2:30 am in the morning. Please report any new issues you may come across on Free toolchains. I realize how difficult it can be to build/maintain cross-compiling toolchains and I have no intention of forcing people to upgrade their toolchains to build mpd. Tested with gcc 2.95.4 and and gcc 4.3.1 on x86-32.
Diffstat (limited to '')
-rw-r--r--src/audioOutputs/audioOutput_alsa.c2
-rw-r--r--src/audioOutputs/audioOutput_oss.c4
-rw-r--r--src/audioOutputs/audioOutput_shout.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/audioOutputs/audioOutput_alsa.c b/src/audioOutputs/audioOutput_alsa.c
index 06dbeb956..cd93f9159 100644
--- a/src/audioOutputs/audioOutput_alsa.c
+++ b/src/audioOutputs/audioOutput_alsa.c
@@ -217,7 +217,7 @@ configure_hw:
snd_strerror(-err));
goto fail;
}
- audioFormat->channels = (mpd_sint8)channels;
+ audioFormat->channels = (int8_t)channels;
err = snd_pcm_hw_params_set_rate_near(ad->pcmHandle, hwparams,
&sampleRate, NULL);
diff --git a/src/audioOutputs/audioOutput_oss.c b/src/audioOutputs/audioOutput_oss.c
index 2df7d5728..a89eeab46 100644
--- a/src/audioOutputs/audioOutput_oss.c
+++ b/src/audioOutputs/audioOutput_oss.c
@@ -486,9 +486,9 @@ static int oss_openDevice(AudioOutput * audioOutput)
OssData *od = audioOutput->data;
AudioFormat *audioFormat = &audioOutput->outAudioFormat;
- od->channels = (mpd_sint8)audioFormat->channels;
+ od->channels = (int8_t)audioFormat->channels;
od->sampleRate = audioFormat->sampleRate;
- od->bits = (mpd_sint8)audioFormat->bits;
+ od->bits = (int8_t)audioFormat->bits;
if ((ret = oss_open(audioOutput)) < 0)
return ret;
diff --git a/src/audioOutputs/audioOutput_shout.c b/src/audioOutputs/audioOutput_shout.c
index 2ee942809..95db68544 100644
--- a/src/audioOutputs/audioOutput_shout.c
+++ b/src/audioOutputs/audioOutput_shout.c
@@ -636,7 +636,7 @@ static int myShout_play(AudioOutput * audioOutput,
for (i = 0; i < samples; i++) {
for (j = 0; j < sd->audioFormat->channels; j++) {
- vorbbuf[j][i] = (*((const mpd_sint16 *) playChunk))
+ vorbbuf[j][i] = (*((const int16_t *) playChunk))
/ 32768.0;
playChunk += bytes;
}