mirror of
https://github.com/mpv-player/mpv
synced 2024-12-22 23:02:37 +00:00
Remove pointless '#if 1' preprocessor directives.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30654 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego
parent
ec3ab25f89
commit
d306b727b1
@ -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 }
|
||||
};
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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);
|
||||
|
||||
|
||||
@ -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 */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user