diff options
author | Mohamed Tarek <mt@rockbox.org> | 2010-05-02 20:07:11 +0000 |
---|---|---|
committer | Mohamed Tarek <mt@rockbox.org> | 2010-05-02 20:07:11 +0000 |
commit | 2fa864b9e6d0b700a45f34feb039283134b9c5fb (patch) | |
tree | 04416dc762db7c0cd5ff1f72cae40796d21f618b /apps/codecs/wma.c | |
parent | 9a74223f7df26090c3d4e91b00c78912e9d156f9 (diff) | |
download | rockbox-2fa864b9e6d0b700a45f34feb039283134b9c5fb.tar.gz rockbox-2fa864b9e6d0b700a45f34feb039283134b9c5fb.zip |
Remove unnecessary parameter (struct codec_api* ci) passed to libasf functions, and consequently remove the no-longer needed #ifdef in apps/codecs/libasf/asf.h
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25788 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/wma.c')
-rw-r--r-- | apps/codecs/wma.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/codecs/wma.c b/apps/codecs/wma.c index 8aed7c34b6..235f1a38c9 100644 --- a/apps/codecs/wma.c +++ b/apps/codecs/wma.c | |||
@@ -60,7 +60,7 @@ static int seek(int ms, asf_waveformatex_t* wfx) | |||
60 | count++; | 60 | count++; |
61 | 61 | ||
62 | /*check the time stamp of our packet*/ | 62 | /*check the time stamp of our packet*/ |
63 | time = asf_get_timestamp(&duration, ci); | 63 | time = asf_get_timestamp(&duration); |
64 | DEBUGF("seeked to %d ms with duration %d\n", time, duration); | 64 | DEBUGF("seeked to %d ms with duration %d\n", time, duration); |
65 | 65 | ||
66 | if (time < 0) { | 66 | if (time < 0) { |
@@ -68,7 +68,7 @@ static int seek(int ms, asf_waveformatex_t* wfx) | |||
68 | DEBUGF("UKNOWN SEEK ERROR\n"); | 68 | DEBUGF("UKNOWN SEEK ERROR\n"); |
69 | ci->seek_buffer(ci->id3->first_frame_offset+initial_packet*wfx->packet_size); | 69 | ci->seek_buffer(ci->id3->first_frame_offset+initial_packet*wfx->packet_size); |
70 | /*seek failed so return time stamp of the initial packet*/ | 70 | /*seek failed so return time stamp of the initial packet*/ |
71 | return asf_get_timestamp(&duration, ci); | 71 | return asf_get_timestamp(&duration); |
72 | } | 72 | } |
73 | 73 | ||
74 | if ((time+duration>=ms && time<=ms) || count > 10) { | 74 | if ((time+duration>=ms && time<=ms) || count > 10) { |
@@ -141,7 +141,7 @@ restart_track: | |||
141 | int packet_offset = (resume_offset - ci->id3->first_frame_offset) | 141 | int packet_offset = (resume_offset - ci->id3->first_frame_offset) |
142 | % wfx.packet_size; | 142 | % wfx.packet_size; |
143 | ci->seek_buffer(resume_offset - packet_offset); | 143 | ci->seek_buffer(resume_offset - packet_offset); |
144 | elapsedtime = asf_get_timestamp(&i, ci); | 144 | elapsedtime = asf_get_timestamp(&i); |
145 | ci->set_elapsed(elapsedtime); | 145 | ci->set_elapsed(elapsedtime); |
146 | } | 146 | } |
147 | else | 147 | else |
@@ -190,7 +190,7 @@ restart_track: | |||
190 | } | 190 | } |
191 | errcount = 0; | 191 | errcount = 0; |
192 | new_packet: | 192 | new_packet: |
193 | res = asf_read_packet(&audiobuf, &audiobufsize, &packetlength, &wfx, ci); | 193 | res = asf_read_packet(&audiobuf, &audiobufsize, &packetlength, &wfx); |
194 | 194 | ||
195 | if (res < 0) { | 195 | if (res < 0) { |
196 | /* We'll try to recover from a parse error a certain number of | 196 | /* We'll try to recover from a parse error a certain number of |