diff options
author | Mohamed Tarek <mt@rockbox.org> | 2010-05-02 18:27:01 +0000 |
---|---|---|
committer | Mohamed Tarek <mt@rockbox.org> | 2010-05-02 18:27:01 +0000 |
commit | 7aaae54afcda1f4ea5224d3d9d0ac3ffd69defaf (patch) | |
tree | 8aa54989bf4104440070e926a4a70706a0202793 /apps/codecs/libasf | |
parent | 2ab15d959cc56bf6037616a359fd0ec7a9ecef60 (diff) | |
download | rockbox-7aaae54afcda1f4ea5224d3d9d0ac3ffd69defaf.tar.gz rockbox-7aaae54afcda1f4ea5224d3d9d0ac3ffd69defaf.zip |
- Modify metadata/asf.c to use libasf.
- Modify the files in libwma to use libasf.
- Remove apps/codecs/libwma/asf.h since it's not used now.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25783 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libasf')
-rw-r--r-- | apps/codecs/libasf/asf.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/apps/codecs/libasf/asf.h b/apps/codecs/libasf/asf.h index 03af2b0de1..2007e08e86 100644 --- a/apps/codecs/libasf/asf.h +++ b/apps/codecs/libasf/asf.h | |||
@@ -17,7 +17,8 @@ enum asf_error_e { | |||
17 | ASF_ERROR_INVALID_OBJECT = -7, /* ASF object missing or in wrong place */ | 17 | ASF_ERROR_INVALID_OBJECT = -7, /* ASF object missing or in wrong place */ |
18 | ASF_ERROR_OBJECT_SIZE = -8, /* invalid ASF object size (too small) */ | 18 | ASF_ERROR_OBJECT_SIZE = -8, /* invalid ASF object size (too small) */ |
19 | ASF_ERROR_SEEKABLE = -9, /* file not seekable */ | 19 | ASF_ERROR_SEEKABLE = -9, /* file not seekable */ |
20 | ASF_ERROR_SEEK = -10 /* file is seekable but seeking failed */ | 20 | ASF_ERROR_SEEK = -10, /* file is seekable but seeking failed */ |
21 | ASF_ERROR_ENCRYPTED = -11 /* file is encrypted */ | ||
21 | }; | 22 | }; |
22 | 23 | ||
23 | struct asf_waveformatex_s { | 24 | struct asf_waveformatex_s { |
@@ -34,9 +35,12 @@ struct asf_waveformatex_s { | |||
34 | }; | 35 | }; |
35 | typedef struct asf_waveformatex_s asf_waveformatex_t; | 36 | typedef struct asf_waveformatex_s asf_waveformatex_t; |
36 | 37 | ||
38 | /* Define the packet-specific functions only for codecs not for metadata parsers */ | ||
39 | #ifdef __CODECLIB_H__ | ||
37 | int asf_read_packet(uint8_t** audiobuf, int* audiobufsize, int* packetlength, | 40 | int asf_read_packet(uint8_t** audiobuf, int* audiobufsize, int* packetlength, |
38 | asf_waveformatex_t* wfx, struct codec_api* ci); | 41 | asf_waveformatex_t* wfx, struct codec_api* ci); |
39 | 42 | ||
40 | int asf_get_timestamp(int *duration, struct codec_api* ci); | 43 | int asf_get_timestamp(int *duration, struct codec_api* ci); |
41 | |||
42 | #endif | 44 | #endif |
45 | |||
46 | #endif /* _ASF_H */ | ||