]>
Commit | Line | Data |
---|---|---|
815f6a27 JB |
1 | From 4305bc1e093e4341aeddb857bd1e6203228000cb Mon Sep 17 00:00:00 2001 |
2 | From: "R. Bernstein" <rocky@gnu.org> | |
3 | Date: Sat, 25 Nov 2017 14:03:37 -0500 | |
4 | Subject: Fix breakage caused by unshadowing i_first_track | |
5 | ||
6 | Reported and patch by KO Myung-Hun | |
7 | --- | |
8 | src/cdda-player.c | 6 +++--- | |
9 | 1 file changed, 3 insertions(+), 3 deletions(-) | |
10 | ||
11 | diff --git a/src/cdda-player.c b/src/cdda-player.c | |
12 | index efeee19..333e1f5 100644 | |
13 | --- a/src/cdda-player.c | |
14 | +++ b/src/cdda-player.c | |
15 | @@ -531,8 +531,8 @@ static void | |
16 | get_cddb_disc_info(CdIo_t *p_cdio) | |
17 | { | |
18 | #ifdef HAVE_CDDB | |
19 | - b_db = init_cddb(p_cdio, &p_conn, &p_cddb_disc, xperror, i_first_track, | |
20 | - i_tracks, &i_cddb_matches); | |
21 | + b_db = init_cddb(p_cdio, &p_conn, &p_cddb_disc, xperror, i_first_track_global, | |
22 | + i_tracks_global, &i_cddb_matches); | |
23 | if (b_db) { | |
24 | int i_year; | |
25 | i_year = atoi(year); | |
26 | @@ -831,7 +831,7 @@ get_cddb_track_info(track_t i_track) | |
27 | { | |
28 | #ifdef HAVE_CDDB | |
29 | cddb_track_t *t = cddb_disc_get_track(p_cddb_disc, | |
30 | - i_track - i_first_track); | |
31 | + i_track - i_first_track_global); | |
32 | if (t) { | |
33 | cddb_track_set_title(t, title); | |
34 | cddb_track_set_artist(t, artist); | |
35 | -- | |
36 | cgit v1.0-41-gc330 | |
37 |