summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-06-21 11:03:03 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-02 04:11:07 +0200
commit322fecd8de9ff834fd016d7917a5582308e1b176 (patch)
tree15bdd2509d1a43d719b86730412aafb083b28b77 /stream
parent5a9c26af59f6bc901c9cb32f447e27c9d3bf4430 (diff)
downloadmpv-322fecd8de9ff834fd016d7917a5582308e1b176.tar.bz2
mpv-322fecd8de9ff834fd016d7917a5582308e1b176.tar.xz
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
Diffstat (limited to 'stream')
-rw-r--r--stream/cdd.h18
-rw-r--r--stream/stream_cddb.c18
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 <sys/types.h>
-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;