summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMohamed Tarek <mt@rockbox.org>2010-05-21 16:05:28 +0000
committerMohamed Tarek <mt@rockbox.org>2010-05-21 16:05:28 +0000
commit76aeb6028e90383fe881abb088a1dfad985f8115 (patch)
tree60e119c4cb15ec1764a16768f429bc12f1002940
parentb5b5ecf20bd20e4dca11c30407e0d24cfcba0454 (diff)
downloadrockbox-76aeb6028e90383fe881abb088a1dfad985f8115.tar.gz
rockbox-76aeb6028e90383fe881abb088a1dfad985f8115.zip
Rename seek() to asf_seek()
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26237 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/codecs/libasf/asf.c2
-rw-r--r--apps/codecs/libasf/asf.h2
-rw-r--r--apps/codecs/wma.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/apps/codecs/libasf/asf.c b/apps/codecs/libasf/asf.c
index 65d3fd8deb..6297cf664a 100644
--- a/apps/codecs/libasf/asf.c
+++ b/apps/codecs/libasf/asf.c
@@ -378,7 +378,7 @@ int asf_get_timestamp(int *duration)
}
/*entry point for seeks*/
-int seek(int ms, asf_waveformatex_t* wfx)
+int asf_seek(int ms, asf_waveformatex_t* wfx)
{
int time, duration, delta, temp, count=0;
diff --git a/apps/codecs/libasf/asf.h b/apps/codecs/libasf/asf.h
index 9592618997..b0adb7dfc7 100644
--- a/apps/codecs/libasf/asf.h
+++ b/apps/codecs/libasf/asf.h
@@ -42,7 +42,7 @@ int asf_read_packet(uint8_t** audiobuf, int* audiobufsize, int* packetlength,
int asf_get_timestamp(int *duration);
-int seek(int ms, asf_waveformatex_t* wfx);
+int asf_seek(int ms, asf_waveformatex_t* wfx);
#endif /* _ASF_H */
diff --git a/apps/codecs/wma.c b/apps/codecs/wma.c
index 17d2af2e98..ed413e8c32 100644
--- a/apps/codecs/wma.c
+++ b/apps/codecs/wma.c
@@ -121,7 +121,7 @@ restart_track:
goto restart_track; /* Pretend you never saw this... */
}
- elapsedtime = seek(ci->seek_time, &wfx);
+ elapsedtime = asf_seek(ci->seek_time, &wfx);
if (elapsedtime < 1){
ci->seek_complete();
goto next_track;