diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-06-21 10:19:01 +0000 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-02 04:11:07 +0200 |
| commit | 2a6b09a3d4cfc5d8e6b0bf91fd435f7503a66931 (patch) | |
| tree | 7c9b93b4ebaa930f3e1f612d48a259f8f8c0f626 /stream/stream_cdda.c | |
| parent | 2957d89083ec3d0a8bc789dbff0659799cdf4a85 (diff) | |
| download | mpv-2a6b09a3d4cfc5d8e6b0bf91fd435f7503a66931.tar.bz2 mpv-2a6b09a3d4cfc5d8e6b0bf91fd435f7503a66931.tar.xz | |
stream_ccda: Move cdda_priv structure to the only place it is used
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31506 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream/stream_cdda.c')
| -rw-r--r-- | stream/stream_cdda.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c index ca36b73dbe..bcdf570631 100644 --- a/stream/stream_cdda.c +++ b/stream/stream_cdda.c @@ -17,7 +17,13 @@ */ #include "config.h" - +#ifndef CONFIG_LIBCDIO +#include <cdda_interface.h> +#include <cdda_paranoia.h> +#else +#include <cdio/cdda.h> +#include <cdio/paranoia.h> +#endif #include <stdio.h> #include <stdlib.h> @@ -39,6 +45,20 @@ extern char *cdrom_device; +typedef struct { +#ifndef CONFIG_LIBCDIO + cdrom_drive* cd; + cdrom_paranoia* cdp; +#else + cdrom_drive_t* cd; + cdrom_paranoia_t* cdp; +#endif + int sector; + int start_sector; + int end_sector; + cd_info_t *cd_info; +} cdda_priv; + static struct cdda_params { int speed; int paranoia_mode; |