diff options
Diffstat (limited to 'stream')
| -rw-r--r-- | stream/Makefile | 2 | ||||
| -rw-r--r-- | stream/stream.c | 4 | ||||
| -rw-r--r-- | stream/stream_dvd.c | 10 | ||||
| -rw-r--r-- | stream/stream_dvd.h | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/stream/Makefile b/stream/Makefile index 144f3488fd..8d03ded1ba 100644 --- a/stream/Makefile +++ b/stream/Makefile @@ -25,7 +25,7 @@ SRCS += stream.c \ stream_mf.c \ stream_null.c \ -ifeq ($(HAVE_DVD),yes) +ifeq ($(DVDREAD),yes) SRCS += stream_dvd.c endif ifeq ($(DVDNAV),yes) diff --git a/stream/stream.c b/stream/stream.c index 4b3db771ac..00282c2db8 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -84,7 +84,7 @@ extern stream_info_t stream_info_cue; extern stream_info_t stream_info_null; extern stream_info_t stream_info_mf; extern stream_info_t stream_info_file; -#ifdef HAVE_DVD +#ifdef USE_DVDREAD extern stream_info_t stream_info_dvd; #endif @@ -131,7 +131,7 @@ stream_info_t* auto_open_streams[] = { &stream_info_smb, #endif &stream_info_cue, -#ifdef HAVE_DVD +#ifdef USE_DVDREAD &stream_info_dvd, #endif #ifdef USE_DVDNAV diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c index e20bb78f33..6a183a24e4 100644 --- a/stream/stream_dvd.c +++ b/stream/stream_dvd.c @@ -742,7 +742,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) { if(vts_file->vts_pgcit) { int i; for(i=0;i<8;i++) -#ifdef USE_MPDVDKIT +#ifdef USE_DVDREAD_INTERNAL if(vts_file->vts_pgcit->pgci_srp[ttn].pgc->audio_control[i].present) { #else if(vts_file->vts_pgcit->pgci_srp[ttn].pgc->audio_control[i] & 0x8000) { @@ -759,7 +759,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) { } d->audio_streams[d->nr_of_channels].language=language; -#ifdef USE_MPDVDKIT +#ifdef USE_DVDREAD_INTERNAL d->audio_streams[d->nr_of_channels].id=vts_file->vts_pgcit->pgci_srp[ttn].pgc->audio_control[i].s_audio; #else d->audio_streams[d->nr_of_channels].id=vts_file->vts_pgcit->pgci_srp[ttn].pgc->audio_control[i] >> 8 & 7; @@ -810,7 +810,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) { d->nr_of_subtitles=0; for(i=0;i<32;i++) -#ifdef USE_MPDVDKIT +#ifdef USE_DVDREAD_INTERNAL if(vts_file->vts_pgcit->pgci_srp[ttn].pgc->subp_control[i].present) { #else if(vts_file->vts_pgcit->pgci_srp[ttn].pgc->subp_control[i] & 0x80000000) { @@ -830,13 +830,13 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) { d->subtitles[ d->nr_of_subtitles ].language=language; d->subtitles[ d->nr_of_subtitles ].id=d->nr_of_subtitles; if(video->display_aspect_ratio == 0) /* 4:3 */ -#ifdef USE_MPDVDKIT +#ifdef USE_DVDREAD_INTERNAL d->subtitles[d->nr_of_subtitles].id = vts_file->vts_pgcit->pgci_srp[ttn].pgc->subp_control[i].s_4p3; #else d->subtitles[d->nr_of_subtitles].id = vts_file->vts_pgcit->pgci_srp[ttn].pgc->subp_control[i] >> 24 & 31; #endif else if(video->display_aspect_ratio == 3) /* 16:9 */ -#ifdef USE_MPDVDKIT +#ifdef USE_DVDREAD_INTERNAL d->subtitles[d->nr_of_subtitles].id = vts_file->vts_pgcit->pgci_srp[ttn].pgc->subp_control[i].s_lbox; #else d->subtitles[d->nr_of_subtitles].id = vts_file->vts_pgcit->pgci_srp[ttn].pgc->subp_control[i] >> 8 & 31; diff --git a/stream/stream_dvd.h b/stream/stream_dvd.h index b06ee9e35d..441a9d5e72 100644 --- a/stream/stream_dvd.h +++ b/stream/stream_dvd.h @@ -1,7 +1,7 @@ #ifdef USE_DVDREAD -#ifdef USE_MPDVDKIT +#ifdef USE_DVDREAD_INTERNAL #include "libdvdread/dvd_reader.h" #include "libdvdread/ifo_types.h" #include "libdvdread/ifo_read.h" |