oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

input_stream: removed the InputStream typedef

Browse Source 
Everybody should use struct input_stream.
This commit is contained in:
Max Kellermann
2008-10-26 19:54:57 +01:00
parent bbaedb17d5
commit 21b8590b53
13 changed files with 65 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/decoder/mp3_plugin.c
View File

@@ -125,12 +125,12 @@ typedef struct _mp3DecodeData {
int decodedFirstFrame;
unsigned long bitRate;
struct decoder *decoder;
InputStream *inStream;
struct input_stream *inStream;
enum mad_layer layer;
} mp3DecodeData;
static void initMp3DecodeData(mp3DecodeData * data, struct decoder *decoder,
InputStream * inStream)
struct input_stream *inStream)
{
data->muteFrame = MUTEFRAME_NONE;
data->highestFrame = 0;
@@ -753,7 +753,7 @@ static void mp3DecodeDataFinalize(mp3DecodeData * data)
/* this is primarily used for getting total time for tags */
static int getMp3TotalTime(char *file)
{
InputStream inStream;
struct input_stream inStream;
mp3DecodeData data;
int ret;
@@ -770,9 +770,10 @@ static int getMp3TotalTime(char *file)
return ret;
}
static int openMp3FromInputStream(InputStream * inStream, mp3DecodeData * data,
struct decoder * decoder, struct tag ** tag,
ReplayGainInfo ** replayGainInfo)
static int
openMp3FromInputStream(struct input_stream *inStream, mp3DecodeData * data,
struct decoder *decoder, struct tag **tag,
ReplayGainInfo **replayGainInfo)
{
initMp3DecodeData(data, decoder, inStream);
*tag = NULL;
@@ -988,7 +989,8 @@ static void initAudioFormatFromMp3DecodeData(mp3DecodeData * data,
af->channels = MAD_NCHANNELS(&(data->frame).header);
}
static int mp3_decode(struct decoder * decoder, InputStream * inStream)
static int
mp3_decode(struct decoder * decoder, struct input_stream *inStream)
{
mp3DecodeData data;
struct tag *tag = NULL;