From 24be34f1e9e37111a06108c090324426aff6f1db Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 27 Feb 2012 19:15:13 +0100 Subject: cleanup: Silence compilation warnings on MinGW-w64 Some of the code, especially the dshow and windows codec loader parts, are extremely hacky and likely full of bugs. The goal is merely getting rid of warnings that could obscure more important warnings and actual bugs, instead of fixing actual problems. This reduces the number of warnings from over 500 to almost the same as when compiling on Linux. Note that many problems stem from using the ancient wine-derived windows headers. There are some differences to the "proper" windows header. Changing the code to compile with the proper headers would be too much trouble, and it still has to work on Unix. Some of the changes might actually break compilation on legacy MinGW, but we don't support that anymore. Always use MinGW-w64, even when compiling to 32 bit. Fixes some warnings in the win32 loader code on Linux too. --- command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'command.c') diff --git a/command.c b/command.c index 58dd68454f..5551da715c 100644 --- a/command.c +++ b/command.c @@ -1579,7 +1579,7 @@ static int mp_property_sub(m_option_t *prop, int action, void *arg, { struct MPOpts *opts = &mpctx->opts; demux_stream_t *const d_sub = mpctx->d_sub; - int source = -1, reset_spu = 0; + int source = -1, reset_spu av_unused = 0; // used under CONFIG_DVDREAD int source_pos = -1; update_global_sub_size(mpctx); -- cgit v1.2.3 From 7576885677764a71fe03cec5f697f8a28f9365c8 Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Thu, 19 Jan 2012 06:49:47 +0200 Subject: core: remove old EDL mode (--edl option) Remove the old EDL implementation that was activated with the --edl option. It is mostly redundant and inferior compared to the newer demux_edl support, though currently there's no support for using the same EDL files with the new implementation and the mute functionality of the old implementation is not supported. The main reason to remove the old implementation at this point is that the mute functionality would conflict with following audio volume handling changes, and working on the old code would be a wasted effort in the long run as at some point it would be removed anyway. The --edlout functionality is kept for now, even though after this commit there is no code that could directly read its output. --- command.c | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'command.c') diff --git a/command.c b/command.c index 5551da715c..48f0ecb013 100644 --- a/command.c +++ b/command.c @@ -719,8 +719,6 @@ static int mp_property_volume(m_option_t *prop, int action, void *arg, return M_PROPERTY_NOT_IMPLEMENTED; } - if (mpctx->edl_muted) - return M_PROPERTY_DISABLED; mpctx->user_muted = 0; switch (action) { @@ -756,8 +754,6 @@ static int mp_property_mute(m_option_t *prop, int action, void *arg, switch (action) { case M_PROPERTY_SET: - if (mpctx->edl_muted) - return M_PROPERTY_DISABLED; if (!arg) return M_PROPERTY_ERROR; if ((!!*(int *) arg) != mpctx->mixer.muted) @@ -766,18 +762,9 @@ static int mp_property_mute(m_option_t *prop, int action, void *arg, return M_PROPERTY_OK; case M_PROPERTY_STEP_UP: case M_PROPERTY_STEP_DOWN: - if (mpctx->edl_muted) - return M_PROPERTY_DISABLED; mixer_mute(&mpctx->mixer); mpctx->user_muted = mpctx->mixer.muted; return M_PROPERTY_OK; - case M_PROPERTY_PRINT: - if (!arg) - return M_PROPERTY_ERROR; - if (mpctx->edl_muted) { - *(char **) arg = talloc_strdup(NULL, mp_gtext("enabled (EDL)")); - return M_PROPERTY_OK; - } default: return m_property_flag(prop, action, arg, &mpctx->mixer.muted); -- cgit v1.2.3