From f7c912dff299e15b5ebd9f967c447d8b33adf3ca Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 5 Jun 2013 02:05:52 +0200 Subject: stream: move VCD specific stuff to stream_vcd I don't even know what VCDs are. A prehistoric version of the DVD or so. --- stream/stream.c | 1 - stream/stream.h | 4 ---- stream/stream_vcd.c | 4 ++++ 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__) -- cgit v1.2.3