From 2a6b09a3d4cfc5d8e6b0bf91fd435f7503a66931 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 21 Jun 2010 10:19:01 +0000
Subject: 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
---
 stream/cdd.h         | 22 ----------------------
 stream/stream_cdda.c | 22 +++++++++++++++++++++-
 2 files changed, 21 insertions(+), 23 deletions(-)

(limited to 'stream')

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);
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;
-- 
cgit v1.2.3