Attachment #506768 for bug #638682




#include <cdio/sector.h>
#include <cdio/cd_types.h>

#if LIBCDIO_VERSION_NUM >= 90 || LIBCDIO_VERSION_NUM == 1
#include <cdio/paranoia/cdda.h>
#else
#include <cdio/cdda.h>

    if (aud_get_bool ("CDDA", "use_cdtext"))
    {
        AUDDBG ("getting cd-text information for disc\n");
#if LIBCDIO_VERSION_NUM >= 90 || LIBCDIO_VERSION_NUM == 1
        pcdtext = cdio_get_cdtext (pcdrom_drive->p_cdio);
        if (pcdtext == nullptr)
#else

        }
        else
        {
#if LIBCDIO_VERSION_NUM >= 90 || LIBCDIO_VERSION_NUM == 1
            trackinfo[0].performer = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_PERFORMER, 0));
            trackinfo[0].name = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_TITLE, 0));
            trackinfo[0].genre = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_GENRE, 0));

    bool cdtext_was_available = false;
    for (int trackno = firsttrackno; trackno <= lasttrackno; trackno++)
    {
#if LIBCDIO_VERSION_NUM < 90 && LIBCDIO_VERSION_NUM != 1
        if (aud_get_bool ("CDDA", "use_cdtext"))
        {
            AUDDBG ("getting cd-text information for track %d\n", trackno);


        if (pcdtext != nullptr)
        {
#if LIBCDIO_VERSION_NUM >= 90 || LIBCDIO_VERSION_NUM == 1
            trackinfo[trackno].performer = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_PERFORMER, trackno));
            trackinfo[trackno].name = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_TITLE, trackno));
            trackinfo[trackno].genre = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_GENRE, trackno));

Return to bug 638682

Lines 33-39 Link Here

(-)audacious-plugins-3.9.orig/src/cdaudio/cdaudio-ng.cc (-5 / +5 lines)
33	#include <cdio/sector.h>	33	#include <cdio/sector.h>
34	#include <cdio/cd_types.h>	34	#include <cdio/cd_types.h>
35		35
36	#if LIBCDIO_VERSION_NUM >= 90	36	#if LIBCDIO_VERSION_NUM >= 90 \|\| LIBCDIO_VERSION_NUM == 1
37	#include <cdio/paranoia/cdda.h>	37	#include <cdio/paranoia/cdda.h>
38	#else	38	#else
39	#include <cdio/cdda.h>	39	#include <cdio/cdda.h>
Lines 540-546 Link Here
540	if (aud_get_bool ("CDDA", "use_cdtext"))	540	if (aud_get_bool ("CDDA", "use_cdtext"))
541	{	541	{
542	AUDDBG ("getting cd-text information for disc\n");	542	AUDDBG ("getting cd-text information for disc\n");
543	#if LIBCDIO_VERSION_NUM >= 90	543	#if LIBCDIO_VERSION_NUM >= 90 \|\| LIBCDIO_VERSION_NUM == 1
544	pcdtext = cdio_get_cdtext (pcdrom_drive->p_cdio);	544	pcdtext = cdio_get_cdtext (pcdrom_drive->p_cdio);
545	if (pcdtext == nullptr)	545	if (pcdtext == nullptr)
546	#else	546	#else
Lines 552-558 Link Here
552	}	552	}
553	else	553	else
554	{	554	{
555	#if LIBCDIO_VERSION_NUM >= 90	555	#if LIBCDIO_VERSION_NUM >= 90 \|\| LIBCDIO_VERSION_NUM == 1
556	trackinfo[0].performer = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_PERFORMER, 0));	556	trackinfo[0].performer = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_PERFORMER, 0));
557	trackinfo[0].name = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_TITLE, 0));	557	trackinfo[0].name = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_TITLE, 0));
558	trackinfo[0].genre = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_GENRE, 0));	558	trackinfo[0].genre = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_GENRE, 0));
Lines 568-574 Link Here
568	bool cdtext_was_available = false;	568	bool cdtext_was_available = false;
569	for (int trackno = firsttrackno; trackno <= lasttrackno; trackno++)	569	for (int trackno = firsttrackno; trackno <= lasttrackno; trackno++)
570	{	570	{
571	#if LIBCDIO_VERSION_NUM < 90	571	#if LIBCDIO_VERSION_NUM < 90 && LIBCDIO_VERSION_NUM != 1
572	if (aud_get_bool ("CDDA", "use_cdtext"))	572	if (aud_get_bool ("CDDA", "use_cdtext"))
573	{	573	{
574	AUDDBG ("getting cd-text information for track %d\n", trackno);	574	AUDDBG ("getting cd-text information for track %d\n", trackno);
Lines 583-589 Link Here
583		583
584	if (pcdtext != nullptr)	584	if (pcdtext != nullptr)
585	{	585	{
586	#if LIBCDIO_VERSION_NUM >= 90	586	#if LIBCDIO_VERSION_NUM >= 90 \|\| LIBCDIO_VERSION_NUM == 1
587	trackinfo[trackno].performer = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_PERFORMER, trackno));	587	trackinfo[trackno].performer = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_PERFORMER, trackno));
588	trackinfo[trackno].name = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_TITLE, trackno));	588	trackinfo[trackno].name = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_TITLE, trackno));
589	trackinfo[trackno].genre = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_GENRE, trackno));	589	trackinfo[trackno].genre = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_GENRE, trackno));