diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-08-07 08:58:07 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-08-07 08:58:07 +0000 |
commit | 141e81cce4fb780a1e2f791c79c1664956401af7 (patch) | |
tree | 01ca9845852536dea18a7d5654783a336ba27eff /stream | |
parent | 024b6efdf1439c2573350048a433d0324dcee349 (diff) | |
download | mpv-141e81cce4fb780a1e2f791c79c1664956401af7.tar.bz2 mpv-141e81cce4fb780a1e2f791c79c1664956401af7.tar.xz |
Rename a bunch of miscellaneous preprocessor directives.
Switch them from a HAVE_ to a CONFIG_ prefix.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27423 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream')
-rw-r--r-- | stream/cdd.h | 4 | ||||
-rw-r--r-- | stream/stream.c | 6 | ||||
-rw-r--r-- | stream/stream_cdda.c | 16 |
3 files changed, 13 insertions, 13 deletions
diff --git a/stream/cdd.h b/stream/cdd.h index 10fb64763f..1208684769 100644 --- a/stream/cdd.h +++ b/stream/cdd.h @@ -2,7 +2,7 @@ #define MPLAYER_CDD_H #include "config.h" -#ifndef HAVE_LIBCDIO +#ifndef CONFIG_LIBCDIO #include <cdda_interface.h> #include <cdda_paranoia.h> #else @@ -54,7 +54,7 @@ typedef struct { } cd_info_t; typedef struct { -#ifndef HAVE_LIBCDIO +#ifndef CONFIG_LIBCDIO cdrom_drive* cd; cdrom_paranoia* cdp; #else diff --git a/stream/stream.c b/stream/stream.c index d9636da1f6..da2f8731d8 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -68,7 +68,7 @@ static const stream_info_t* const auto_open_streams[] = { #ifdef CONFIG_VCD &stream_info_vcd, #endif -#ifdef HAVE_CDDA +#ifdef CONFIG_CDDA &stream_info_cdda, #endif #ifdef MPLAYER_NETWORK @@ -97,10 +97,10 @@ static const stream_info_t* const auto_open_streams[] = { #ifdef CONFIG_PVR &stream_info_pvr, #endif -#ifdef HAVE_FTP +#ifdef CONFIG_FTP &stream_info_ftp, #endif -#ifdef HAVE_VSTREAM +#ifdef CONFIG_VSTREAM &stream_info_vstream, #endif #ifdef LIBSMBCLIENT diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c index 00c8a4934e..fb6f2e9358 100644 --- a/stream/stream_cdda.c +++ b/stream/stream_cdda.c @@ -147,7 +147,7 @@ static int open_cdda(stream_t *st,int m, void* opts, int* file_format) { struct cdda_params* p = (struct cdda_params*)opts; int mode = p->paranoia_mode; int offset = p->toc_offset; -#ifndef HAVE_LIBCDIO +#ifndef CONFIG_LIBCDIO cdrom_drive* cdd = NULL; #else cdrom_drive_t* cdd = NULL; @@ -171,7 +171,7 @@ static int open_cdda(stream_t *st,int m, void* opts, int* file_format) { p->device = strdup(DEFAULT_CDROM_DEVICE); } -#ifdef HAVE_CDDB +#ifdef CONFIG_CDDB // cdd_identify returns -1 if it cannot read the TOC, // in which case there is no point in calling cddb_resolve if(cdd_identify(p->device) >= 0 && strncmp(st->url,"cddb",4) == 0) { @@ -183,7 +183,7 @@ static int open_cdda(stream_t *st,int m, void* opts, int* file_format) { } #endif -#ifndef HAVE_LIBCDIO +#ifndef CONFIG_LIBCDIO if(p->generic_dev) cdd = cdda_identify_scsi(p->generic_dev,p->device,0,NULL); else @@ -205,7 +205,7 @@ static int open_cdda(stream_t *st,int m, void* opts, int* file_format) { if(p->sector_size) { cdd->nsectors = p->sector_size; -#ifndef HAVE_LIBCDIO +#ifndef CONFIG_LIBCDIO cdd->bigbuff = p->sector_size * CD_FRAMESIZE_RAW; #endif } @@ -283,7 +283,7 @@ static int open_cdda(stream_t *st,int m, void* opts, int* file_format) { if(p->no_skip) mode |= PARANOIA_MODE_NEVERSKIP; -#ifndef HAVE_LIBCDIO +#ifndef CONFIG_LIBCDIO paranoia_modeset(cdd, mode); if(p->search_overlap >= 0) @@ -298,7 +298,7 @@ static int open_cdda(stream_t *st,int m, void* opts, int* file_format) { paranoia_seek(priv->cdp,priv->start_sector,SEEK_SET); priv->sector = priv->start_sector; -#ifdef HAVE_CDDB +#ifdef CONFIG_CDDB if(cddb_info) { cd_info_free(cd_info); priv->cd_info = cddb_info; @@ -324,7 +324,7 @@ static int open_cdda(stream_t *st,int m, void* opts, int* file_format) { return STREAM_OK; } -#ifndef HAVE_LIBCDIO +#ifndef CONFIG_LIBCDIO static void cdparanoia_callback(long inpos, int function) { #else static void cdparanoia_callback(long int inpos, paranoia_cb_mode_t function) { @@ -438,7 +438,7 @@ const stream_info_t stream_info_cdda = { "", open_cdda, { "cdda", -#ifdef HAVE_CDDB +#ifdef CONFIG_CDDB "cddb", #endif NULL }, |