Mercurial > mplayer.hg

changeset 33393:eda1d0125255

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use mixer directly without checking for an audio_out. If this cases issues, the mixer behaviour should be changed to include any necessary special-cases.
author reimar
date Sun, 22 May 2011 11:20:07 +0000
parents 3844d17b0a24
children a97ab6658993
files gui/interface.c
diffstat 1 files changed, 2 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/gui/interface.c	Sun May 22 11:16:19 2011 +0000
+++ b/gui/interface.c	Sun May 22 11:20:07 2011 +0000
@@ -32,7 +32,6 @@
 #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"
@@ -553,7 +552,6 @@
 
 int guiGetEvent(int type, void *arg)
 {
-    const ao_functions_t *audio_out = NULL;
     mixer_t *mixer = NULL;
 
     stream_t *stream = arg;
@@ -563,7 +561,6 @@
 #endif
 
     if (guiIntfStruct.mpcontext) {
-        audio_out = mpctx_get_audio_out(guiIntfStruct.mpcontext);
         mixer     = mpctx_get_mixer(guiIntfStruct.mpcontext);
     }
 
@@ -705,7 +702,7 @@
         break;
 
     case guiSetVolume:
-        if (audio_out) {
+        if (mixer) {
             float l, r;
 
             mixer_getvolume(mixer, &l, &r);
@@ -746,7 +743,7 @@
 
         // audio
 
-        if (audio_out) {
+        if (mixer) {
             float l, r;
 
             mixer_getvolume(mixer, &l, &r);