diff options
| author | Max Kellermann <max@duempel.org> | 2008-10-26 19:54:57 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2008-10-26 19:54:57 +0100 |
| commit | 21b8590b53699f92802cb95121e910033cbd4f11 (patch) | |
| tree | 0a1d8fde8468929479d38a1e96e4938542e1d80a /src/decoder/aac_plugin.c | |
| parent | bbaedb17d52cf14cf1abc3f24a90dfa06f875440 (diff) | |
| download | mpd-21b8590b53699f92802cb95121e910033cbd4f11.tar.gz mpd-21b8590b53699f92802cb95121e910033cbd4f11.tar.xz mpd-21b8590b53699f92802cb95121e910033cbd4f11.zip | |
input_stream: removed the InputStream typedef
Everybody should use struct input_stream.
Diffstat (limited to '')
| -rw-r--r-- | src/decoder/aac_plugin.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/decoder/aac_plugin.c b/src/decoder/aac_plugin.c index 7842bcc22..fec6b1b83 100644 --- a/src/decoder/aac_plugin.c +++ b/src/decoder/aac_plugin.c @@ -29,7 +29,7 @@ /* all code here is either based on or copied from FAAD2's frontend code */ typedef struct { struct decoder *decoder; - InputStream *inStream; + struct input_stream *inStream; size_t bytesIntoBuffer; size_t bytesConsumed; off_t fileOffset; @@ -174,8 +174,9 @@ static void adtsParse(AacBuffer * b, float *length) *length = (float)frames / framesPerSec; } -static void initAacBuffer(AacBuffer * b, - struct decoder *decoder, InputStream * inStream) +static void +initAacBuffer(AacBuffer * b, struct decoder *decoder, + struct input_stream *inStream) { memset(b, 0, sizeof(AacBuffer)); @@ -253,7 +254,7 @@ static float getAacFloatTotalTime(char *file) faacDecConfigurationPtr config; uint32_t sample_rate; unsigned char channels; - InputStream inStream; + struct input_stream inStream; long bread; if (openInputStream(&inStream, file) < 0) @@ -301,7 +302,7 @@ static int getAacTotalTime(char *file) } static int aac_stream_decode(struct decoder * mpd_decoder, - InputStream *inStream) + struct input_stream *inStream) { float file_time; float totalTime = 0; @@ -454,7 +455,7 @@ static int aac_decode(struct decoder * mpd_decoder, char *path) int seekPositionFound = 0; */ uint16_t bitRate = 0; AacBuffer b; - InputStream inStream; + struct input_stream inStream; int initialized = 0; if ((totalTime = getAacFloatTotalTime(path)) < 0) |