diff options
author | Dominik Wenger <domonoky@googlemail.com> | 2010-02-06 12:49:03 +0000 |
---|---|---|
committer | Dominik Wenger <domonoky@googlemail.com> | 2010-02-06 12:49:03 +0000 |
commit | e96d139b4a0734f53a68c129acb96573009e1cb2 (patch) | |
tree | 23d4e5e0c1fa45f7c1cc394a83b5c04ab6561834 | |
parent | 5513c30e34569d64f5b923b0aeaeea9ef55a0119 (diff) | |
download | rockbox-e96d139b4a0734f53a68c129acb96573009e1cb2.tar.gz rockbox-e96d139b4a0734f53a68c129acb96573009e1cb2.zip |
Enable 12 other 8bit Atari file formats which the asap codec already supports. No metadata available for them.
New formats: .cmc / .cm3 / .cmr / .cms / .dmc / .dlt / .mpd / .mpt / .rmt / .tmc / .tm8 /.tm2
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24529 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/filetypes.c | 12 | ||||
-rw-r--r-- | apps/metadata.c | 56 | ||||
-rw-r--r-- | apps/metadata.h | 14 |
3 files changed, 80 insertions, 2 deletions
diff --git a/apps/filetypes.c b/apps/filetypes.c index 8044d7170c..671a8d5f1b 100644 --- a/apps/filetypes.c +++ b/apps/filetypes.c | |||
@@ -86,6 +86,18 @@ static const struct filetype inbuilt_filetypes[] = { | |||
86 | { "rm", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA }, | 86 | { "rm", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA }, |
87 | { "ra", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA }, | 87 | { "ra", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA }, |
88 | { "rmvb",FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA }, | 88 | { "rmvb",FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA }, |
89 | { "cmc", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA }, | ||
90 | { "cm3", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA }, | ||
91 | { "cmr", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA }, | ||
92 | { "cms", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA }, | ||
93 | { "dmc", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA }, | ||
94 | { "dlt", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA }, | ||
95 | { "mpt", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA }, | ||
96 | { "mpd", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA }, | ||
97 | { "rmt", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA }, | ||
98 | { "tmc", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA }, | ||
99 | { "tm8", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA }, | ||
100 | { "tm2", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA }, | ||
89 | #endif | 101 | #endif |
90 | { "m3u", FILE_ATTR_M3U, Icon_Playlist, LANG_PLAYLIST }, | 102 | { "m3u", FILE_ATTR_M3U, Icon_Playlist, LANG_PLAYLIST }, |
91 | { "m3u8",FILE_ATTR_M3U, Icon_Playlist, LANG_PLAYLIST }, | 103 | { "m3u8",FILE_ATTR_M3U, Icon_Playlist, LANG_PLAYLIST }, |
diff --git a/apps/metadata.c b/apps/metadata.c index a205dd4d6f..6281a8526c 100644 --- a/apps/metadata.c +++ b/apps/metadata.c | |||
@@ -126,6 +126,42 @@ const struct afmt_entry audio_formats[AFMT_NUM_CODECS] = | |||
126 | /* ATRAC3 in RM/RA */ | 126 | /* ATRAC3 in RM/RA */ |
127 | [AFMT_RM_ATRAC3] = | 127 | [AFMT_RM_ATRAC3] = |
128 | AFMT_ENTRY("ATRAC3","atrac3_rm", NULL, "rm\0ra\0rmvb\0" ), | 128 | AFMT_ENTRY("ATRAC3","atrac3_rm", NULL, "rm\0ra\0rmvb\0" ), |
129 | /* Atari CMC File */ | ||
130 | [AFMT_CMC] = | ||
131 | AFMT_ENTRY("CMC", "asap", NULL, "cmc\0" ), | ||
132 | /* Atari CM3 File */ | ||
133 | [AFMT_CM3] = | ||
134 | AFMT_ENTRY("CM3", "asap", NULL, "cm3\0" ), | ||
135 | /* Atari CMR File */ | ||
136 | [AFMT_CMR] = | ||
137 | AFMT_ENTRY("CMR", "asap", NULL, "cmr\0" ), | ||
138 | /* Atari CMS File */ | ||
139 | [AFMT_CMS] = | ||
140 | AFMT_ENTRY("CMS", "asap", NULL, "cms\0" ), | ||
141 | /* Atari DMC File */ | ||
142 | [AFMT_DMC] = | ||
143 | AFMT_ENTRY("DMC", "asap", NULL, "dmc\0" ), | ||
144 | /* Atari DLT File */ | ||
145 | [AFMT_DLT] = | ||
146 | AFMT_ENTRY("DLT", "asap", NULL, "dlt\0" ), | ||
147 | /* Atari MPT File */ | ||
148 | [AFMT_MPT] = | ||
149 | AFMT_ENTRY("MPT", "asap", NULL, "mpt\0" ), | ||
150 | /* Atari MPD File */ | ||
151 | [AFMT_MPD] = | ||
152 | AFMT_ENTRY("MPD", "asap", NULL, "mpd\0" ), | ||
153 | /* Atari RMT File */ | ||
154 | [AFMT_RMT] = | ||
155 | AFMT_ENTRY("RMT", "asap", NULL, "rmt\0" ), | ||
156 | /* Atari TMC File */ | ||
157 | [AFMT_TMC] = | ||
158 | AFMT_ENTRY("TMC", "asap", NULL, "tmc\0" ), | ||
159 | /* Atari TM8 File */ | ||
160 | [AFMT_TM8] = | ||
161 | AFMT_ENTRY("TM8", "asap", NULL, "tm8\0" ), | ||
162 | /* Atari TM2 File */ | ||
163 | [AFMT_TM2] = | ||
164 | AFMT_ENTRY("TM2", "asap", NULL, "tm2\0" ), | ||
129 | #endif | 165 | #endif |
130 | }; | 166 | }; |
131 | 167 | ||
@@ -375,7 +411,25 @@ bool get_metadata(struct mp3entry* id3, int fd, const char* trackname) | |||
375 | id3->filesize = filesize(fd); | 411 | id3->filesize = filesize(fd); |
376 | id3->genre_string = id3_get_num_genre(36); | 412 | id3->genre_string = id3_get_num_genre(36); |
377 | break; | 413 | break; |
378 | 414 | ||
415 | case AFMT_CMC: | ||
416 | case AFMT_CM3: | ||
417 | case AFMT_CMR: | ||
418 | case AFMT_CMS: | ||
419 | case AFMT_DMC: | ||
420 | case AFMT_DLT: | ||
421 | case AFMT_MPT: | ||
422 | case AFMT_MPD: | ||
423 | case AFMT_RMT: | ||
424 | case AFMT_TMC: | ||
425 | case AFMT_TM8: | ||
426 | case AFMT_TM2: | ||
427 | id3->bitrate = 706; | ||
428 | id3->frequency = 44100; | ||
429 | id3->vbr = false; | ||
430 | id3->filesize = filesize(fd); | ||
431 | id3->genre_string = id3_get_num_genre(36); | ||
432 | break; | ||
379 | case AFMT_RM_COOK: | 433 | case AFMT_RM_COOK: |
380 | if (!get_rm_metadata(fd, id3)) | 434 | if (!get_rm_metadata(fd, id3)) |
381 | { | 435 | { |
diff --git a/apps/metadata.h b/apps/metadata.h index 6144543aa6..9b9cf9dfd1 100644 --- a/apps/metadata.h +++ b/apps/metadata.h | |||
@@ -60,11 +60,23 @@ enum | |||
60 | AFMT_APE, /* Monkey's Audio (APE) */ | 60 | AFMT_APE, /* Monkey's Audio (APE) */ |
61 | AFMT_WMA, /* WMAV1/V2 in ASF */ | 61 | AFMT_WMA, /* WMAV1/V2 in ASF */ |
62 | AFMT_MOD, /* Amiga MOD File Format */ | 62 | AFMT_MOD, /* Amiga MOD File Format */ |
63 | AFMT_SAP, /* Amiga 8Bit SAP Format */ | 63 | AFMT_SAP, /* Atari 8Bit SAP Format */ |
64 | AFMT_RM_COOK, /* Cook in RM/RA */ | 64 | AFMT_RM_COOK, /* Cook in RM/RA */ |
65 | AFMT_RM_AAC, /* AAC in RM/RA */ | 65 | AFMT_RM_AAC, /* AAC in RM/RA */ |
66 | AFMT_RM_AC3, /* AC3 in RM/RA */ | 66 | AFMT_RM_AC3, /* AC3 in RM/RA */ |
67 | AFMT_RM_ATRAC3, /* ATRAC3 in RM/RA */ | 67 | AFMT_RM_ATRAC3, /* ATRAC3 in RM/RA */ |
68 | AFMT_CMC, /* Atari 8bit cmc format */ | ||
69 | AFMT_CM3, /* Atari 8bit cm3 format */ | ||
70 | AFMT_CMR, /* Atari 8bit cmr format */ | ||
71 | AFMT_CMS, /* Atari 8bit cms format */ | ||
72 | AFMT_DMC, /* Atari 8bit dmc format */ | ||
73 | AFMT_DLT, /* Atari 8bit dlt format */ | ||
74 | AFMT_MPT, /* Atari 8bit mpt format */ | ||
75 | AFMT_MPD, /* Atari 8bit mpd format */ | ||
76 | AFMT_RMT, /* Atari 8bit rmt format */ | ||
77 | AFMT_TMC, /* Atari 8bit tmc format */ | ||
78 | AFMT_TM8, /* Atari 8bit tm8 format */ | ||
79 | AFMT_TM2, /* Atari 8bit tm2 format */ | ||
68 | #endif | 80 | #endif |
69 | 81 | ||
70 | /* add new formats at any index above this line to have a sensible order - | 82 | /* add new formats at any index above this line to have a sensible order - |