# HG changeset patch
# User diego
# Date 1277892559 0
# Node ID dd2b64511f055c14b566bc4652b6ff17971329fc
# Parent  083786e4aaf26c7325a5a367c1f675f33a7e96dd
Move dvd_speed extern variable declaration from stream_dvd_common.h to stream.h.

All other dvd_ extern variable declarations are there already and this avoids
#ifdefs around an #include of stream_dvd_common.h in cfg-common.h, which would
be necessary because stream_dvd_common.h contains dvdread #includes.

diff -r 083786e4aaf2 -r dd2b64511f05 cfg-common.h
--- a/cfg-common.h	Wed Jun 30 09:55:14 2010 +0000
+++ b/cfg-common.h	Wed Jun 30 10:09:19 2010 +0000
@@ -39,7 +39,6 @@
 #include "stream/network.h"
 #include "stream/pvr.h"
 #include "stream/stream.h"
-#include "stream/stream_dvd_common.h"
 #include "stream/stream_radio.h"
 #include "stream/tcp.h"
 #include "stream/tv.h"
diff -r 083786e4aaf2 -r dd2b64511f05 stream/stream.h
--- a/stream/stream.h	Wed Jun 30 09:55:14 2010 +0000
+++ b/stream/stream.h	Wed Jun 30 10:09:19 2010 +0000
@@ -330,6 +330,7 @@
 /// wait for time milliseconds
 int stream_check_interrupt(int time);
 
+extern int dvd_speed;
 extern int dvd_title;
 extern int dvd_chapter;
 extern int dvd_last_chapter;
diff -r 083786e4aaf2 -r dd2b64511f05 stream/stream_dvd_common.h
--- a/stream/stream_dvd_common.h	Wed Jun 30 09:55:14 2010 +0000
+++ b/stream/stream_dvd_common.h	Wed Jun 30 10:09:19 2010 +0000
@@ -26,7 +26,6 @@
 extern const char * const dvd_audio_stream_channels[6];
 extern const char * const dvd_audio_stream_types[8];
 
-extern int dvd_speed;
 void dvd_set_speed(char *device, unsigned speed);
 int mp_dvdtimetomsec(dvd_time_t *dt);