github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-10-26 07:22:17 +02:00
Code Releases Activity

cleanup: remove pointless #defines

Browse Source 
Remove the following #defines, which should never change in practice:

CONFIG_FAKE_MONO, OUTBURST, FAST_OSD, FAST_OSD_TABLE
The configure script hardcoded these to particular values in config.h.
They could only be changed by manually editing it. I don't think
anyone would want to.

X11_FULLSCREEN
This once did something, but became meaningless years ago and was now
always set to true if the files using it were compiled at all.

Conflicts:
	configure
	libvo/osd.c
	libvo/vo_gl.c

Merged from mplayer2. The OSD defines were already removed in this fork.
This commit is contained in:
Uoti Urpala 2012-08-21 18:52:31 +03:00 committed by wm4
parent d21b109bf7
commit 435d7c97c9
7 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cfg-mplayer.h
View File

@ -470,9 +470,7 @@ const m_option_t common_opts[] = {
// ------------------------- codec/vfilter options --------------------
// MP3-only: select stereo/left/right
#ifdef CONFIG_FAKE_MONO
{"stereo", &fakemono, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL},
#endif
{"af*", &af_cfg.list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
{"af-adv", (void *) audio_filter_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},

10
configure vendored
View File

@ -3421,16 +3421,6 @@ cat > $TMPH << EOF
#ifndef MPLAYER_CONFIG_H
#define MPLAYER_CONFIG_H
/* Undefine this if you do not want to select mono audio (left or right)
with a stereo MPEG layer 2/3 audio stream. The command line option
-stereo has three possible values (0 for stereo, 1 for left-only, 2 for
right-only), with 0 being the default.
*/
#define CONFIG_FAKE_MONO 1
/* set up audio OUTBURST. Do not change this! */
#define OUTBURST 512
#define CONFIGURATION "$configuration"
#define MPLAYER_DATADIR "$_datadir"

2
libao2/audio_out.c
View File

@ -97,7 +97,7 @@ void list_audio_out(void)
struct ao *ao_create(struct MPOpts *opts, struct input_ctx *input)
{
struct ao *r = talloc(NULL, struct ao);
*r = (struct ao){.outburst = OUTBURST, .buffersize = -1,
*r = (struct ao){.outburst = 512, .buffersize = -1,
.opts = opts, .input_ctx = input };
return r;
}

2
libmpcodecs/ad_mpg123.c
View File

@ -93,14 +93,12 @@ static int preinit(sh_audio_t *sh)
if (!con->handle)
goto bad_end;
#ifdef CONFIG_FAKE_MONO
/* Guessing here: Default value triggers forced upmix of mono to stereo. */
flag = fakemono == 0 ? MPG123_FORCE_STEREO :
fakemono == 1 ? MPG123_MONO_LEFT :
fakemono == 2 ? MPG123_MONO_RIGHT : 0;
if (mpg123_param(con->handle, MPG123_ADD_FLAGS, flag, 0.0) != MPG123_OK)
goto bad_end;
#endif
/* Basic settings.
* Don't spill messages, enable better resync with non-seekable streams.

2
libmpcodecs/dec_audio.c
View File

@ -37,9 +37,7 @@
#include "libaf/af.h"
#ifdef CONFIG_FAKE_MONO
int fakemono = 0;
#endif
af_cfg_t af_cfg = { 1, NULL }; // Configuration for audio filters

4
libvo/x11_common.c
View File

@ -31,8 +31,6 @@
#include "x11_common.h"
#include "talloc.h"
#ifdef X11_FULLSCREEN
#include <string.h>
#include <unistd.h>
#include <assert.h>
@ -1749,8 +1747,6 @@ double vo_vm_get_fps(struct vo *vo)
}
#endif
#endif /* X11_FULLSCREEN */
/*
* Scan the available visuals on this Display/Screen. Try to find

7
libvo/x11_common.h
View File

@ -98,12 +98,6 @@ struct vo_x11_state {
Atom XA_NET_WM_CM;
};
#if defined(CONFIG_GL) || defined(CONFIG_X11) || defined(CONFIG_XV)
#define X11_FULLSCREEN 1
#endif
#ifdef X11_FULLSCREEN
#define vo_wm_LAYER 1
#define vo_wm_FULLSCREEN 2
#define vo_wm_STAYS_ON_TOP 4
@ -150,7 +144,6 @@ void vo_x11_ontop(struct vo *vo);
void vo_x11_border(struct vo *vo);
void vo_x11_ewmh_fullscreen(struct vo_x11_state *x11, int action);
#endif
int vo_xv_set_eq(struct vo *vo, uint32_t xv_port, const char *name, int value);
int vo_xv_get_eq(struct vo *vo, uint32_t xv_port, const char *name, int *value);