summaryrefslogtreecommitdiffstats
path: root/stream/cdd.h
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-06-21 10:19:01 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-02 04:11:07 +0200
commit2a6b09a3d4cfc5d8e6b0bf91fd435f7503a66931 (patch)
tree7c9b93b4ebaa930f3e1f612d48a259f8f8c0f626 /stream/cdd.h
parent2957d89083ec3d0a8bc789dbff0659799cdf4a85 (diff)
downloadmpv-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/cdd.h')
-rw-r--r--stream/cdd.h22
1 files changed, 0 insertions, 22 deletions
diff --git a/stream/cdd.h b/stream/cdd.h
index c6d6e9d92b..d75c520d0d 100644
--- a/stream/cdd.h
+++ b/stream/cdd.h
@@ -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>
typedef struct {
@@ -72,20 +64,6 @@ typedef struct {
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);