Simplified volume functions

diff --git a/modules/gui/beos/Interface.cpp b/modules/gui/beos/Interface.cpp
index f15d51de984cd6e4121fe0abdc3be9b0a946554e..390dd15bb2636827d73ff19385f7c4b3d516817c 100644 (file)
--- a/modules/gui/beos/Interface.cpp
+++ b/modules/gui/beos/Interface.cpp
@@ -2,7 +2,7 @@
  * intf_beos.cpp: beos interface
  *****************************************************************************
  * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: Interface.cpp,v 1.9 2003/02/01 12:01:10 stippi Exp $
+ * $Id: Interface.cpp,v 1.10 2003/02/09 11:51:36 titer Exp $
  *
  * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -122,7 +122,7 @@ static void Run( intf_thread_t *p_intf )
 {
     while( !p_intf->b_die )
     {
-        if( p_intf->p_sys->p_wrapper->UpdateInputAndAOut() )
+        if( p_intf->p_sys->p_wrapper->UpdateInput() )
         {
             /* Manage the slider */
             p_intf->p_sys->p_window->UpdateInterface();

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)

diff --git a/modules/gui/beos/VlcWrapper.cpp b/modules/gui/beos/VlcWrapper.cpp
index 0c5b2ca8f9a7253114a2063b723b38eb532c1280..fc99088ca6a8344396b59065fb78d622dd4f3808 100644 (file)
--- a/modules/gui/beos/VlcWrapper.cpp
+++ b/modules/gui/beos/VlcWrapper.cpp
@@ -2,7 +2,7 @@
  * VlcWrapper.cpp: BeOS plugin for vlc (derived from MacOS X port)
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: VlcWrapper.cpp,v 1.24 2003/02/01 12:01:11 stippi Exp $
+ * $Id: VlcWrapper.cpp,v 1.25 2003/02/09 11:51:36 titer Exp $
  *
  * Authors: Florian G. Pflug <fgp@phlo.org>
  *          Jon Lech Johansen <jon-vl@nanocrew.net>
@@ -45,7 +45,6 @@ VlcWrapper::VlcWrapper( intf_thread_t *p_interface )
 {
     p_intf = p_interface;
     p_input = NULL;
-    p_aout = NULL;
     p_playlist = (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
                                                 FIND_ANYWHERE );
 }
@@ -61,26 +60,17 @@ VlcWrapper::~VlcWrapper()
     {
         vlc_object_release( p_playlist );
     }
-    if( p_aout )
-    {
-        vlc_object_release( p_aout );
-    }
 }
 
-/* UpdateInputAndAOut: updates p_input and p_aout, returns true if the
-   interface needs to be updated */
-bool VlcWrapper::UpdateInputAndAOut()
+/* UpdateInput: updates p_input, returns true if the interface needs to
+   be updated */
+bool VlcWrapper::UpdateInput()
 {
     if( p_input == NULL )
     {
         p_input = (input_thread_t *)vlc_object_find( p_intf, VLC_OBJECT_INPUT,
                                                      FIND_ANYWHERE );
     }
-    if( p_aout == NULL )
-    {
-        p_aout = (aout_instance_t*)vlc_object_find( p_intf, VLC_OBJECT_AOUT,
-                                                    FIND_ANYWHERE );
-    }
         
     if( p_input != NULL )
     {
@@ -88,12 +78,6 @@ bool VlcWrapper::UpdateInputAndAOut()
         {
             vlc_object_release( p_input );
             p_input = NULL;
-            
-            if( p_aout )
-            {
-                vlc_object_release( p_aout );
-                p_aout = NULL;
-            }
         }
         return true;
     }
@@ -757,51 +741,33 @@ VlcWrapper::PlaylistSetPlaying( int index ) const
  * audio *
  *********/
 
-bool VlcWrapper::HasAudio()
-{
-    return( p_aout != NULL );
-}
-
 unsigned short VlcWrapper::GetVolume()
 {
-    if( p_aout != NULL )
-    {
-        unsigned short i_volume;
-        aout_VolumeGet( p_aout, (audio_volume_t*)&i_volume );
-        return i_volume;
-    }
-    return 0;
+    unsigned short i_volume;
+    aout_VolumeGet( p_intf, (audio_volume_t*)&i_volume );
+    return i_volume;
 }
 
-void VlcWrapper::SetVolume(int value)
+void VlcWrapper::SetVolume( int value )
 {
-    if( p_aout != NULL )
+    if ( p_intf->p_sys->b_mute )
     {
-               if ( p_intf->p_sys->b_mute )
-               {
-                       p_intf->p_sys->b_mute = 0;
-               }
-        aout_VolumeSet( p_aout, value );
+        p_intf->p_sys->b_mute = 0;
     }
+    aout_VolumeSet( p_intf, value );
 }
 
 void VlcWrapper::VolumeMute()
 {
-    if( p_aout != NULL )
-       {
-           aout_VolumeGet( p_aout, &p_intf->p_sys->i_saved_volume );
-           aout_VolumeMute( p_aout, NULL );
-           p_intf->p_sys->b_mute = 1;
-       }
+       aout_VolumeGet( p_intf, &p_intf->p_sys->i_saved_volume );
+    aout_VolumeMute( p_intf, NULL );
+    p_intf->p_sys->b_mute = 1;
 }
 
 void VlcWrapper::VolumeRestore()
 {
-    if( p_aout != NULL )
-       {
-        aout_VolumeSet( p_aout, p_intf->p_sys->i_saved_volume );
-        p_intf->p_sys->b_mute = 0;
-       }
+    aout_VolumeSet( p_intf, p_intf->p_sys->i_saved_volume );
+    p_intf->p_sys->b_mute = 0;
 }
 
 bool VlcWrapper::IsMuted()

diff --git a/modules/gui/beos/VlcWrapper.h b/modules/gui/beos/VlcWrapper.h
index c873b771944f7ee042c0ba765fe32b528574b868..c41b6f6ec23cb58e1fc445cf1bec944718597f7d 100644 (file)
--- a/modules/gui/beos/VlcWrapper.h
+++ b/modules/gui/beos/VlcWrapper.h
@@ -2,7 +2,7 @@
  * VlcWrapper.h: BeOS plugin for vlc (derived from MacOS X port)
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: VlcWrapper.h,v 1.19 2003/02/01 12:01:11 stippi Exp $
+ * $Id: VlcWrapper.h,v 1.20 2003/02/09 11:51:36 titer Exp $
  *
  * Authors: Florian G. Pflug <fgp@phlo.org>
  *          Jon Lech Johansen <jon-vl@nanocrew.net>
@@ -62,7 +62,7 @@ public:
     VlcWrapper( intf_thread_t *p_intf );
     ~VlcWrapper();
     
-    bool UpdateInputAndAOut();
+    bool UpdateInput();
     
     /* Input */
     bool         HasInput();
@@ -116,7 +116,6 @@ public:
        void    PlaylistSetPlaying( int index ) const;
 
     /* Audio */
-    bool           HasAudio();
     unsigned short GetVolume();
     void           SetVolume( int value );
     void           VolumeMute();
@@ -146,5 +145,4 @@ private:
     intf_thread_t *   p_intf;
     input_thread_t *  p_input;
     playlist_t *      p_playlist;
-    aout_instance_t * p_aout;
 };