diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-19 10:22:29 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-19 10:22:29 +0000 |
commit | d306b727b18ce11ff63819a66e8743c5b374bdaf (patch) | |
tree | 12b4ce8ddd3303a53856d2b1b2dd2c855e50cabe | |
parent | ec3ab25f896910fc46fc077266a05e09602f6663 (diff) | |
download | mpv-d306b727b18ce11ff63819a66e8743c5b374bdaf.tar.bz2 mpv-d306b727b18ce11ff63819a66e8743c5b374bdaf.tar.xz |
Remove pointless '#if 1' preprocessor directives.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30654 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | gui/cfg.c | 2 | ||||
-rw-r--r-- | libao2/ao_dsound.c | 3 | ||||
-rw-r--r-- | libvo/mga_common.c | 2 | ||||
-rw-r--r-- | libvo/vo_dxr3.c | 2 | ||||
-rw-r--r-- | libvo/vo_xvmc.c | 2 | ||||
-rw-r--r-- | loader/win32.c | 6 | ||||
-rw-r--r-- | stream/stream_dvdnav.c | 2 | ||||
-rw-r--r-- | vidix/pm3_regs.h | 4 |
8 files changed, 1 insertions, 22 deletions
@@ -205,7 +205,6 @@ static const m_option_t gui_opts[] = { "equ_channel_5",>kEquChannel5,CONF_TYPE_STRING,0,0,0,NULL }, { "equ_channel_6",>kEquChannel6,CONF_TYPE_STRING,0,0,0,NULL }, -#if 1 #define audio_equ_row( i,j ) { "equ_band_"#i#j,>kEquChannels[i][j],CONF_TYPE_FLOAT,CONF_RANGE,-15.0,15.0,NULL }, audio_equ_row( 0,0 ) audio_equ_row( 0,1 ) audio_equ_row( 0,2 ) audio_equ_row( 0,3 ) audio_equ_row( 0,4 ) audio_equ_row( 0,5 ) audio_equ_row( 0,6 ) audio_equ_row( 0,7 ) audio_equ_row( 0,8 ) audio_equ_row( 0,9 ) audio_equ_row( 1,0 ) audio_equ_row( 1,1 ) audio_equ_row( 1,2 ) audio_equ_row( 1,3 ) audio_equ_row( 1,4 ) audio_equ_row( 1,5 ) audio_equ_row( 1,6 ) audio_equ_row( 1,7 ) audio_equ_row( 1,8 ) audio_equ_row( 1,9 ) @@ -214,7 +213,6 @@ static const m_option_t gui_opts[] = audio_equ_row( 4,0 ) audio_equ_row( 4,1 ) audio_equ_row( 4,2 ) audio_equ_row( 4,3 ) audio_equ_row( 4,4 ) audio_equ_row( 4,5 ) audio_equ_row( 4,6 ) audio_equ_row( 4,7 ) audio_equ_row( 4,8 ) audio_equ_row( 4,9 ) audio_equ_row( 5,0 ) audio_equ_row( 5,1 ) audio_equ_row( 5,2 ) audio_equ_row( 5,3 ) audio_equ_row( 5,4 ) audio_equ_row( 5,5 ) audio_equ_row( 5,6 ) audio_equ_row( 5,7 ) audio_equ_row( 5,8 ) audio_equ_row( 5,9 ) #undef audio_equ_row -#endif { NULL, NULL, 0, 0, 0, 0, NULL } }; diff --git a/libao2/ao_dsound.c b/libao2/ao_dsound.c index c53820638d..605b0f16e0 100644 --- a/libao2/ao_dsound.c +++ b/libao2/ao_dsound.c @@ -55,7 +55,6 @@ LIBAO_EXTERN(dsound) /** \todo use the definitions from the win32 api headers when they define these */ -#if 1 #define WAVE_FORMAT_IEEE_FLOAT 0x0003 #define WAVE_FORMAT_DOLBY_AC3_SPDIF 0x0092 #define WAVE_FORMAT_EXTENSIBLE 0xFFFE @@ -103,8 +102,6 @@ typedef struct { } WAVEFORMATEXTENSIBLE, *PWAVEFORMATEXTENSIBLE; #endif -#endif - static const int channel_mask[] = { SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_LOW_FREQUENCY, SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT, diff --git a/libvo/mga_common.c b/libvo/mga_common.c index 13b73d1b45..c7ba8ddffd 100644 --- a/libvo/mga_common.c +++ b/libvo/mga_common.c @@ -142,11 +142,9 @@ vo_mga_flip_page(void) // printf("-- flip to %d --\n",mga_next_frame); -#if 1 ioctl(f,MGA_VID_FSEL,&mga_next_frame); mga_next_frame=(mga_next_frame+1)%mga_vid_config.num_frames; vid_data=frames[mga_next_frame]; -#endif } diff --git a/libvo/vo_dxr3.c b/libvo/vo_dxr3.c index 95ecae695e..0c031013da 100644 --- a/libvo/vo_dxr3.c +++ b/libvo/vo_dxr3.c @@ -630,9 +630,7 @@ static void draw_osd(void) */ /* Subpics are not stable yet =( expect lockups if you enable */ -#if 1 write(fd_spu, spued->data, spued->count); -#endif } disposd++; #endif diff --git a/libvo/vo_xvmc.c b/libvo/vo_xvmc.c index 76954b2649..fb0266e081 100644 --- a/libvo/vo_xvmc.c +++ b/libvo/vo_xvmc.c @@ -1110,7 +1110,6 @@ static int draw_slice(uint8_t *image[], int stride[], rndr->flags, rndr->filled_mv_blocks_num,rndr->start_mv_blocks_num, &mv_blocks,&data_blocks); -#if 1 if(rez != Success) { int i; @@ -1136,7 +1135,6 @@ static int draw_slice(uint8_t *image[], int stride[], testblock->PMV[0][0][0],testblock->PMV[0][0][1]); } } -#endif assert(rez==Success); mp_msg(MSGT_VO,MSGL_DBG4,"vo_xvmc: flush surface\n"); rez = XvMCFlushSurface(mDisplay, rndr->p_surface); diff --git a/loader/win32.c b/loader/win32.c index 39c9d65b05..b2e88a5a6d 100644 --- a/loader/win32.c +++ b/loader/win32.c @@ -4131,11 +4131,9 @@ static int expfprintf(void* stream, const char* format, ...) va_list args; int r = 0; dbgprintf("fprintf(%p, %s, ...)\n", stream, format); -#if 1 va_start(args, format); r = vfprintf((FILE*) stream, format, args); va_end(args); -#endif return r; } @@ -4424,7 +4422,6 @@ static int exp_setjmp3(void* jmpbuf, int x) : "d"(jmpbuf) // input : "eax" ); -#if 1 __asm__ volatile ( "mov %%fs:0, %%eax \n\t" // unsure @@ -4437,7 +4434,6 @@ static int exp_setjmp3(void* jmpbuf, int x) : : "eax" ); -#endif return 0; } @@ -4494,7 +4490,6 @@ static void WINAPI expGlobalMemoryStatus( return; } -#if 1 f = fopen( "/proc/meminfo", "r" ); if (f) { @@ -4542,7 +4537,6 @@ static void WINAPI expGlobalMemoryStatus( / (TotalPhysical / 100); } } else -#endif { /* FIXME: should do something for other systems */ lpmem->dwMemoryLoad = 0; diff --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c index c2915fbd35..87d18f6d23 100644 --- a/stream/stream_dvdnav.c +++ b/stream/stream_dvdnav.c @@ -132,12 +132,10 @@ static dvdnav_priv_t * new_dvdnav_stream(char * filename) { dvdnav_set_readahead_flag(priv->dvdnav, 0); if(dvdnav_set_PGC_positioning_flag(priv->dvdnav, 1) != DVDNAV_STATUS_OK) mp_msg(MSGT_OPEN,MSGL_ERR,"stream_dvdnav, failed to set PGC positioning\n"); -#if 1 /* report the title?! */ if (dvdnav_get_title_string(priv->dvdnav,&title_str)==DVDNAV_STATUS_OK) { mp_msg(MSGT_IDENTIFY, MSGL_INFO,"Title: '%s'\n",title_str); } -#endif //dvdnav_event_clear(priv); diff --git a/vidix/pm3_regs.h b/vidix/pm3_regs.h index 2ec5555a79..727e873e3d 100644 --- a/vidix/pm3_regs.h +++ b/vidix/pm3_regs.h @@ -1051,8 +1051,6 @@ #define PM3FillRectanglePosition_XOffset(x) ((x)&0xffff) #define PM3FillRectanglePosition_YOffset(y) (((y)&0xffff)<<16) -#if 1 - /********************************************** * GLINT Permedia3 Macros * ***********************************************/ @@ -1109,5 +1107,5 @@ do{ \ RAMDAC_SET_INDEX(index); \ temp = READ_REG(PM3RD_IndexedData); \ } -#endif + #endif /* MPLAYER_PM3_REGS_H */ |