diff options
author | Dave Chapman <dave@dchapman.com> | 2005-06-18 16:24:27 +0000 |
---|---|---|
committer | Dave Chapman <dave@dchapman.com> | 2005-06-18 16:24:27 +0000 |
commit | 961c9a3e4103e766f52ff1d7c2af2db6119c72ec (patch) | |
tree | c4fd5b0ea3b7063315910fea159a590e74680ed4 /apps/playback.c | |
parent | 2bfd2585a9cfb8541047a3f5eedbfd05fe36f9f9 (diff) | |
download | rockbox-961c9a3e4103e766f52ff1d7c2af2db6119c72ec.tar.gz rockbox-961c9a3e4103e766f52ff1d7c2af2db6119c72ec.zip |
Added %fc WPS tag to display codec type - moved codectype from track_info struct into mp3info struct, initialise it on MAS platforms, and add it to the WPS.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6748 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/playback.c')
-rw-r--r-- | apps/playback.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/playback.c b/apps/playback.c index fb9a788ac4..f4ec05b369 100644 --- a/apps/playback.c +++ b/apps/playback.c | |||
@@ -531,7 +531,7 @@ bool loadcodec(const char *trackname, bool start_play) | |||
531 | codec_path = NULL; | 531 | codec_path = NULL; |
532 | } | 532 | } |
533 | 533 | ||
534 | tracks[track_widx].codectype = filetype; | 534 | tracks[track_widx].id3.codectype = filetype; |
535 | tracks[track_widx].codecsize = 0; | 535 | tracks[track_widx].codecsize = 0; |
536 | if (codec_path == NULL) | 536 | if (codec_path == NULL) |
537 | return false; | 537 | return false; |
@@ -540,7 +540,7 @@ bool loadcodec(const char *trackname, bool start_play) | |||
540 | prev_track = track_widx - 1; | 540 | prev_track = track_widx - 1; |
541 | if (prev_track < 0) | 541 | if (prev_track < 0) |
542 | prev_track = MAX_TRACK-1; | 542 | prev_track = MAX_TRACK-1; |
543 | if (track_count > 0 && filetype == tracks[prev_track].codectype) { | 543 | if (track_count > 0 && filetype == tracks[prev_track].id3.codectype) { |
544 | logf("Reusing prev. codec"); | 544 | logf("Reusing prev. codec"); |
545 | return true; | 545 | return true; |
546 | } | 546 | } |
@@ -667,8 +667,8 @@ bool audio_load_track(int offset, bool start_play, int peek_offset) | |||
667 | 667 | ||
668 | /* Starting playback from an offset is only support in MPA at the moment */ | 668 | /* Starting playback from an offset is only support in MPA at the moment */ |
669 | if (offset > 0) { | 669 | if (offset > 0) { |
670 | if ((tracks[track_widx].codectype==AFMT_MPA_L2) || | 670 | if ((tracks[track_widx].id3.codectype==AFMT_MPA_L2) || |
671 | (tracks[track_widx].codectype==AFMT_MPA_L3)) { | 671 | (tracks[track_widx].id3.codectype==AFMT_MPA_L3)) { |
672 | lseek(fd, offset, SEEK_SET); | 672 | lseek(fd, offset, SEEK_SET); |
673 | tracks[track_widx].id3.offset = offset; | 673 | tracks[track_widx].id3.offset = offset; |
674 | mp3_set_elapsed(&tracks[track_widx].id3); | 674 | mp3_set_elapsed(&tracks[track_widx].id3); |
@@ -955,7 +955,7 @@ bool codec_request_next_track_callback(void) | |||
955 | 955 | ||
956 | ci.reload_codec = false; | 956 | ci.reload_codec = false; |
957 | 957 | ||
958 | if (cur_ti->codectype != tracks[track_ridx].codectype) { | 958 | if (cur_ti->id3.codectype != tracks[track_ridx].id3.codectype) { |
959 | if (--track_ridx < 0) | 959 | if (--track_ridx < 0) |
960 | track_ridx = MAX_TRACK-1; | 960 | track_ridx = MAX_TRACK-1; |
961 | logf("New codec"); | 961 | logf("New codec"); |