aboutsummaryrefslogtreecommitdiffstats
path: root/src/decoder/mp4_plugin.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-10-26 20:34:47 +0100
committerMax Kellermann <max@duempel.org>2008-10-26 20:34:47 +0100
commitdbc7e9ba2f57c71a9b73cd6d035ba2906190be72 (patch)
tree0f9a55ed4a533d4daf266f6748acb30830a6f095 /src/decoder/mp4_plugin.c
parent97a9c7a8e094f830e70fdb479425c96e182f8b5e (diff)
downloadmpd-dbc7e9ba2f57c71a9b73cd6d035ba2906190be72.tar.gz
mpd-dbc7e9ba2f57c71a9b73cd6d035ba2906190be72.tar.xz
mpd-dbc7e9ba2f57c71a9b73cd6d035ba2906190be72.zip
input_stream: no CamelCase
Renamed all functions and variables.
Diffstat (limited to '')
-rw-r--r--src/decoder/mp4_plugin.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/decoder/mp4_plugin.c b/src/decoder/mp4_plugin.c
index 210f1e5ec..b5197bb3b 100644
--- a/src/decoder/mp4_plugin.c
+++ b/src/decoder/mp4_plugin.c
@@ -68,13 +68,13 @@ static int mp4_getAACTrack(mp4ff_t * infile)
static uint32_t mp4_inputStreamReadCallback(void *inStream, void *buffer,
uint32_t length)
{
- return readFromInputStream((struct input_stream *) inStream,
+ return input_stream_read((struct input_stream *) inStream,
buffer, length);
}
static uint32_t mp4_inputStreamSeekCallback(void *inStream, uint64_t position)
{
- return seekInputStream((struct input_stream *) inStream,
+ return input_stream_seek((struct input_stream *) inStream,
position, SEEK_SET);
}
@@ -317,7 +317,7 @@ static struct tag *mp4DataDup(char *file, int *mp4MetadataFound)
*mp4MetadataFound = 0;
- if (openInputStream(&inStream, file) < 0) {
+ if (input_stream_open(&inStream, file) < 0) {
DEBUG("mp4DataDup: Failed to open file: %s\n", file);
return NULL;
}
@@ -330,14 +330,14 @@ static struct tag *mp4DataDup(char *file, int *mp4MetadataFound)
mp4fh = mp4ff_open_read(callback);
if (!mp4fh) {
free(callback);
- closeInputStream(&inStream);
+ input_stream_close(&inStream);
return NULL;
}
track = mp4_getAACTrack(mp4fh);
if (track < 0) {
mp4ff_close(mp4fh);
- closeInputStream(&inStream);
+ input_stream_close(&inStream);
free(callback);
return NULL;
}
@@ -347,7 +347,7 @@ static struct tag *mp4DataDup(char *file, int *mp4MetadataFound)
scale = mp4ff_time_scale(mp4fh, track);
if (scale < 0) {
mp4ff_close(mp4fh);
- closeInputStream(&inStream);
+ input_stream_close(&inStream);
free(callback);
tag_free(ret);
return NULL;
@@ -388,7 +388,7 @@ static struct tag *mp4DataDup(char *file, int *mp4MetadataFound)
}
mp4ff_close(mp4fh);
- closeInputStream(&inStream);
+ input_stream_close(&inStream);
return ret;
}