/[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 554 by schoenebeck, Thu May 19 19:25:14 2005 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 183  namespace LinuxSampler { Line 184  namespace LinuxSampler {
184          {          {
185              std::vector<AudioChannel*>::iterator iter = Channels.begin();              std::vector<AudioChannel*>::iterator iter = Channels.begin();
186              while (iter != Channels.end()) {              while (iter != Channels.end()) {
                 Channels.erase(iter);  
187                  delete *iter;                  delete *iter;
188                  iter++;                  iter++;
189              }              }
190                Channels.clear();
191          }          }
192    
193          // delete all device parameters          // delete all device parameters
194          {          {
195              std::map<String,DeviceCreationParameter*>::iterator iter = Parameters.begin();              std::map<String,DeviceCreationParameter*>::iterator iter = Parameters.begin();
196              while (iter != Parameters.end()) {              while (iter != Parameters.end()) {
                 Parameters.erase(iter);  
197                  delete iter->second;                  delete iter->second;
198                  iter++;                  iter++;
199              }              }
200                Parameters.clear();
201          }          }
202      }      }
203    
204      void AudioOutputDevice::Connect(Engine* pEngine) {      void AudioOutputDevice::Connect(Engine* pEngine) {
205          if (Engines.find(pEngine) == Engines.end()) {          std::set<Engine*>& engines = Engines.GetConfigForUpdate();
206              Engines.insert(pEngine);          if (engines.find(pEngine) == engines.end()) {
207                engines.insert(pEngine);
208                Engines.SwitchConfig().insert(pEngine);
209              // make sure the engine knows about the connection              // make sure the engine knows about the connection
210              //pEngine->Connect(this);              //pEngine->Connect(this);
211          }          }
212      }      }
213    
214      void AudioOutputDevice::Disconnect(Engine* pEngine) {      void AudioOutputDevice::Disconnect(Engine* pEngine) {
215          if (Engines.find(pEngine) != Engines.end()) { // if clause to prevent disconnect loop          std::set<Engine*>& engines = Engines.GetConfigForUpdate();
216              Engines.erase(pEngine);          if (engines.find(pEngine) != engines.end()) { // if clause to prevent disconnect loop
217                engines.erase(pEngine);
218                Engines.SwitchConfig().erase(pEngine);
219              // make sure the engine knows about the disconnection              // make sure the engine knows about the disconnection
220              //pEngine->DisconnectAudioOutputDevice();              //pEngine->DisconnectAudioOutputDevice();
221          }          }
# Line 247  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 = EnginesReader.Lock();
255          #if CONFIG_RT_EXCEPTIONS          #if CONFIG_RT_EXCEPTIONS
256          try          try
257          #endif // CONFIG_RT_EXCEPTIONS          #endif // CONFIG_RT_EXCEPTIONS
258          {          {
259              std::set<Engine*>::iterator iterEngine = Engines.begin();              std::set<Engine*>::iterator iterEngine = engines.begin();
260              std::set<Engine*>::iterator end        = Engines.end();              std::set<Engine*>::iterator end        = engines.end();
261              for (; iterEngine != end; iterEngine++) {              for (; iterEngine != end; iterEngine++) {
262                  int res = (*iterEngine)->RenderAudio(Samples);                  int res = (*iterEngine)->RenderAudio(Samples);
263                  if (res != 0) result = res;                  if (res != 0) result = res;
# Line 265  namespace LinuxSampler { Line 270  namespace LinuxSampler {
270          }          }
271          #endif // CONFIG_RT_EXCEPTIONS          #endif // CONFIG_RT_EXCEPTIONS
272    
273            EnginesReader.Unlock();
274          return result;          return result;
275      }      }
276    
Legend:
Removed from v.554  
changed lines
  Added in v.880
  ViewVC Help
Powered by ViewVC