aboutsummaryrefslogtreecommitdiffstats
path: root/src/audiofile_decode.c
diff options
context:
space:
mode:
authorWarren Dukes <warren.dukes@gmail.com>2004-02-27 01:35:23 +0000
committerWarren Dukes <warren.dukes@gmail.com>2004-02-27 01:35:23 +0000
commit9b1c5505973abffe1e3c3ab3ba7f84664fbf161f (patch)
treea4e393b11fce35995d218ccb451c165465c46a54 /src/audiofile_decode.c
parentce1d377d697036886ea13f9a66810bc70b748d90 (diff)
downloadmpd-9b1c5505973abffe1e3c3ab3ba7f84664fbf161f.tar.gz
mpd-9b1c5505973abffe1e3c3ab3ba7f84664fbf161f.tar.xz
mpd-9b1c5505973abffe1e3c3ab3ba7f84664fbf161f.zip
add xfade and audio to status, remove crossfade no args options
git-svn-id: https://svn.musicpd.org/mpd/trunk@75 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to '')
-rw-r--r--src/audiofile_decode.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/audiofile_decode.c b/src/audiofile_decode.c
index 19f4623d1..c6c04dafd 100644
--- a/src/audiofile_decode.c
+++ b/src/audiofile_decode.c
@@ -52,6 +52,7 @@ int audiofile_decode(Buffer * cb, AudioFormat * af, DecoderControl * dc)
{
int fs, frame_count;
AFfilehandle af_fp;
+ int bits;
af_fp = afOpenFile(dc->file,"r", NULL);
if(af_fp == AF_NULL_FILEHANDLE) {
@@ -59,8 +60,9 @@ int audiofile_decode(Buffer * cb, AudioFormat * af, DecoderControl * dc)
return -1;
}
- afGetSampleFormat(af_fp, AF_DEFAULT_TRACK, &fs, &af->bits);
- af->sampleRate = (int)afGetRate(af_fp, AF_DEFAULT_TRACK);
+ afGetSampleFormat(af_fp, AF_DEFAULT_TRACK, &fs, &bits);
+ af->bits = bits;
+ af->sampleRate = afGetRate(af_fp, AF_DEFAULT_TRACK);
af->channels = afGetChannels(af_fp,AF_DEFAULT_TRACK);
frame_count = afGetFrameCount(af_fp,AF_DEFAULT_TRACK);