[MPlayer-cvslog] r31506 - in trunk/stream: cdd.h stream_cdda.c

[diego]

Author: diego
Date: Mon Jun 21 12:19:01 2010
New Revision: 31506

Log:
Move cdda_priv structure to the only place it is used.

Modified:
   trunk/stream/cdd.h
   trunk/stream/stream_cdda.c

Modified: trunk/stream/cdd.h
==============================================================================
--- trunk/stream/cdd.h	Mon Jun 21 11:55:59 2010	(r31505)
+++ trunk/stream/cdd.h	Mon Jun 21 12:19:01 2010	(r31506)
@@ -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 @@ 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);

Modified: trunk/stream/stream_cdda.c
==============================================================================
--- trunk/stream/stream_cdda.c	Mon Jun 21 11:55:59 2010	(r31505)
+++ trunk/stream/stream_cdda.c	Mon Jun 21 12:19:01 2010	(r31506)
@@ -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;