forked from len0rd/rockbox
Redo 30225 differently to not break the audio formats order for skins.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30296 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
8355ace582
commit
e20ff44e9d
2 changed files with 3 additions and 4 deletions
|
@ -61,8 +61,8 @@ bool write_metadata_log = false;
|
||||||
const struct afmt_entry audio_formats[AFMT_NUM_CODECS] =
|
const struct afmt_entry audio_formats[AFMT_NUM_CODECS] =
|
||||||
{
|
{
|
||||||
/* Unknown file format */
|
/* Unknown file format */
|
||||||
[AFMT_UNKNOWN] =
|
[0 ... AFMT_NUM_CODECS-1] =
|
||||||
AFMT_ENTRY("???", NULL, NULL, NULL, NULL ),
|
AFMT_ENTRY("???", NULL, NULL, NULL, "" ),
|
||||||
|
|
||||||
/* MPEG Audio layer 2 */
|
/* MPEG Audio layer 2 */
|
||||||
[AFMT_MPA_L2] =
|
[AFMT_MPA_L2] =
|
||||||
|
|
|
@ -36,12 +36,11 @@ enum
|
||||||
AFMT_UNKNOWN = 0, /* Unknown file format */
|
AFMT_UNKNOWN = 0, /* Unknown file format */
|
||||||
|
|
||||||
/* start formats */
|
/* start formats */
|
||||||
|
AFMT_MPA_L1, /* MPEG Audio layer 1 */
|
||||||
AFMT_MPA_L2, /* MPEG Audio layer 2 */
|
AFMT_MPA_L2, /* MPEG Audio layer 2 */
|
||||||
AFMT_MPA_L3, /* MPEG Audio layer 3 */
|
AFMT_MPA_L3, /* MPEG Audio layer 3 */
|
||||||
|
|
||||||
#if CONFIG_CODEC == SWCODEC
|
#if CONFIG_CODEC == SWCODEC
|
||||||
AFMT_MPA_L1, /* MPEG Audio layer 1 */
|
|
||||||
AFMT_AIFF, /* Audio Interchange File Format */
|
AFMT_AIFF, /* Audio Interchange File Format */
|
||||||
AFMT_PCM_WAV, /* Uncompressed PCM in a WAV file */
|
AFMT_PCM_WAV, /* Uncompressed PCM in a WAV file */
|
||||||
AFMT_OGG_VORBIS, /* Ogg Vorbis */
|
AFMT_OGG_VORBIS, /* Ogg Vorbis */
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue