Give a CONFIG_ prefix to preprocessor directives that lacked one and
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Thu, 7 Aug 2008 12:20:50 +0000 (12:20 +0000)
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Thu, 7 Aug 2008 12:20:50 +0000 (12:20 +0000)
change arbitrary prefixes to CONFIG_.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@27429 b3059339-0415-0410-9bf9-f77b7e298cf2

19 files changed:
Makefile
cfg-common-opts.h
cfg-mplayer.h
configure
get_path.c
libmpcodecs/ad_libvorbis.c
libmpcodecs/dec_audio.c
libmpcodecs/dec_video.c
libmpdemux/asfheader.c
libmpdemux/demux_ogg.c
libmpdemux/demuxer.c
libmpdemux/stheader.h
libmpdemux/video.c
libvo/vo_macosx.m
libvo/vo_quartz.c
mplayer.c
parser-mpcmd.c
stream/stream.c
stream/stream.h

index 496dc32..0a2112a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -382,7 +382,7 @@ SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32)-$(HAVE_MMX)      += mp3lib/dct64_mmx.c
 SRCS_COMMON-$(MP3LIB)-$(HAVE_ALTIVEC) += mp3lib/dct64_altivec.c
 SRCS_COMMON-$(MP3LIB)-$(HAVE_MMX)    += mp3lib/decode_mmx.c
 SRCS_COMMON-$(MP3LIB)-$(HAVE_SSE)    += mp3lib/dct64_sse.c
-SRCS_COMMON-$(MPLAYER_NETWORK)       += stream/stream_netstream.c \
+SRCS_COMMON-$(NETWORK)               += stream/stream_netstream.c \
                                         stream/asf_mmst_streaming.c \
                                         stream/asf_streaming.c \
                                         stream/cookies.c \
@@ -430,7 +430,7 @@ SRCS_COMMON-$(REAL_CODECS)           += libmpcodecs/ad_realaud.c \
                                         libmpcodecs/vd_realvid.c
 SRCS_COMMON-$(SPEEX)                 += libmpcodecs/ad_speex.c
 SRCS_COMMON-$(STREAM_CACHE)          += stream/cache2.c
-SRCS_COMMON-$(STREAMING_LIVE555)     += libmpdemux/demux_rtp.cpp \
+SRCS_COMMON-$(LIVE555)               += libmpdemux/demux_rtp.cpp \
                                         libmpdemux/demux_rtp_codec.cpp \
                                         stream/stream_live555.c \
 
index d1c731b..6d6374d 100644 (file)
@@ -51,7 +51,7 @@
         {"dvdkey", "libcss is obsolete. Try libdvdread instead.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
        {"csslib", "libcss is obsolete. Try libdvdread instead.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 
-#ifdef MPLAYER_NETWORK
+#ifdef CONFIG_NETWORK
        {"user", &network_username, CONF_TYPE_STRING, 0, 0, 0, NULL},
        {"passwd", &network_password, CONF_TYPE_STRING, 0, 0, 0, NULL},
        {"bandwidth", &network_bandwidth, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL},
        {"passwd", "MPlayer was compiled without streaming (network) support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
        {"bandwidth", "MPlayer was compiled without streaming (network) support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
        {"user-agent", "MPlayer was compiled without streaming (network) support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
-#endif /* MPLAYER_NETWORK */
+#endif /* CONFIG_NETWORK */
 
-#ifdef STREAMING_LIVE555
+#ifdef CONFIG_LIVE555
         {"sdp", "-sdp has been removed, use sdp://file instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
        // -rtsp-stream-over-tcp option, specifying TCP streaming of RTP/RTCP
         {"rtsp-stream-over-tcp", &rtspStreamOverTCP, CONF_TYPE_FLAG, 0, 0, 1, NULL},
-#elif defined (LIBNEMESI)
+#elif defined (CONFIG_LIBNEMESI)
         {"rtsp-stream-over-tcp", &rtsp_transport_tcp, CONF_TYPE_FLAG, 0, 0, 1, NULL},
         {"rtsp-stream-over-sctp", &rtsp_transport_sctp, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 #else
        {"rtsp-stream-over-tcp", "-rtsp-stream-over-tcp requires the \"LIVE555 Streaming Media\" libraries.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
-#endif /* STREAMING_LIVE555 */
-#ifdef MPLAYER_NETWORK
+#endif /* CONFIG_LIVE555 */
+#ifdef CONFIG_NETWORK
         {"rtsp-port", &rtsp_port, CONF_TYPE_INT, CONF_RANGE, -1, 65535, NULL}, 
         {"rtsp-destination", &rtsp_destination, CONF_TYPE_STRING, CONF_MIN, 0, 0, NULL},
 #else
         {"rtsp-port", "MPlayer was compiled without network support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
         {"rtsp-destination", "MPlayer was compiled without network support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
-#endif /* MPLAYER_NETWORK */
+#endif /* CONFIG_NETWORK */
   
 // ------------------------- demuxer options --------------------
 
index bcc8d00..7efe4ac 100644 (file)
@@ -245,7 +245,7 @@ const m_option_t mplayer_opts[]={
 
        {"use-filedir-conf", &use_filedir_conf, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
        {"nouse-filedir-conf", &use_filedir_conf, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL},
-#ifdef CRASH_DEBUG
+#ifdef CONFIG_CRASH_DEBUG
        {"crash-debug", &crash_debug, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
        {"nocrash-debug", &crash_debug, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL},
 #endif
index a2c53e3..c8ad61b 100755 (executable)
--- a/configure
+++ b/configure
@@ -2641,9 +2641,9 @@ echores "messages: $msg_lang - man pages: $man_langs - documentation: $doc_langs
 
 echocheck "enable sighandler"
 if test "$_sighandler" = yes ; then
-  _def_sighandler='#define ENABLE_SIGHANDLER 1'
+  _def_sighandler='#define CONFIG_SIGHANDLER 1'
 else
-  _def_sighandler='#undef ENABLE_SIGHANDLER'
+  _def_sighandler='#undef CONFIG_SIGHANDLER'
 fi
 echores "$_sighandler"
 
@@ -2882,12 +2882,12 @@ echores "$_socklen_t"
 echocheck "network"
 # FIXME network check
 if test "$_network" = yes ; then
-  _def_network='#define MPLAYER_NETWORK 1'
+  _def_network='#define CONFIG_NETWORK 1'
   _ld_extra="$_ld_extra $_ld_sock"
   _inputmodules="network $_inputmodules"
 else
   _noinputmodules="network $_noinputmodules"
-  _def_network='#undef MPLAYER_NETWORK'
+  _def_network='#undef CONFIG_NETWORK'
   _ftp=no
 fi
 echores "$_network"
@@ -3067,9 +3067,9 @@ if test "$_dl" = no ; then
   _dynamic_plugins=no
 fi
 if test "$_dynamic_plugins" = yes ; then
-  _def_dynamic_plugins='#define DYNAMIC_PLUGINS 1'
+  _def_dynamic_plugins='#define CONFIG_DYNAMIC_PLUGINS 1'
 else
-  _def_dynamic_plugins='#undef DYNAMIC_PLUGINS'
+  _def_dynamic_plugins='#undef CONFIG_DYNAMIC_PLUGINS'
 fi
 echores "$_dynamic_plugins"
 
@@ -3610,10 +3610,10 @@ if test "$_macosx_finder" = auto ; then
   _macosx_finder=$_macosx
 fi
 if test "$_macosx_finder" = yes; then
-  _def_macosx_finder='#define MACOSX_FINDER 1'
+  _def_macosx_finder='#define CONFIG_MACOSX_FINDER 1'
   _macosx_finder=yes
 else
-  _def_macosx_finder='#undef MACOSX_FINDER'
+  _def_macosx_finder='#undef CONFIG_MACOSX_FINDER'
   _macosx_finder=no
 fi
 echores "$_macosx_finder"
@@ -3623,9 +3623,9 @@ if test "$_macosx_bundle" = auto ; then
   _macosx_bundle=$_macosx_finder
 fi
 if test "$_macosx_bundle" = yes; then
-  _def_macosx_bundle='#define MACOSX_BUNDLE 1'
+  _def_macosx_bundle='#define CONFIG_MACOSX_BUNDLE 1'
 else
-  _def_macosx_bundle='#undef MACOSX_BUNDLE'
+  _def_macosx_bundle='#undef CONFIG_MACOSX_BUNDLE'
   _macosx_bundle=no
 fi
 echores "$_macosx_bundle"
@@ -3723,10 +3723,10 @@ EOF
 fi
 
 if test "$_smb" = yes; then
-    _def_smb="#define LIBSMBCLIENT"
+    _def_smb="#define CONFIG_LIBSMBCLIENT"
     _inputmodules="smb $_inputmodules"
 else
-    _def_smb="#undef LIBSMBCLIENT"
+    _def_smb="#undef CONFIG_LIBSMBCLIENT"
     _noinputmodules="smb $_noinputmodules"
 fi
 echores "$_smb"
@@ -5921,7 +5921,7 @@ fi
 if test "$_tremor_internal" = yes ; then
   _vorbis=yes
   _def_vorbis='#define CONFIG_OGGVORBIS 1'
-  _def_tremor='#define TREMOR 1'
+  _def_tremor='#define CONFIG_TREMOR 1'
   _codecmodules="tremor(internal) $_codecmodules"
   _res_comment="internal Tremor"
   if test "$_tremor_low" = yes ; then
@@ -5931,7 +5931,7 @@ if test "$_tremor_internal" = yes ; then
 elif test "$_tremor_external" = yes ; then
   _vorbis=yes
   _def_vorbis='#define CONFIG_OGGVORBIS 1'
-  _def_tremor='#define TREMOR 1'
+  _def_tremor='#define CONFIG_TREMOR 1'
   _codecmodules="tremor(external) $_codecmodules"
   _res_comment="external Tremor"
   _ld_extra="$_ld_extra -logg -lvorbisidec"
@@ -6340,12 +6340,12 @@ if test "$_nemesi" = auto  && test "$_network" = yes ; then
 fi
 if test "$_nemesi" = yes; then
     _native_rtsp=no
-    _def_nemesi='#define LIBNEMESI 1'
+    _def_nemesi='#define CONFIG_LIBNEMESI 1'
     _inputmodules="nemesi $_inputmodules"
 else
     _native_rtsp="$_network"
     _nemesi=no
-    _def_nemesi='#undef LIBNEMESI'
+    _def_nemesi='#undef CONFIG_LIBNEMESI'
     _noinputmodules="nemesi $_noinputmodules"
 fi
 echores "$_nemesi"
@@ -6383,19 +6383,19 @@ EOF
 fi
 if test "$_live" = yes && test "$_network" = yes; then
   _res_comment="using $_livelibdir"
-  _def_live='#define STREAMING_LIVE555 1'
+  _def_live='#define CONFIG_LIVE555 1'
  _inputmodules="live555 $_inputmodules"
 elif test "$_live_dist" = yes && test "$_network" = yes; then
   _res_comment="using distribution version"
   _live="yes"
-  _def_live='#define STREAMING_LIVE555 1'
+  _def_live='#define CONFIG_LIVE555 1'
   _ld_extra="$_ld_extra -lliveMedia -lgroupsock -lUsageEnvironment -lBasicUsageEnvironment -lstdc++"
   _inc_extraxx="-I/usr/include/liveMedia -I/usr/include/UsageEnvironment \
              -I/usr/include/BasicUsageEnvironment -I/usr/include/groupsock"
  _inputmodules="live555 $_inputmodules"
 else
   _live=no
-  _def_live='#undef STREAMING_LIVE555'
+  _def_live='#undef CONFIG_LIVE555'
   _noinputmodules="live555 $_noinputmodules"
 fi
 echores "$_live"
@@ -7516,9 +7516,9 @@ fi
 
 echocheck "automatic gdb attach"
 if test "$_crash_debug" = yes ; then
-  _def_crash_debug='#define CRASH_DEBUG 1'
+  _def_crash_debug='#define CONFIG_CRASH_DEBUG 1'
 else
-  _def_crash_debug='#undef CRASH_DEBUG'
+  _def_crash_debug='#undef CONFIG_CRASH_DEBUG'
   _crash_debug=no
 fi
 echores "$_crash_debug"
@@ -7849,12 +7849,13 @@ LIBSMBCLIENT = $_smb
 LIBTHEORA = $_theora
 LIBVORBIS = $_vorbis
 LIRC = $_lirc
+LIVE555 = $_live
 MACOSX_BUNDLE = $_macosx_bundle
 MACOSX_FINDER = $_macosx_finder
 MP3LAME = $_mp3lame
-MPLAYER_NETWORK = $_network
 MUSEPACK = $_musepack
 NATIVE_RTSP = $_native_rtsp
+NETWORK = $_network
 PE_EXECUTABLE = $_pe_executable
 PNG = $_png
 PVR = $_pvr
@@ -7866,7 +7867,6 @@ RADIO=$_radio
 RADIO_CAPTURE=$_radio_capture
 REAL_CODECS = $_real
 SPEEX = $_speex
-STREAMING_LIVE555 = $_live
 STREAM_CACHE = $_stream_cache
 TOOLAME=$_toolame
 TV = $_tv
index b1f119e..76a0169 100644 (file)
@@ -13,7 +13,7 @@
 #include "mp_msg.h"
 #include "get_path.h"
 
-#ifdef MACOSX_BUNDLE
+#ifdef CONFIG_MACOSX_BUNDLE
 #include <CoreFoundation/CoreFoundation.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -38,7 +38,7 @@ char *get_path(const char *filename){
        static char *config_dir = "/.mplayer";
 #endif
        int len;
-#ifdef MACOSX_BUNDLE
+#ifdef CONFIG_MACOSX_BUNDLE
        struct stat dummy;
        CFIndex maxlen=256;
        CFURLRef res_url_ref=NULL;
@@ -96,7 +96,7 @@ char *get_path(const char *filename){
                sprintf(buff, "%s%s/%s", homedir, config_dir, filename);
        }
 
-#ifdef MACOSX_BUNDLE
+#ifdef CONFIG_MACOSX_BUNDLE
        if (stat(buff, &dummy)) {
 
                res_url_ref=CFBundleCopyResourcesDirectoryURL(CFBundleGetMainBundle());
index f693d66..dd20c34 100644 (file)
@@ -20,7 +20,7 @@ static ad_info_t info =
 
 LIBAD_EXTERN(libvorbis)
 
-#ifdef TREMOR
+#ifdef CONFIG_TREMOR
 #include <tremor/ivorbiscodec.h>
 #else
 #include <vorbis/codec.h>
@@ -34,7 +34,7 @@ typedef struct ov_struct_st {
   vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */
   vorbis_block     vb; /* local working space for packet->PCM decode */
   float            rg_scale; /* replaygain scale */
-#ifdef TREMOR
+#ifdef CONFIG_TREMOR
   int              rg_scale_int;
 #endif
 } ov_struct_t;
@@ -160,7 +160,7 @@ static int init(sh_audio_t *sh)
     /* replaygain: security */
     if(ov->rg_scale > 15.) 
       ov->rg_scale = 15.;
-#ifdef TREMOR
+#ifdef CONFIG_TREMOR
     ov->rg_scale_int = (int)(ov->rg_scale*64.f);
 #endif
     mp_msg(MSGT_DECAUDIO,MSGL_V,"OggVorbis: Bitstream is %d channel%s, %dHz, %dbit/s %cBR\n",(int)ov->vi.channels,ov->vi.channels>1?"s":"",(int)ov->vi.rate,(int)ov->vi.bitrate_nominal,
@@ -218,7 +218,7 @@ static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen)
 {
         int len = 0;
         int samples;
-#ifdef TREMOR
+#ifdef CONFIG_TREMOR
         ogg_int32_t **pcm;
 #else
         float scale;
@@ -250,7 +250,7 @@ static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen)
 
            /* convert floats to 16 bit signed ints (host order) and
               interleave */
-#ifdef TREMOR
+#ifdef CONFIG_TREMOR
            if (ov->rg_scale_int == 64) {
            for(i=0;i<ov->vi.channels;i++){
              ogg_int16_t *convbuffer=(ogg_int16_t *)(&buf[len]);
@@ -272,15 +272,15 @@ static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen)
              }
            }
           } else
-#endif /* TREMOR */
+#endif /* CONFIG_TREMOR */
           {
-#ifndef TREMOR
+#ifndef CONFIG_TREMOR
             scale = 32767.f * ov->rg_scale;
 #endif
            for(i=0;i<ov->vi.channels;i++){
              ogg_int16_t *convbuffer=(ogg_int16_t *)(&buf[len]);
              ogg_int16_t *ptr=convbuffer+i;
-#ifdef TREMOR
+#ifdef CONFIG_TREMOR
              ogg_int32_t  *mono=pcm[i];
              for(j=0;j<bout;j++){
                int val=(mono[j]*ov->rg_scale_int)>>(9+6);
@@ -297,7 +297,7 @@ static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen)
                  val=-32768;
                  clipflag=1;
                }
-#endif    /* TREMOR */
+#endif /* CONFIG_TREMOR */
                *ptr=val;
                ptr+=ov->vi.channels;
              }
index 28dc529..23f19ac 100644 (file)
@@ -23,7 +23,7 @@
 #include <malloc.h>
 #endif
 
-#ifdef DYNAMIC_PLUGINS
+#ifdef CONFIG_DYNAMIC_PLUGINS
 #include <dlfcn.h>
 #endif
 
@@ -167,7 +167,7 @@ static int init_audio(sh_audio_t *sh_audio, char *codecname, char *afm,
                 sh_audio->codec->drv))
                break;
        mpadec = mpcodecs_ad_drivers[i];
-#ifdef DYNAMIC_PLUGINS
+#ifdef CONFIG_DYNAMIC_PLUGINS
        if (!mpadec) {
            /* try to open shared decoder plugin */
            int buf_len;
@@ -297,7 +297,7 @@ void uninit_audio(sh_audio_t *sh_audio)
        mp_msg(MSGT_DECAUDIO, MSGL_V, MSGTR_UninitAudioStr,
               sh_audio->codec->drv);
        sh_audio->ad_driver->uninit(sh_audio);
-#ifdef DYNAMIC_PLUGINS
+#ifdef CONFIG_DYNAMIC_PLUGINS
        if (sh_audio->dec_handle)
            dlclose(sh_audio->dec_handle);
 #endif
index bfb2203..0a76fc0 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "dec_video.h"
 
-#ifdef DYNAMIC_PLUGINS
+#ifdef CONFIG_DYNAMIC_PLUGINS
 #include <dlfcn.h>
 #endif
 
@@ -155,7 +155,7 @@ void uninit_video(sh_video_t *sh_video){
     if(!sh_video->initialized) return;
     mp_msg(MSGT_DECVIDEO,MSGL_V,MSGTR_UninitVideoStr,sh_video->codec->drv);
     mpvdec->uninit(sh_video);
-#ifdef DYNAMIC_PLUGINS
+#ifdef CONFIG_DYNAMIC_PLUGINS
     if (sh_video->dec_handle)
        dlclose(sh_video->dec_handle);
 #endif
@@ -205,7 +205,7 @@ static int init_video(sh_video_t *sh_video,char* codecname,char* vfm,int status,
 //         if(mpcodecs_vd_drivers[i]->info->id==sh_video->codec->driver) break;
            if(!strcmp(mpcodecs_vd_drivers[i]->info->short_name,sh_video->codec->drv)) break;
        mpvdec=mpcodecs_vd_drivers[i];
-#ifdef DYNAMIC_PLUGINS
+#ifdef CONFIG_DYNAMIC_PLUGINS
        if (!mpvdec)
        {
            /* try to open shared decoder plugin */
index 0228dc8..93bd135 100644 (file)
@@ -639,7 +639,7 @@ if(streams) {
   // as the servers often do not care about what we requested.
 #if 0
   uint32_t vr = 0, ar = 0,i;
-#ifdef MPLAYER_NETWORK
+#ifdef CONFIG_NETWORK
   if( demuxer->stream->streaming_ctrl!=NULL ) {
          if( demuxer->stream->streaming_ctrl->bandwidth!=0 && demuxer->stream->streaming_ctrl->data!=NULL ) {
                  best_audio = ((asf_http_streaming_ctrl_t*)demuxer->stream->streaming_ctrl->data)->audio_id;
index e3480a4..14bd180 100644 (file)
@@ -19,7 +19,7 @@
 #define FOURCC_SPEEX  mmioFOURCC('s', 'p', 'x', ' ')
 #define FOURCC_THEORA mmioFOURCC('t', 'h', 'e', 'o')
 
-#ifdef TREMOR
+#ifdef CONFIG_TREMOR
 #include <tremor/ogg.h>
 #include <tremor/ivorbiscodec.h>
 #else
index a330a42..2013033 100644 (file)
@@ -130,10 +130,10 @@ const demuxer_desc_t *const demuxer_list[] = {
     &demuxer_desc_h264_es,
     &demuxer_desc_audio,
     &demuxer_desc_mpeg_ty,
-#ifdef STREAMING_LIVE555
+#ifdef CONFIG_LIVE555
     &demuxer_desc_rtp,
 #endif
-#ifdef LIBNEMESI
+#ifdef CONFIG_LIBNEMESI
     &demuxer_desc_rtp_nemesi,
 #endif
 #ifdef CONFIG_LIBAVFORMAT
index defdf7e..4f2266b 100644 (file)
@@ -38,7 +38,7 @@ typedef struct {
 //  void* audio_out;        // the audio_out handle, used for this audio stream
   struct af_stream_s *afilter;          // the audio filter stream
   struct ad_functions_s* ad_driver;
-#ifdef DYNAMIC_PLUGINS
+#ifdef CONFIG_DYNAMIC_PLUGINS
   void *dec_handle;
 #endif
   // win32-compatible codec parameters:
@@ -83,7 +83,7 @@ typedef struct {
   unsigned int outfmtidx;
   struct vf_instance_s *vfilter;          // the video filter chain, used for this video stream
   int vf_initialized;
-#ifdef DYNAMIC_PLUGINS
+#ifdef CONFIG_DYNAMIC_PLUGINS
   void *dec_handle;
 #endif
   // win32-compatible codec parameters:
index 95348a8..0e7dfe6 100644 (file)
@@ -25,7 +25,7 @@
 /* biCompression constant */
 #define BI_RGB        0L
 
-#ifdef STREAMING_LIVE555
+#ifdef CONFIG_LIVE555
 #include "demux_rtp.h"
 #endif
 
@@ -57,7 +57,7 @@ static video_codec_t find_video_codec(sh_video_t *sh_video)
       ((! sh_video->format) || (sh_video->format==0x10000001) || (sh_video->format==0x10000002))
     ) ||
     (fmt == DEMUXER_TYPE_MPEG_TY)
-#ifdef STREAMING_LIVE555
+#ifdef CONFIG_LIVE555
     || ((fmt == DEMUXER_TYPE_RTP) && demux_is_mpeg_rtp_stream(d_video->demuxer))
 #endif
   )
index e39bd7b..f21623c 100644 (file)
@@ -326,7 +326,7 @@ static int preinit(const char *arg)
        
        if(!shared_buffer)
        {
-               #if !defined (MACOSX_FINDER) || !defined (CONFIG_SDL)
+               #if !defined (CONFIG_MACOSX_FINDER) || !defined (CONFIG_SDL)
                //this chunk of code is heavily based off SDL_macosx.m from SDL 
                //it uses an Apple private function to request foreground operation
                void CPSEnableForegroundOperation(ProcessSerialNumber* psn);
index 9059394..f126cc8 100644 (file)
@@ -1141,7 +1141,7 @@ static int preinit(const char *arg)
         }
     }
        
-#if !defined (MACOSX_FINDER) || !defined (CONFIG_SDL)
+#if !defined (CONFIG_MACOSX_FINDER) || !defined (CONFIG_SDL)
        //this chunk of code is heavily based off SDL_macosx.m from SDL 
        //it uses an Apple private function to request foreground operation
 {
index e2eb195..09bec5f 100644 (file)
--- a/mplayer.c
+++ b/mplayer.c
@@ -740,14 +740,14 @@ static void child_sighandler(int x){
 }
 #endif
 
-#ifdef CRASH_DEBUG
+#ifdef CONFIG_CRASH_DEBUG
 static char *prog_path;
 static int crash_debug = 0;
 #endif
 
 static void exit_sighandler(int x){
   static int sig_count=0;
-#ifdef CRASH_DEBUG
+#ifdef CONFIG_CRASH_DEBUG
   if (!crash_debug || x != SIGTRAP)
 #endif
   ++sig_count;
@@ -791,7 +791,7 @@ static void exit_sighandler(int x){
       mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGSEGV_SIGFPE);
   default:
       mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGCRASH);
-#ifdef CRASH_DEBUG
+#ifdef CONFIG_CRASH_DEBUG
       if (crash_debug) {
         int gdb_pid;
         mp_msg(MSGT_CPLAYER, MSGL_INFO, "Forking...\n");
@@ -2895,7 +2895,7 @@ current_module = NULL;
   signal(SIGCHLD,child_sighandler);
 #endif
 
-#ifdef CRASH_DEBUG
+#ifdef CONFIG_CRASH_DEBUG
   prog_path = argv[0];
 #endif
   //========= Catch terminate signals: ================
@@ -2907,14 +2907,14 @@ current_module = NULL;
 
   signal(SIGQUIT,exit_sighandler); // Quit from keyboard
   signal(SIGPIPE,exit_sighandler); // Some window managers cause this
-#ifdef ENABLE_SIGHANDLER
+#ifdef CONFIG_SIGHANDLER
   // fatal errors:
   signal(SIGBUS,exit_sighandler);  // bus error
   signal(SIGSEGV,exit_sighandler); // segfault
   signal(SIGILL,exit_sighandler);  // illegal instruction
   signal(SIGFPE,exit_sighandler);  // floating point exc.
   signal(SIGABRT,exit_sighandler); // abort()
-#ifdef CRASH_DEBUG
+#ifdef CONFIG_CRASH_DEBUG
   if (crash_debug)
     signal(SIGTRAP,exit_sighandler);
 #endif
index d9e735b..ad8e116 100644 (file)
@@ -74,7 +74,7 @@ m_config_parse_mp_command_line(m_config_t *config, int argc, char **argv)
   int no_more_opts = 0;
   int opt_exit = 0; // flag indicating whether mplayer should exit without playing anything
   play_tree_t *last_parent, *last_entry = NULL, *root;
-#ifdef MACOSX_FINDER
+#ifdef CONFIG_MACOSX_FINDER
   extern play_tree_t *macosx_finder_args(m_config_t *, int , char **);
 #endif
 
@@ -86,7 +86,7 @@ m_config_parse_mp_command_line(m_config_t *config, int argc, char **argv)
 
   config->mode = M_COMMAND_LINE;
   mode = GLOBAL;
-#ifdef MACOSX_FINDER
+#ifdef CONFIG_MACOSX_FINDER
   root=macosx_finder_args(config, argc, argv);
   if(root) 
        return root;
index da2f873..041fd0b 100644 (file)
@@ -71,13 +71,13 @@ static const stream_info_t* const auto_open_streams[] = {
 #ifdef CONFIG_CDDA
   &stream_info_cdda,
 #endif
-#ifdef MPLAYER_NETWORK
+#ifdef CONFIG_NETWORK
   &stream_info_netstream,
   &stream_info_http1,
   &stream_info_asf,
   &stream_info_pnm,
   &stream_info_rtsp,
-#ifdef STREAMING_LIVE555
+#ifdef CONFIG_LIVE555
   &stream_info_sdp,
   &stream_info_rtsp_sip,
 #endif
@@ -103,7 +103,7 @@ static const stream_info_t* const auto_open_streams[] = {
 #ifdef CONFIG_VSTREAM
   &stream_info_vstream,
 #endif
-#ifdef LIBSMBCLIENT
+#ifdef CONFIG_LIBSMBCLIENT
   &stream_info_smb,
 #endif
   &stream_info_cue,
@@ -156,7 +156,7 @@ stream_t* open_stream_plugin(const stream_info_t* sinfo,char* filename,int mode,
   s->flags |= mode;
   *ret = sinfo->open(s,mode,arg,file_format);
   if((*ret) != STREAM_OK) {
-#ifdef MPLAYER_NETWORK
+#ifdef CONFIG_NETWORK
     if (*ret == STREAM_REDIRECTED && redirected_url) {
         if (s->streaming_ctrl && s->streaming_ctrl->url
             && s->streaming_ctrl->url->url)
@@ -247,7 +247,7 @@ int stream_fill_buffer(stream_t *s){
   if (/*s->fd == NULL ||*/ s->eof) { s->buf_pos = s->buf_len = 0; return 0; }
   switch(s->type){
   case STREAMTYPE_STREAM:
-#ifdef MPLAYER_NETWORK
+#ifdef CONFIG_NETWORK
     if( s->streaming_ctrl!=NULL && s->streaming_ctrl->streaming_read ) {
            len=s->streaming_ctrl->streaming_read(s->fd,s->buffer,STREAM_BUFFER_SIZE, s->streaming_ctrl);break;
     } else {
@@ -314,7 +314,7 @@ if(newpos==0 || newpos!=s->pos){
     // Some streaming protocol allow to seek backward and forward
     // A function call that return -1 can tell that the protocol
     // doesn't support seeking.
-#ifdef MPLAYER_NETWORK
+#ifdef CONFIG_NETWORK
     if(s->seek) { // new stream seek is much cleaner than streaming_ctrl one
       if(!s->seek(s,newpos)) {
        mp_msg(MSGT_STREAM,MSGL_ERR, "Seek failed\n");
index d6ba8b2..4e87219 100644 (file)
@@ -65,7 +65,7 @@
 #define STREAM_CTRL_GET_ANGLE 10
 #define STREAM_CTRL_SET_ANGLE 11
 
-#ifdef MPLAYER_NETWORK
+#ifdef CONFIG_NETWORK
 #include "network.h"
 #endif
 
@@ -112,7 +112,7 @@ typedef struct stream_st {
   void* cache_data;
   void* priv; // used for DVD, TV, RTSP etc
   char* url;  // strdup() of filename/url
-#ifdef MPLAYER_NETWORK
+#ifdef CONFIG_NETWORK
   streaming_ctrl_t *streaming_ctrl;
 #endif
   unsigned char buffer[STREAM_BUFFER_SIZE>VCD_SECTOR_SIZE?STREAM_BUFFER_SIZE:VCD_SECTOR_SIZE];