Mercurial > mplayer.hg
changeset 31525:dd2b64511f05
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.
| author | diego |
|---|---|
| date | Wed, 30 Jun 2010 10:09:19 +0000 |
| parents | 083786e4aaf2 |
| children | ec8cb01e57d1 |
| files | cfg-common.h stream/stream.h stream/stream_dvd_common.h |
| diffstat | 3 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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"
--- 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;
--- 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);