From 322fecd8de9ff834fd016d7917a5582308e1b176 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 21 Jun 2010 11:03:03 +0000 Subject: [PATCH] stream_cddb: move structs to the file they're used in Move cddb_data_t and cd_toc_t structs to the only place they are used. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31514 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/cdd.h | 18 ------------------ stream/stream_cddb.c | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/stream/cdd.h b/stream/cdd.h index d297de4c72..705fe47d2c 100644 --- a/stream/cdd.h +++ b/stream/cdd.h @@ -21,24 +21,6 @@ #include -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; diff --git a/stream/stream_cddb.c b/stream/stream_cddb.c index 3ec0630897..24467f13d4 100644 --- a/stream/stream_cddb.c +++ b/stream/stream_cddb.c @@ -78,6 +78,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;