Mercurial > mplayer.hg
changeset 31440:01340407202e
Move cdda_priv structure to the only place it is used.
| author | diego |
|---|---|
| date | Mon, 21 Jun 2010 10:19:01 +0000 |
| parents | c0d4771c11c7 |
| children | 6f152da62242 |
| files | stream/cdd.h stream/stream_cdda.c |
| diffstat | 2 files changed, 21 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/stream/cdd.h Mon Jun 21 09:55:59 2010 +0000 +++ b/stream/cdd.h Mon Jun 21 10:19:01 2010 +0000 @@ -19,14 +19,6 @@ #ifndef MPLAYER_CDD_H #define MPLAYER_CDD_H -#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 <sys/types.h> #include "m_option.h" @@ -76,20 +68,6 @@ cd_track_t *current; } cd_info_t; -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; - cd_info_t* cd_info_new(void); void cd_info_free(cd_info_t *cd_info); cd_track_t* cd_info_add_track(cd_info_t *cd_info, char *track_name, unsigned int track_nb, unsigned int min, unsigned int sec, unsigned int msec, unsigned long frame_begin, unsigned long frame_length);
--- a/stream/stream_cdda.c Mon Jun 21 09:55:59 2010 +0000 +++ b/stream/stream_cdda.c Mon Jun 21 10:19:01 2010 +0000 @@ -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> @@ -38,6 +44,20 @@ #endif +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;