From 2f394cfaf50d316be9f8b1675a01f04da7cd9ac5 Mon Sep 17 00:00:00 2001 From: Angel Ortega Date: Tue, 11 Dec 2007 10:18:44 +0100 Subject: [PATCH] New function count_tracks() (Closes: #1144). --- TODO | 2 +- song.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/TODO b/TODO index 33513f0..733a1ab 100644 --- a/TODO +++ b/TODO @@ -5,7 +5,6 @@ Release Critical Bugs --------------------- * 1143: Fix solo tracks. - * 1144: Fix number of track counts. Open Bugs --------- @@ -350,5 +349,6 @@ Closed (Fri, 24 Aug 2007 10:14:10 +0200). * 1138: Use ffmpeg as a fallback for audio file conversions (needs #1141 closed) (Fri, 24 Aug 2007 10:32:39 +0200). + * 1144: Fix number of track counts (Tue, 11 Dec 2007 10:18:26 +0100). Email bugs to angel@triptico.com diff --git a/song.c b/song.c index 9a6e6f0..0453cd4 100644 --- a/song.c +++ b/song.c @@ -368,6 +368,24 @@ static int time_type_eventid_cmp(const void *v1, const void *v2) } +static void count_tracks(void) +/* sets n_song_tracks */ +{ + int n; + + n_song_tracks = 0; + + for(n = 0; n < n_song_ev; n++) { + struct song_ev *e; + + e = &song[n]; + + if (n_song_tracks < e->trk_id + 1) + n_song_tracks = e->trk_id + 1; + } +} + + static void add_eot_events(void) /* travels all events and adds EOT ones */ { @@ -403,6 +421,7 @@ static void add_eot_events(void) */ void song_sort(void) { + count_tracks(); add_eot_events(); /* sorts by time, type and event_id */ -- 2.11.4.GIT