# HG changeset patch # User diego # Date 1277118183 0 # Node ID 80a4a25c24c57b5e5aae4db200d1302661f83c61 # Parent bb6a852953226127193ea7257788695a14577701 Move cddb_data_t and cd_toc_t structs to the only place they are used. diff -r bb6a85295322 -r 80a4a25c24c5 stream/cdd.h --- a/stream/cdd.h Mon Jun 21 10:58:02 2010 +0000 +++ b/stream/cdd.h Mon Jun 21 11:03:03 2010 +0000 @@ -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; diff -r bb6a85295322 -r 80a4a25c24c5 stream/stream_cddb.c --- a/stream/stream_cddb.c Mon Jun 21 10:58:02 2010 +0000 +++ b/stream/stream_cddb.c Mon Jun 21 11:03:03 2010 +0000 @@ -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;