[MPlayer-cvslog] CVS: main/libmpdemux cdda.c, 1.17, 1.18 cddb.c, 1.18, 1.19 cdd.h, 1.2, 1.3

[Reimar Döffinger]

Hi,
> +#ifndef HAVE_LIBCDIO
>    st->start_pos = priv->start_sector*CD_FRAMESIZE_RAW;
>    st->end_pos = priv->end_sector*CD_FRAMESIZE_RAW;
>    st->type = STREAMTYPE_CDDA;
>    st->sector_size = CD_FRAMESIZE_RAW;
> +#else
> +  st->start_pos = priv->start_sector*CDIO_CD_FRAMESIZE_RAW;
> +  st->end_pos = priv->end_sector*CDIO_CD_FRAMESIZE_RAW;
> +  st->type = STREAMTYPE_CDDA;
> +  st->sector_size = CDIO_CD_FRAMESIZE_RAW;
> +#endif

Please do something like
#ifndef CD_FRAMESIZE_RAW
#define CD_FRAMESIZE_RAW CDIO_CD_FRAMESIZE_RAW
#endif
instead of that #ifndef hell all over the place.

Greetings,
Reimar Döffinger