/[svn]/linuxsampler/trunk/src/engines/gig/Engine.cpp
ViewVC logotype

Diff of /linuxsampler/trunk/src/engines/gig/Engine.cpp

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

revision 1789 by iliev, Sat Nov 1 19:01:27 2008 UTC revision 1843 by iliev, Sat Feb 21 17:08:18 2009 UTC
# Line 107  namespace LinuxSampler { namespace gig { Line 107  namespace LinuxSampler { namespace gig {
107          pSysexBuffer       = new RingBuffer<uint8_t,false>(CONFIG_SYSEX_BUFFER_SIZE, 0);          pSysexBuffer       = new RingBuffer<uint8_t,false>(CONFIG_SYSEX_BUFFER_SIZE, 0);
108          pEventQueue        = new RingBuffer<Event,false>(CONFIG_MAX_EVENTS_PER_FRAGMENT, 0);          pEventQueue        = new RingBuffer<Event,false>(CONFIG_MAX_EVENTS_PER_FRAGMENT, 0);
109          pEventPool         = new Pool<Event>(CONFIG_MAX_EVENTS_PER_FRAGMENT);          pEventPool         = new Pool<Event>(CONFIG_MAX_EVENTS_PER_FRAGMENT);
110          pVoicePool         = new Pool<Voice>(CONFIG_MAX_VOICES);          pVoicePool         = new Pool<Voice>(GLOBAL_MAX_VOICES);
111          pDimRegionPool[0]  = new Pool< ::gig::DimensionRegion*>(CONFIG_MAX_VOICES);          pDimRegionPool[0]  = new Pool< ::gig::DimensionRegion*>(GLOBAL_MAX_VOICES);
112          pDimRegionPool[1]  = new Pool< ::gig::DimensionRegion*>(CONFIG_MAX_VOICES);          pDimRegionPool[1]  = new Pool< ::gig::DimensionRegion*>(GLOBAL_MAX_VOICES);
113          pVoiceStealingQueue = new RTList<Event>(pEventPool);          pVoiceStealingQueue = new RTList<Event>(pEventPool);
114          pGlobalEvents      = new RTList<Event>(pEventPool);          pGlobalEvents      = new RTList<Event>(pEventPool);
115            iMaxDiskStreams    = GLOBAL_MAX_STREAMS;
116    
117          for (RTList<Voice>::Iterator iterVoice = pVoicePool->allocAppend(); iterVoice == pVoicePool->last(); iterVoice = pVoicePool->allocAppend()) {          for (RTList<Voice>::Iterator iterVoice = pVoicePool->allocAppend(); iterVoice == pVoicePool->last(); iterVoice = pVoicePool->allocAppend()) {
118              iterVoice->SetEngine(this);              iterVoice->SetEngine(this);
# Line 342  namespace LinuxSampler { namespace gig { Line 343  namespace LinuxSampler { namespace gig {
343       * @param pAudioOut - audio output device to connect to       * @param pAudioOut - audio output device to connect to
344       */       */
345      void Engine::Connect(AudioOutputDevice* pAudioOut) {      void Engine::Connect(AudioOutputDevice* pAudioOut) {
346            // caution: don't ignore if connecting to the same device here,
347            // because otherwise SetMaxDiskStreams() implementation won't work anymore!
348    
349          pAudioOutputDevice = pAudioOut;          pAudioOutputDevice = pAudioOut;
350    
351          ResetInternal();          ResetInternal();
# Line 380  namespace LinuxSampler { namespace gig { Line 384  namespace LinuxSampler { namespace gig {
384              delete this->pDiskThread;              delete this->pDiskThread;
385              dmsg(1,("OK\n"));              dmsg(1,("OK\n"));
386          }          }
387          this->pDiskThread = new DiskThread(((pAudioOut->MaxSamplesPerCycle() << CONFIG_MAX_PITCH) << 1) + 6, //FIXME: assuming stereo          this->pDiskThread =
388                                             &instruments);              new DiskThread(
389                    iMaxDiskStreams,
390                    ((pAudioOut->MaxSamplesPerCycle() << CONFIG_MAX_PITCH) << 1) + 6, //FIXME: assuming stereo
391                    &instruments
392                );
393    
394          if (!pDiskThread) {          if (!pDiskThread) {
395              dmsg(0,("gig::Engine  new diskthread = NULL\n"));              dmsg(0,("gig::Engine  new diskthread = NULL\n"));
396              exit(EXIT_FAILURE);              exit(EXIT_FAILURE);
# Line 407  namespace LinuxSampler { namespace gig { Line 416  namespace LinuxSampler { namespace gig {
416                  exit(EXIT_FAILURE);                  exit(EXIT_FAILURE);
417              }              }
418          }          }
419            pVoicePool->clear();
420      }      }
421    
422      /**      /**
# Line 584  namespace LinuxSampler { namespace gig { Line 594  namespace LinuxSampler { namespace gig {
594          // update time of start and end of this audio fragment (as events' time stamps relate to this)          // update time of start and end of this audio fragment (as events' time stamps relate to this)
595          pEventGenerator->UpdateFragmentTime(Samples);          pEventGenerator->UpdateFragmentTime(Samples);
596    
597          // We only allow a maximum of CONFIG_MAX_VOICES voices to be spawned          // We only allow the given maximum number of voices to be spawned
598          // in each audio fragment. All subsequent request for spawning new          // in each audio fragment. All subsequent request for spawning new
599          // voices in the same audio fragment will be ignored.          // voices in the same audio fragment will be ignored.
600          VoiceSpawnsLeft = CONFIG_MAX_VOICES;          VoiceSpawnsLeft = MaxVoices();
601    
602          // get all events from the engine's global input event queue which belong to the current fragment          // get all events from the engine's global input event queue which belong to the current fragment
603          // (these are usually just SysEx messages)          // (these are usually just SysEx messages)
# Line 2111  namespace LinuxSampler { namespace gig { Line 2121  namespace LinuxSampler { namespace gig {
2121          return ActiveVoiceCountMax;          return ActiveVoiceCountMax;
2122      }      }
2123    
2124        int Engine::MaxVoices() {
2125            return pVoicePool->poolSize();
2126        }
2127    
2128        void Engine::SetMaxVoices(int iVoices) throw (Exception) {
2129            if (iVoices < 1)
2130                throw Exception("Maximum voices for an engine cannot be set lower than 1");
2131    
2132            SuspendAll();
2133    
2134            // NOTE: we need to clear pDimRegionsInUse before deleting pDimRegionPool,
2135            // otherwise memory corruption will occur if there are active voices (see bug #118)
2136            for (int iChannel = 0; iChannel < engineChannels.size(); iChannel++) {
2137                engineChannels[iChannel]->ClearDimRegionsInUse();
2138            }
2139    
2140            if (pDimRegionPool[0]) delete pDimRegionPool[0];
2141            if (pDimRegionPool[1]) delete pDimRegionPool[1];
2142    
2143            pDimRegionPool[0] = new Pool< ::gig::DimensionRegion*>(iVoices);
2144            pDimRegionPool[1] = new Pool< ::gig::DimensionRegion*>(iVoices);
2145    
2146            for (int iChannel = 0; iChannel < engineChannels.size(); iChannel++) {
2147                engineChannels[iChannel]->ResetDimRegionsInUse();
2148            }
2149    
2150            try {
2151                pVoicePool->resizePool(iVoices);
2152            } catch (...) {
2153                throw Exception("FATAL: Could not resize voice pool!");
2154            }
2155    
2156            for (RTList<Voice>::Iterator iterVoice = pVoicePool->allocAppend(); iterVoice == pVoicePool->last(); iterVoice = pVoicePool->allocAppend()) {
2157                iterVoice->SetEngine(this);
2158                iterVoice->pDiskThread = this->pDiskThread;
2159            }
2160            pVoicePool->clear();
2161    
2162            ResumeAll();
2163        }
2164    
2165      bool Engine::DiskStreamSupported() {      bool Engine::DiskStreamSupported() {
2166          return true;          return true;
2167      }      }
# Line 2123  namespace LinuxSampler { namespace gig { Line 2174  namespace LinuxSampler { namespace gig {
2174          return (pDiskThread) ? pDiskThread->ActiveStreamCountMax : 0;          return (pDiskThread) ? pDiskThread->ActiveStreamCountMax : 0;
2175      }      }
2176    
2177        int Engine::MaxDiskStreams() {
2178            return iMaxDiskStreams;
2179        }
2180    
2181        void Engine::SetMaxDiskStreams(int iStreams) throw (Exception) {
2182            if (iStreams < 0)
2183                throw Exception("Maximum disk streams for an engine cannot be set lower than 0");
2184    
2185            SuspendAll();
2186    
2187            iMaxDiskStreams = iStreams;
2188    
2189            // reconnect to audio output device, because that will automatically
2190            // recreate the disk thread with the required amount of streams
2191            if (pAudioOutputDevice) Connect(pAudioOutputDevice);
2192    
2193            ResumeAll();
2194        }
2195    
2196      String Engine::DiskStreamBufferFillBytes() {      String Engine::DiskStreamBufferFillBytes() {
2197          return pDiskThread->GetBufferFillBytes();          return pDiskThread->GetBufferFillBytes();
2198      }      }
# Line 2140  namespace LinuxSampler { namespace gig { Line 2210  namespace LinuxSampler { namespace gig {
2210      }      }
2211    
2212      String Engine::Version() {      String Engine::Version() {
2213          String s = "$Revision: 1.98 $";          String s = "$Revision: 1.100 $";
2214          return s.substr(11, s.size() - 13); // cut dollar signs, spaces and CVS macro keyword          return s.substr(11, s.size() - 13); // cut dollar signs, spaces and CVS macro keyword
2215      }      }
2216    
Legend:
Removed from v.1789  
changed lines
  Added in v.1843
  ViewVC Help
Powered by ViewVC