RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
diego 2010-06-21 10:19:01 +00:00 committed by Uoti Urpala
parent 2957d89083
commit 2a6b09a3d4
2 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
stream/cdd.h
View File

@ -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);

22
stream/stream_cdda.c
View File

@ -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;