[ekiga] Revert "Keep the output sound volume across calls"



commit d5fc604ec8224ec38f87e90822cd5ba7a0b44d5a
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date:   Tue Sep 1 10:58:44 2009 +0200

    Revert "Keep the output sound volume across calls"
    
    This reverts commit d5761aedc38561b0e18d218a66630c68a04a4e27.
    
    Conflicts:
    
    	lib/engine/audiooutput/audiooutput-core.cpp

 lib/engine/audiooutput/audiooutput-core.cpp |    9 +--------
 1 files changed, 1 insertions(+), 8 deletions(-)
---
diff --git a/lib/engine/audiooutput/audiooutput-core.cpp b/lib/engine/audiooutput/audiooutput-core.cpp
index 4ac298d..cc2bdad 100644
--- a/lib/engine/audiooutput/audiooutput-core.cpp
+++ b/lib/engine/audiooutput/audiooutput-core.cpp
@@ -361,16 +361,9 @@ void AudioOutputCore::play_buffer(AudioOutputPS ps, const char* buffer, unsigned
 
 void AudioOutputCore::on_device_opened (AudioOutputPS ps,
                                         AudioOutputDevice device,
-                                        AudioOutputSettings settings,
+                                        AudioOutputSettings settings, 
                                         AudioOutputManager *manager)
 {
-#ifdef WIN32
-  /* update the current volume to the desired one */
-  if (ps == primary) {
-    current_primary_volume = settings.volume;
-    settings.volume = desired_primary_volume;
-  }
-#endif
   device_opened (*manager, ps, device, settings);
 }
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]