Simplified volume functions

[vlc] / modules / gui / beos / InterfaceWindow.cpp

diff --git a/modules/gui/beos/InterfaceWindow.cpp b/modules/gui/beos/InterfaceWindow.cpp
index 3ebfd14130ab4f6f32c990dd36a6ff8d6a938e43..81e52c43968428f4a6b950f4802c787042bcb3a3 100644 (file)
--- a/modules/gui/beos/InterfaceWindow.cpp
+++ b/modules/gui/beos/InterfaceWindow.cpp
@@ -2,7 +2,7 @@
  * InterfaceWindow.cpp: beos interface
  *****************************************************************************
  * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: InterfaceWindow.cpp,v 1.27 2003/02/03 17:18:48 stippi Exp $
+ * $Id: InterfaceWindow.cpp,v 1.28 2003/02/09 11:51:36 titer Exp $
  *
  * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -870,7 +870,7 @@ void InterfaceWindow::UpdateInterface()
             p_wrapper->GetNavCapabilities( &canSkipPrev, &canSkipNext );
             p_mediaControl->SetSkippable( canSkipPrev, canSkipNext );
 
-            if ( p_wrapper->HasAudio() )
+            if ( p_wrapper->HasInput() )
             {
                 p_mediaControl->SetAudioEnabled( true );
                 p_mediaControl->SetMuted( p_wrapper->IsMuted() );
@@ -906,14 +906,6 @@ void InterfaceWindow::UpdateInterface()
         }
     }
 
-    /* always force the user-specified volume */
-    /* FIXME : I'm quite sure there is a cleaner way to do this */
-    int i_volume = p_mediaControl->GetVolume();
-    if( p_wrapper->GetVolume() != i_volume )
-    {
-        p_wrapper->SetVolume( i_volume );
-    }
-
        // strangly, someone is calling this function even after the object has been destructed!
        // even more strangly, this workarround seems to work
        if (fMessagesWindow)