summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-06-05 02:05:52 +0200
committerwm4 <wm4@nowhere>2013-06-09 22:06:03 +0200
commitf7c912dff299e15b5ebd9f967c447d8b33adf3ca (patch)
treee680656d4a3d8edea6c9ff4ae4679b5d8779afeb
parent7b16d4b3b2a46ea3314d0a2f9140f3359750770f (diff)
downloadmpv-f7c912dff299e15b5ebd9f967c447d8b33adf3ca.tar.bz2
mpv-f7c912dff299e15b5ebd9f967c447d8b33adf3ca.tar.xz
stream: move VCD specific stuff to stream_vcd
I don't even know what VCDs are. A prehistoric version of the DVD or so.
-rw-r--r--stream/stream.c1
-rw-r--r--stream/stream.h4
-rw-r--r--stream/stream_vcd.c4
3 files changed, 4 insertions, 5 deletions
diff --git a/stream/stream.c b/stream/stream.c
index 9ea758fda7..de3c6b4f7a 100644
--- a/stream/stream.c
+++ b/stream/stream.c
@@ -55,7 +55,6 @@
#include "cache2.h"
/// We keep these 2 for the gui atm, but they will be removed.
-int vcd_track = 0;
char *cdrom_device = NULL;
char *dvd_device = NULL;
int dvd_title = 0;
diff --git a/stream/stream.h b/stream/stream.h
index 360f65e008..dfe545bd30 100644
--- a/stream/stream.h
+++ b/stream/stream.h
@@ -57,10 +57,6 @@
#define STREAM_BUFFER_SIZE 2048
#define STREAM_MAX_SECTOR_SIZE (8 * 1024)
-#define VCD_SECTOR_SIZE 2352
-#define VCD_SECTOR_OFFS 24
-#define VCD_SECTOR_DATA 2324
-
/// atm it will always use mode == STREAM_READ
/// streams that use the new api should check the mode at open
#define STREAM_READ 0
diff --git a/stream/stream_vcd.c b/stream/stream_vcd.c
index d8ef552aa5..87b03f6e40 100644
--- a/stream/stream_vcd.c
+++ b/stream/stream_vcd.c
@@ -37,6 +37,10 @@
#include "talloc.h"
+#define VCD_SECTOR_SIZE 2352
+#define VCD_SECTOR_OFFS 24
+#define VCD_SECTOR_DATA 2324
+
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
#include "vcd_read_fbsd.h"
#elif defined(__APPLE__)