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[] = {
     { "rm",  FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA },
     { "ra",  FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA },
     { "rmvb",FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA },
+    { "cmc", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA },
+    { "cm3", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA },
+    { "cmr", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA },
+    { "cms", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA },
+    { "dmc", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA },
+    { "dlt", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA },
+    { "mpt", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA },
+    { "mpd", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA },
+    { "rmt", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA },
+    { "tmc", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA },
+    { "tm8", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA },
+    { "tm2", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA },
 #endif
     { "m3u", FILE_ATTR_M3U, Icon_Playlist, LANG_PLAYLIST },
     { "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] =
     /* ATRAC3 in RM/RA */
     [AFMT_RM_ATRAC3] =
         AFMT_ENTRY("ATRAC3","atrac3_rm",  NULL,        "rm\0ra\0rmvb\0"      ),
+    /* Atari CMC File */
+    [AFMT_CMC] =
+        AFMT_ENTRY("CMC",  "asap",     NULL,          "cmc\0"      ),
+    /* Atari CM3 File */
+    [AFMT_CM3] =
+        AFMT_ENTRY("CM3",  "asap",     NULL,          "cm3\0"      ),
+    /* Atari CMR File */
+    [AFMT_CMR] =
+        AFMT_ENTRY("CMR",  "asap",     NULL,          "cmr\0"      ),
+    /* Atari CMS File */
+    [AFMT_CMS] =
+        AFMT_ENTRY("CMS",  "asap",     NULL,          "cms\0"      ),
+    /* Atari DMC File */
+    [AFMT_DMC] =
+        AFMT_ENTRY("DMC",  "asap",     NULL,          "dmc\0"      ),
+    /* Atari DLT File */
+    [AFMT_DLT] =
+        AFMT_ENTRY("DLT",  "asap",     NULL,          "dlt\0"      ),
+    /* Atari MPT File */
+    [AFMT_MPT] =
+        AFMT_ENTRY("MPT",  "asap",     NULL,          "mpt\0"      ), 
+    /* Atari MPD File */
+    [AFMT_MPD] =
+        AFMT_ENTRY("MPD",  "asap",     NULL,          "mpd\0"      ),
+    /* Atari RMT File */
+    [AFMT_RMT] =
+        AFMT_ENTRY("RMT",  "asap",     NULL,          "rmt\0"      ),
+    /* Atari TMC File */
+    [AFMT_TMC] =
+        AFMT_ENTRY("TMC",  "asap",     NULL,          "tmc\0"      ),
+    /* Atari TM8 File */
+    [AFMT_TM8] =
+        AFMT_ENTRY("TM8",  "asap",     NULL,          "tm8\0"      ),
+    /* Atari TM2 File */
+    [AFMT_TM2] =
+        AFMT_ENTRY("TM2",  "asap",     NULL,          "tm2\0"      ),        
 #endif
 };
 
@@ -375,7 +411,25 @@ bool get_metadata(struct mp3entry* id3, int fd, const char* trackname)
         id3->filesize = filesize(fd);
         id3->genre_string = id3_get_num_genre(36);
         break;
-
+    
+    case AFMT_CMC:
+    case AFMT_CM3:
+    case AFMT_CMR:
+    case AFMT_CMS:
+    case AFMT_DMC:
+    case AFMT_DLT:
+    case AFMT_MPT:
+    case AFMT_MPD:
+    case AFMT_RMT:
+    case AFMT_TMC:
+    case AFMT_TM8:
+    case AFMT_TM2:
+        id3->bitrate = 706;
+        id3->frequency = 44100;
+        id3->vbr = false;
+        id3->filesize = filesize(fd);
+        id3->genre_string = id3_get_num_genre(36);
+        break;
     case AFMT_RM_COOK:
         if (!get_rm_metadata(fd, id3))
         {
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
     AFMT_APE,          /* Monkey's Audio (APE) */
     AFMT_WMA,          /* WMAV1/V2 in ASF */
     AFMT_MOD,          /* Amiga MOD File Format */
-    AFMT_SAP,          /* Amiga 8Bit SAP Format */
+    AFMT_SAP,          /* Atari 8Bit SAP Format */
     AFMT_RM_COOK,      /* Cook in RM/RA */
     AFMT_RM_AAC,       /* AAC in RM/RA */
     AFMT_RM_AC3,       /* AC3 in RM/RA */
     AFMT_RM_ATRAC3,    /* ATRAC3 in RM/RA */
+    AFMT_CMC,          /* Atari 8bit cmc format */
+    AFMT_CM3,          /* Atari 8bit cm3 format */
+    AFMT_CMR,          /* Atari 8bit cmr format */
+    AFMT_CMS,          /* Atari 8bit cms format */
+    AFMT_DMC,          /* Atari 8bit dmc format */
+    AFMT_DLT,          /* Atari 8bit dlt format */
+    AFMT_MPT,          /* Atari 8bit mpt format */
+    AFMT_MPD,          /* Atari 8bit mpd format */
+    AFMT_RMT,          /* Atari 8bit rmt format */
+    AFMT_TMC,          /* Atari 8bit tmc format */
+    AFMT_TM8,          /* Atari 8bit tm8 format */
+    AFMT_TM2,          /* Atari 8bit tm2 format */
 #endif
 
     /* add new formats at any index above this line to have a sensible order -