Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 368628 Details for
Bug 452458
=media-plugins/audacious-plugins-3.3.3 is not compatible with dev-libs/libcdio-paranoia
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch rejects on audacious-plugins-3.2.4
cdaudio-ng.c.rej (text/plain), 2.00 KB, created by
igel
on 2014-01-24 17:04:11 UTC
(
hide
)
Description:
patch rejects on audacious-plugins-3.2.4
Filename:
MIME Type:
Creator:
igel
Created:
2014-01-24 17:04:11 UTC
Size:
2.00 KB
patch
obsolete
>--- src/cdaudio-ng/cdaudio-ng.c >+++ src/cdaudio-ng/cdaudio-ng.c >@@ -627,23 +632,32 @@ > } > > /* get trackinfo[0] cdtext information (the disc) */ >+ cdtext_t *pcdtext = NULL; > if (aud_get_bool ("CDDA", "use_cdtext")) > { > AUDDBG ("getting cd-text information for disc\n"); >- cdtext_t *pcdtext = cdio_get_cdtext (pcdrom_drive->p_cdio, 0); >+#if LIBCDIO_VERSION_NUM >= 90 >+ pcdtext = cdio_get_cdtext (pcdrom_drive->p_cdio); >+ if (pcdtext == NULL) >+#else >+ pcdtext = cdio_get_cdtext (pcdrom_drive->p_cdio, 0); > if (pcdtext == NULL || pcdtext->field[CDTEXT_TITLE] == NULL) >+#endif > { > AUDDBG ("no cd-text available for disc\n"); > } > else > { > cdaudio_set_strinfo (&trackinfo[0], >- pcdtext->field[CDTEXT_PERFORMER] ? pcdtext-> >- field[CDTEXT_PERFORMER] : "", >- pcdtext->field[CDTEXT_TITLE] ? pcdtext-> >- field[CDTEXT_TITLE] : "", >- pcdtext->field[CDTEXT_GENRE] ? pcdtext-> >- field[CDTEXT_GENRE] : ""); >+#if LIBCDIO_VERSION_NUM >= 90 >+ cdtext_get(pcdtext, CDTEXT_FIELD_PERFORMER, 0), >+ cdtext_get(pcdtext, CDTEXT_FIELD_TITLE, 0), >+ cdtext_get(pcdtext, CDTEXT_FIELD_GENRE, 0)); >+#else >+ pcdtext->field[CDTEXT_PERFORMER], >+ pcdtext->field[CDTEXT_TITLE], >+ pcdtext->field[CDTEXT_GENRE]); >+#endif > } > } > >@@ -651,7 +665,7 @@ > bool_t cdtext_was_available = FALSE; > for (trackno = firsttrackno; trackno <= lasttrackno; trackno++) > { >- cdtext_t *pcdtext = NULL; >+#if LIBCDIO_VERSION_NUM < 90 > if (aud_get_bool ("CDDA", "use_cdtext")) > { > AUDDBG ("getting cd-text information for track %d\n", trackno);
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 452458
:
335792
| 368628 |
368634