Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 368634 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]
modifed patch for audacious-plugins-3.2.4 to work with libcdio-0.90
audacious-plugins-3.2.4.patch (text/plain), 4.20 KB, created by
igel
on 2014-01-24 17:26:04 UTC
(
hide
)
Description:
modifed patch for audacious-plugins-3.2.4 to work with libcdio-0.90
Filename:
MIME Type:
Creator:
igel
Created:
2014-01-24 17:26:04 UTC
Size:
4.20 KB
patch
obsolete
>--- cdaudio-ng.c.orig 2012-06-30 02:05:33.000000000 +0200 >+++ cdaudio-ng.c 2014-01-24 18:15:48.383729410 +0100 >@@ -26,11 +26,16 @@ > #include <cdio/cdio.h> > #include <cdio/cdtext.h> > #include <cdio/track.h> >-#include <cdio/cdda.h> > #include <cdio/audio.h> > #include <cdio/sector.h> > #include <cdio/cd_types.h> > >+#if LIBCDIO_VERSION_NUM >= 90 >+#include <cdio/paranoia/cdda.h> >+#else >+#include <cdio/cdda.h> >+#endif >+ > /* libcdio's header files #define these */ > #undef PACKAGE > #undef PACKAGE_BUGREPORT >@@ -274,9 +279,9 @@ static void cdaudio_set_strinfo (trackin > const gchar * performer, const gchar * name, > const gchar * genre) > { >- g_strlcpy (t->performer, performer, DEF_STRING_LEN); >- g_strlcpy (t->name, name, DEF_STRING_LEN); >- g_strlcpy (t->genre, genre, DEF_STRING_LEN); >+ g_strlcpy (t->performer, performer ? performer : "", DEF_STRING_LEN); >+ g_strlcpy (t->name, name ? name : "", DEF_STRING_LEN); >+ g_strlcpy (t->genre, genre ? genre : "", DEF_STRING_LEN); > } > > /* thread safe (mutex may be locked) */ >@@ -702,23 +707,32 @@ static void scan_cd (void) > } > > /* get trackinfo[0] cdtext information (the disc) */ >+ cdtext_t *pcdtext = NULL; > if (cdng_cfg.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 > } > } > >@@ -726,7 +740,7 @@ static void scan_cd (void) > gboolean cdtext_was_available = FALSE; > for (trackno = firsttrackno; trackno <= lasttrackno; trackno++) > { >- cdtext_t *pcdtext = NULL; >+#if LIBCDIO_VERSION_NUM < 90 > if (cdng_cfg.use_cdtext) > { > AUDDBG ("getting cd-text information for track %d\n", trackno); >@@ -737,16 +751,20 @@ static void scan_cd (void) > pcdtext = NULL; > } > } >+#endif > > if (pcdtext != NULL) > { > cdaudio_set_strinfo (&trackinfo[trackno], >- 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, trackno), >+ cdtext_get(pcdtext, CDTEXT_FIELD_TITLE, trackno), >+ cdtext_get(pcdtext, CDTEXT_FIELD_GENRE, trackno)); >+#else >+ pcdtext->field[CDTEXT_PERFORMER], >+ pcdtext->field[CDTEXT_TITLE], >+ pcdtext->field[CDTEXT_GENRE]); >+#endif > cdtext_was_available = TRUE; > } > else
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