[MPlayer-dev-eng] [PATCH] Gui: remove unused variables

Ingo Brückl ib at wupperonline.de
Fri May 13 11:52:59 CEST 2011


Reimar Döffinger wrote on Sat, 7 May 2011 20:52:06 +0200:

> Index: gui/interface.c
> ===================================================================
> +++ gui/interface.c     (working copy)
> @@ -32,12 +32,10 @@
>  #include "help_mp.h"
>  #include "input/input.h"
>  #include "libaf/equalizer.h"
> -#include "libao2/audio_out.h"
>  #include "libmpcodecs/dec_audio.h"
>  #include "libmpcodecs/dec_video.h"
>  #include "libmpcodecs/vd.h"
>  #include "libmpcodecs/vf.h"
> -#include "libvo/video_out.h"
>  #include "libvo/x11_common.h"
>  #include "mixer.h"
>  #include "mp_msg.h"
> @@ -553,8 +551,6 @@
>
>  int guiGetEvent(int type, void *arg)
>  {
> -    const ao_functions_t *audio_out = NULL;
> -    const vo_functions_t *video_out = NULL;
>      mixer_t *mixer = NULL;
>
>      stream_t *stream = arg;
> @@ -563,11 +559,8 @@
>      dvd_priv_t *dvdp = arg;
>  #endif
>
> -    if (guiIntfStruct.mpcontext) {
> -        audio_out = mpctx_get_audio_out(guiIntfStruct.mpcontext);
> -        video_out = mpctx_get_video_out(guiIntfStruct.mpcontext);
> -        mixer     = mpctx_get_mixer(guiIntfStruct.mpcontext);
> -    }
> +    if (guiIntfStruct.mpcontext)
> +        mixer = mpctx_get_mixer(guiIntfStruct.mpcontext);
>
>      switch (type) {
>      case guiXEvent:
> @@ -707,7 +700,7 @@
>          break;
>
>      case guiSetVolume:
> -        if (audio_out) {
> +        if (mixer) {
>              float l, r;
>
>              mixer_getvolume(mixer, &l, &r);
> @@ -748,7 +741,7 @@
>
>          // audio
>
> -        if (audio_out) {
> +        if (mixer) {
>              float l, r;
>
>              mixer_getvolume(mixer, &l, &r);

Are you going to commit?

Ingo


More information about the MPlayer-dev-eng mailing list