[MPlayer-cvslog] r31514 - in trunk/stream: cdd.h stream_cddb.c

[diego]

Author: diego
Date: Mon Jun 21 13:03:03 2010
New Revision: 31514

Log:
Move cddb_data_t and cd_toc_t structs to the only place they are used.

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

Modified: trunk/stream/cdd.h
==============================================================================
--- trunk/stream/cdd.h	Mon Jun 21 12:58:02 2010	(r31513)
+++ trunk/stream/cdd.h	Mon Jun 21 13:03:03 2010	(r31514)
@@ -25,24 +25,6 @@
 
 extern const m_option_t cdda_opts[];
 
-typedef struct {
-	char cddb_hello[1024];
-	unsigned long disc_id;
-	unsigned int tracks;
-	char *cache_dir;
-	char *freedb_server;
-	int freedb_proto_level;
-	int anonymous;
-	char category[100];
-	char *xmcd_file;
-	size_t xmcd_file_size;
-	void *user_data;
-} cddb_data_t;
-
-typedef struct {
-	unsigned int min, sec, frame;
-} cd_toc_t;
-
 typedef struct cd_track {
 	char *name;
 	unsigned int track_nb;

Modified: trunk/stream/stream_cddb.c
==============================================================================
--- trunk/stream/stream_cddb.c	Mon Jun 21 12:58:02 2010	(r31513)
+++ trunk/stream/stream_cddb.c	Mon Jun 21 13:03:03 2010	(r31514)
@@ -79,6 +79,24 @@
 #define DEFAULT_FREEDB_SERVER "freedb.freedb.org"
 #define DEFAULT_CACHE_DIR     "/.cddb/"
 
+typedef struct {
+	char cddb_hello[1024];
+	unsigned long disc_id;
+	unsigned int tracks;
+	char *cache_dir;
+	char *freedb_server;
+	int freedb_proto_level;
+	int anonymous;
+	char category[100];
+	char *xmcd_file;
+	size_t xmcd_file_size;
+	void *user_data;
+} cddb_data_t;
+
+typedef struct {
+	unsigned int min, sec, frame;
+} cd_toc_t;
+
 static cd_toc_t cdtoc[100];
 static int cdtoc_last_track;