diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/playback.c | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/apps/playback.c b/apps/playback.c index 2085549090..497f250a9c 100644 --- a/apps/playback.c +++ b/apps/playback.c | |||
@@ -2407,6 +2407,22 @@ static bool audio_load_track(int offset, bool start_play) | |||
2407 | } | 2407 | } |
2408 | #endif | 2408 | #endif |
2409 | 2409 | ||
2410 | struct mp3entry *track_id3; | ||
2411 | |||
2412 | if (track_widx == track_ridx) | ||
2413 | track_id3 = &curtrack_id3; | ||
2414 | else | ||
2415 | track_id3 = bufgetid3(tracks[track_widx].id3_hid); | ||
2416 | |||
2417 | #ifdef HAVE_ALBUMART | ||
2418 | if (gui_sync_wps_uses_albumart()) | ||
2419 | { | ||
2420 | char aa_path[MAX_PATH]; | ||
2421 | if (find_albumart(track_id3, aa_path, sizeof(aa_path))) | ||
2422 | tracks[track_widx].aa_hid = bufopen(aa_path, 0, TYPE_BITMAP); | ||
2423 | } | ||
2424 | #endif | ||
2425 | |||
2410 | /* Load the codec. */ | 2426 | /* Load the codec. */ |
2411 | if (!audio_loadcodec(start_play)) | 2427 | if (!audio_loadcodec(start_play)) |
2412 | { | 2428 | { |
@@ -2427,23 +2443,6 @@ static bool audio_load_track(int offset, bool start_play) | |||
2427 | goto peek_again; | 2443 | goto peek_again; |
2428 | } | 2444 | } |
2429 | 2445 | ||
2430 | struct mp3entry *track_id3; | ||
2431 | |||
2432 | if (track_widx == track_ridx) | ||
2433 | track_id3 = &curtrack_id3; | ||
2434 | else | ||
2435 | track_id3 = bufgetid3(tracks[track_widx].id3_hid); | ||
2436 | |||
2437 | |||
2438 | #ifdef HAVE_ALBUMART | ||
2439 | if (gui_sync_wps_uses_albumart()) | ||
2440 | { | ||
2441 | char aa_path[MAX_PATH]; | ||
2442 | if (find_albumart(track_id3, aa_path, sizeof(aa_path))) | ||
2443 | tracks[track_widx].aa_hid = bufopen(aa_path, 0, TYPE_BITMAP); | ||
2444 | } | ||
2445 | #endif | ||
2446 | |||
2447 | track_id3->elapsed = 0; | 2446 | track_id3->elapsed = 0; |
2448 | 2447 | ||
2449 | enum data_type type = TYPE_PACKET_AUDIO; | 2448 | enum data_type type = TYPE_PACKET_AUDIO; |