--- linuxsampler/trunk/src/engines/gig/EngineChannel.cpp	2005/03/09 22:12:15	438
+++ linuxsampler/trunk/src/engines/gig/EngineChannel.cpp	2005/03/14 22:35:44	460
@@ -29,6 +29,8 @@
         pMIDIKeyInfo = new midi_key_info_t[128];
         pEngine      = NULL;
         pInstrument  = NULL;
+        pEvents      = NULL; // we allocate when we retrieve the right Engine object
+        pCCEvents    = NULL; // we allocate when we retrieve the right Engine object
         pEventQueue  = new RingBuffer<Event>(MAX_EVENTS_PER_FRAGMENT, 0);
         pActiveKeys  = new Pool<uint>(128);
         for (uint i = 0; i < 128; i++) {
@@ -39,6 +41,9 @@
             pMIDIKeyInfo[i].pEvents        = NULL; // we allocate when we retrieve the right Engine object
             pMIDIKeyInfo[i].RoundRobinIndex = 0;
         }
+        for (uint i = 0; i < Event::destination_count; i++) {
+            pSynthesisEvents[i] = NULL; // we allocate when we retrieve the right Engine object
+        }
         InstrumentIdx  = -1;
         InstrumentStat = -1;
         AudioDeviceChannelLeft  = -1;
@@ -46,17 +51,8 @@
     }
 
     EngineChannel::~EngineChannel() {
+        DisconnectAudioOutputDevice();
         if (pInstrument) Engine::instruments.HandBack(pInstrument, this);
-        for (uint i = 0; i < 128; i++) {
-            if (pMIDIKeyInfo[i].pActiveVoices) {
-                pMIDIKeyInfo[i].pActiveVoices->clear();
-                delete pMIDIKeyInfo[i].pActiveVoices;
-            }
-            if (pMIDIKeyInfo[i].pEvents) {
-                pMIDIKeyInfo[i].pEvents->clear();
-                delete pMIDIKeyInfo[i].pEvents;
-            }
-        }
         if (pEventQueue) delete pEventQueue;
         if (pActiveKeys) delete pActiveKeys;
         if (pMIDIKeyInfo) delete[] pMIDIKeyInfo;
@@ -76,10 +72,6 @@
         // set all MIDI controller values to zero
         memset(ControllerTable, 0x00, 128);
 
-        // reset voice stealing parameters
-        itLastStolenVoice = RTList<Voice>::Iterator();
-        iuiLastStolenKey  = RTList<uint>::Iterator();
-
         // reset key info
         for (uint i = 0; i < 128; i++) {
             if (pMIDIKeyInfo[i].pActiveVoices)
@@ -218,11 +210,17 @@
     }
 
     void EngineChannel::Connect(AudioOutputDevice* pAudioOut) {
-        if (pEngine && pEngine->pAudioOutputDevice != pAudioOut) {
+        if (pEngine) {
+            if (pEngine->pAudioOutputDevice == pAudioOut) return;
             DisconnectAudioOutputDevice();
         }
         pEngine = Engine::AcquireEngine(this, pAudioOut);
         ResetInternal();
+        pEvents   = new RTList<Event>(pEngine->pEventPool);
+        pCCEvents = new RTList<Event>(pEngine->pEventPool);
+        for (uint i = 0; i < Event::destination_count; i++) {
+            pSynthesisEvents[i] = new RTList<Event>(pEngine->pEventPool);
+        }
         for (uint i = 0; i < 128; i++) {
             pMIDIKeyInfo[i].pActiveVoices = new RTList<Voice>(pEngine->pVoicePool);
             pMIDIKeyInfo[i].pEvents       = new RTList<Event>(pEngine->pEventPool);
@@ -236,6 +234,14 @@
     void EngineChannel::DisconnectAudioOutputDevice() {
         if (pEngine) { // if clause to prevent disconnect loops
             ResetInternal();
+            if (pEvents) {
+                delete pEvents;
+                pEvents = NULL;
+            }
+            if (pCCEvents) {
+                delete pCCEvents;
+                pCCEvents = NULL;
+            }
             for (uint i = 0; i < 128; i++) {
                 if (pMIDIKeyInfo[i].pActiveVoices) {
                     delete pMIDIKeyInfo[i].pActiveVoices;
@@ -246,6 +252,12 @@
                     pMIDIKeyInfo[i].pEvents = NULL;
                 }
             }
+            for (uint i = 0; i < Event::destination_count; i++) {
+                if (pSynthesisEvents[i]) {
+                    delete pSynthesisEvents[i];
+                    pSynthesisEvents[i] = NULL;
+                }
+            }
             Engine* oldEngine = pEngine;
             AudioOutputDevice* oldAudioDevice = pEngine->pAudioOutputDevice;
             pEngine = NULL;
@@ -359,6 +371,58 @@
         }
     }
 
+    void EngineChannel::ClearEventLists() {
+        pEvents->clear();
+        pCCEvents->clear();
+        for (uint i = 0; i < Event::destination_count; i++) {
+            pSynthesisEvents[i]->clear();
+        }
+        // empty MIDI key specific event lists
+        {
+            RTList<uint>::Iterator iuiKey = pActiveKeys->first();
+            RTList<uint>::Iterator end    = pActiveKeys->end();
+            for(; iuiKey != end; ++iuiKey) {
+                pMIDIKeyInfo[*iuiKey].pEvents->clear(); // free all events on the key
+            }
+        }
+    }
+
+    /**
+     * Copy all events from the engine channel's input event queue buffer to
+     * the internal event list. This will be done at the beginning of each
+     * audio cycle (that is each RenderAudio() call) to distinguish all
+     * events which have to be processed in the current audio cycle. Each
+     * EngineChannel has it's own input event queue for the common channel
+     * specific events (like NoteOn, NoteOff and ControlChange events).
+     * Beside that, the engine also has a input event queue for global
+     * events (usually SysEx messages).
+     *
+     * @param Samples - number of sample points to be processed in the
+     *                  current audio cycle
+     */
+    void EngineChannel::ImportEvents(uint Samples) {
+        RingBuffer<Event>::NonVolatileReader eventQueueReader = pEventQueue->get_non_volatile_reader();
+        Event* pEvent;
+        while (true) {
+            // get next event from input event queue
+            if (!(pEvent = eventQueueReader.pop())) break;
+            // if younger event reached, ignore that and all subsequent ones for now
+            if (pEvent->FragmentPos() >= Samples) {
+                eventQueueReader--;
+                dmsg(2,("Younger Event, pos=%d ,Samples=%d!\n",pEvent->FragmentPos(),Samples));
+                pEvent->ResetFragmentPos();
+                break;
+            }
+            // copy event to internal event list
+            if (pEvents->poolIsEmpty()) {
+                dmsg(1,("Event pool emtpy!\n"));
+                break;
+            }
+            *pEvents->allocAppend() = *pEvent;
+        }
+        eventQueueReader.free(); // free all copied events from input queue
+    }
+
     float EngineChannel::Volume() {
         return GlobalVolume;
     }