Commit 64716237 authored by Rocky Bernstein's avatar Rocky Bernstein

Compatability for different versions of libcdio from 0.71-0.74cvs

parent ec5107fa
...@@ -399,12 +399,12 @@ CDDARead( access_t * p_access, uint8_t *p_buffer, int i_len ) ...@@ -399,12 +399,12 @@ CDDARead( access_t * p_access, uint8_t *p_buffer, int i_len )
return i_len; return i_len;
} }
#if LIBCDIO_VERSION_NUM >= 73
/*! Pause CD playing via audio control */ /*! Pause CD playing via audio control */
static bool static bool
cdda_audio_pause(CdIo_t *p_cdio) cdda_audio_pause(CdIo_t *p_cdio)
{ {
bool b_ok = true; bool b_ok = true;
#if LIBCDIO_VERSION_NUM >= 73
cdio_subchannel_t sub; cdio_subchannel_t sub;
if (DRIVER_OP_SUCCESS == cdio_audio_read_subchannel(p_cdio, &sub)) { if (DRIVER_OP_SUCCESS == cdio_audio_read_subchannel(p_cdio, &sub)) {
if (sub.audio_status == CDIO_MMC_READ_SUB_ST_PLAY) { if (sub.audio_status == CDIO_MMC_READ_SUB_ST_PLAY) {
...@@ -412,9 +412,11 @@ cdda_audio_pause(CdIo_t *p_cdio) ...@@ -412,9 +412,11 @@ cdda_audio_pause(CdIo_t *p_cdio)
} }
} else } else
b_ok = false; b_ok = false;
#endif
return b_ok; return b_ok;
} }
#if LIBCDIO_VERSION_NUM >= 73
/*! play CD using audio controls */ /*! play CD using audio controls */
static driver_return_code_t static driver_return_code_t
cdda_audio_play(CdIo_t *p_cdio, lsn_t start_lsn, lsn_t end_lsn) cdda_audio_play(CdIo_t *p_cdio, lsn_t start_lsn, lsn_t end_lsn)
......
...@@ -37,9 +37,11 @@ ...@@ -37,9 +37,11 @@
* Option help text * Option help text
*****************************************************************************/ *****************************************************************************/
#if LIBCDIO_VERSION_NUM >= 72
static char *psz_paranoia_list[] = { "none", "overlap", "full" }; static char *psz_paranoia_list[] = { "none", "overlap", "full" };
static char *psz_paranoia_list_text[] = { N_("none"), N_("overlap"), static char *psz_paranoia_list_text[] = { N_("none"), N_("overlap"),
N_("full") }; N_("full") };
#endif
#define DEBUG_LONGTEXT N_( \ #define DEBUG_LONGTEXT N_( \
"This integer when viewed in binary is a debugging mask\n" \ "This integer when viewed in binary is a debugging mask\n" \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment