Dominique Leuenberger
d98a9d1a57
Fix cdda support. 2nd part to fix bnc#774636 OBS-URL: https://build.opensuse.org/request/show/130256 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gvfs?expand=0&rev=149
35 lines
1.6 KiB
Diff
35 lines
1.6 KiB
Diff
diff --git a/daemon/gvfsbackendcdda.c b/daemon/gvfsbackendcdda.c
|
|
index 6f009c7..5abbbf1 100644
|
|
--- a/daemon/gvfsbackendcdda.c
|
|
+++ b/daemon/gvfsbackendcdda.c
|
|
@@ -169,11 +169,11 @@ fetch_metadata (GVfsBackendCdda *cdda_backend)
|
|
if (!cdio)
|
|
return;
|
|
|
|
- cdtext = cdio_get_cdtext(cdio, 0);
|
|
+ cdtext = cdio_get_cdtext(cdio);
|
|
if (cdtext) {
|
|
- cdda_backend->album_title = g_strdup (cdtext_get (CDTEXT_TITLE, cdtext));
|
|
- cdda_backend->album_artist = g_strdup (cdtext_get (CDTEXT_PERFORMER, cdtext));
|
|
- cdda_backend->genre = g_strdup (cdtext_get (CDTEXT_GENRE, cdtext));
|
|
+ cdda_backend->album_title = g_strdup (cdtext_get (cdtext, CDTEXT_FIELD_TITLE, 0));
|
|
+ cdda_backend->album_artist = g_strdup (cdtext_get (cdtext, CDTEXT_FIELD_PERFORMER, 0));
|
|
+ cdda_backend->genre = g_strdup (cdtext_get (cdtext, CDTEXT_FIELD_GENRE, 0));
|
|
}
|
|
|
|
cdtrack = cdio_get_first_track_num(cdio);
|
|
@@ -182,10 +182,10 @@ fetch_metadata (GVfsBackendCdda *cdda_backend)
|
|
for ( ; cdtrack < last_cdtrack; cdtrack++ ) {
|
|
GVfsBackendCddaTrack *track;
|
|
track = g_new0 (GVfsBackendCddaTrack, 1);
|
|
- cdtext = cdio_get_cdtext(cdio, cdtrack);
|
|
+ cdtext = cdio_get_cdtext(cdio);
|
|
if (cdtext) {
|
|
- track->title = g_strdup (cdtext_get (CDTEXT_TITLE, cdtext));
|
|
- track->artist = g_strdup (cdtext_get (CDTEXT_PERFORMER, cdtext));
|
|
+ track->title = g_strdup (cdtext_get (cdtext, CDTEXT_FIELD_TITLE, cdtrack));
|
|
+ track->artist = g_strdup (cdtext_get (cdtext, CDTEXT_FIELD_PERFORMER, cdtrack));
|
|
}
|
|
track->duration = cdio_get_track_sec_count (cdio, cdtrack) / CDIO_CD_FRAMES_PER_SEC;
|
|
|