/[svn]/linuxsampler/trunk/src/drivers/audio/AudioOutputDevice.cpp
ViewVC logotype

Diff of /linuxsampler/trunk/src/drivers/audio/AudioOutputDevice.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 840 by persson, Sun Feb 26 13:00:08 2006 UTC revision 880 by schoenebeck, Tue Jun 27 22:57:37 2006 UTC
# Line 3  Line 3 
3   *   LinuxSampler - modular, streaming capable sampler                     *   *   LinuxSampler - modular, streaming capable sampler                     *
4   *                                                                         *   *                                                                         *
5   *   Copyright (C) 2003, 2004 by Benno Senoner and Christian Schoenebeck   *   *   Copyright (C) 2003, 2004 by Benno Senoner and Christian Schoenebeck   *
6   *   Copyright (C) 2005 Christian Schoenebeck                              *   *   Copyright (C) 2005, 2006 Christian Schoenebeck                        *
7   *                                                                         *   *                                                                         *
8   *   This program is free software; you can redistribute it and/or modify  *   *   This program is free software; you can redistribute it and/or modify  *
9   *   it under the terms of the GNU General Public License as published by  *   *   it under the terms of the GNU General Public License as published by  *
# Line 56  namespace LinuxSampler { Line 56  namespace LinuxSampler {
56          return true;          return true;
57      }      }
58    
59      void AudioOutputDevice::ParameterActive::OnSetValue(bool b) throw (LinuxSamplerException) {      void AudioOutputDevice::ParameterActive::OnSetValue(bool b) throw (Exception) {
60          if (b) ((AudioOutputDevice*)pDevice)->Play();          if (b) ((AudioOutputDevice*)pDevice)->Play();
61          else ((AudioOutputDevice*)pDevice)->Stop();          else ((AudioOutputDevice*)pDevice)->Stop();
62      }      }
# Line 109  namespace LinuxSampler { Line 109  namespace LinuxSampler {
109          return std::vector<int>();          return std::vector<int>();
110      }      }
111    
112      void AudioOutputDevice::ParameterSampleRate::OnSetValue(int i) throw (LinuxSamplerException) {      void AudioOutputDevice::ParameterSampleRate::OnSetValue(int i) throw (Exception) {
113          /* cannot happen, as parameter is fix */          /* cannot happen, as parameter is fix */
114      }      }
115    
# Line 161  namespace LinuxSampler { Line 161  namespace LinuxSampler {
161          return std::vector<int>();          return std::vector<int>();
162      }      }
163    
164      void AudioOutputDevice::ParameterChannels::OnSetValue(int i) throw (LinuxSamplerException) {      void AudioOutputDevice::ParameterChannels::OnSetValue(int i) throw (Exception) {
165          ((AudioOutputDevice*)pDevice)->AcquireChannels(i);          ((AudioOutputDevice*)pDevice)->AcquireChannels(i);
166      }      }
167    
# Line 174  namespace LinuxSampler { Line 174  namespace LinuxSampler {
174  // *************** AudioOutputDevice ***************  // *************** AudioOutputDevice ***************
175  // *  // *
176    
177      AudioOutputDevice::AudioOutputDevice(std::map<String,DeviceCreationParameter*> DriverParameters) {      AudioOutputDevice::AudioOutputDevice(std::map<String,DeviceCreationParameter*> DriverParameters)
178            : EnginesReader(Engines) {
179          this->Parameters = DriverParameters;          this->Parameters = DriverParameters;
180      }      }
181    
# Line 250  namespace LinuxSampler { Line 251  namespace LinuxSampler {
251          int result = 0;          int result = 0;
252    
253          // let all connected engines render audio for the current audio fragment cycle          // let all connected engines render audio for the current audio fragment cycle
254          const std::set<Engine*>& engines = Engines.Lock();          const std::set<Engine*>& engines = EnginesReader.Lock();
255          #if CONFIG_RT_EXCEPTIONS          #if CONFIG_RT_EXCEPTIONS
256          try          try
257          #endif // CONFIG_RT_EXCEPTIONS          #endif // CONFIG_RT_EXCEPTIONS
# Line 269  namespace LinuxSampler { Line 270  namespace LinuxSampler {
270          }          }
271          #endif // CONFIG_RT_EXCEPTIONS          #endif // CONFIG_RT_EXCEPTIONS
272    
273          Engines.Unlock();          EnginesReader.Unlock();
274          return result;          return result;
275      }      }
276    
Legend:
Removed from v.840  
changed lines
  Added in v.880
  ViewVC Help
Powered by ViewVC