--- linuxsampler/trunk/src/engines/gig/EngineChannel.cpp	2005/06/17 19:49:30	660
+++ linuxsampler/trunk/src/engines/gig/EngineChannel.cpp	2005/09/21 19:05:41	776
@@ -30,7 +30,6 @@
         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>(CONFIG_MAX_EVENTS_PER_FRAGMENT, 0);
         pActiveKeys  = new Pool<uint>(128);
         for (uint i = 0; i < 128; i++) {
@@ -42,13 +41,13 @@
             pMIDIKeyInfo[i].VoiceTheftsQueued = 0;
             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;
         AudioDeviceChannelRight = -1;
+        pMidiInputPort = NULL;
+        midiChannel = midi_chan_all;
+        ResetControllers();
     }
 
     EngineChannel::~EngineChannel() {
@@ -65,31 +64,38 @@
      * check if some engine channel parameter has changed since the last
      * StatusChanged() call.
      *
+     * This method can also be used to mark the engine channel as changed
+     * from outside, e.g. by a MIDI input device. The optional argument
+     * \a nNewStatus can be used for this.
+     *
      * TODO: This "poll method" is just a lazy solution and might be
      *       replaced in future.
-     *
+     * @param bNewStatus - (optional, default: false) sets the new status flag
      * @returns true if engine channel status has changed since last
      *          StatusChanged() call
      */
-    bool EngineChannel::StatusChanged() {
+    bool EngineChannel::StatusChanged(bool bNewStatus) {
         bool b = bStatusChanged;
-        bStatusChanged = false;
+        bStatusChanged = bNewStatus;
         return b;
     }
 
+    void EngineChannel::Reset() {
+        if (pEngine) pEngine->DisableAndLock();
+        ResetInternal();
+        ResetControllers();
+        if (pEngine) {
+            pEngine->Enable();
+            pEngine->Reset();
+        }
+    }
+
     /**
      * This method is not thread safe!
      */
     void EngineChannel::ResetInternal() {
-        Pitch               = 0;
-        SustainPedal        = false;
-        GlobalVolume        = 1.0;
-        GlobalPanLeft       = 1.0f;
-        GlobalPanRight      = 1.0f;
         CurrentKeyDimension = 0;
 
-        ResetControllers();
-
         // reset key info
         for (uint i = 0; i < 128; i++) {
             if (pMIDIKeyInfo[i].pActiveVoices)
@@ -251,11 +257,7 @@
         }
         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);
-        }
+        pEvents = 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);
@@ -273,10 +275,6 @@
                 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;
@@ -287,12 +285,6 @@
                     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;
@@ -332,6 +324,28 @@
         }
     }
 
+    void EngineChannel::Connect(MidiInputPort* pMidiPort, midi_chan_t MidiChannel) {
+        if (!pMidiPort || pMidiPort == this->pMidiInputPort) return;
+        DisconnectMidiInputPort();
+        this->pMidiInputPort = pMidiPort;
+        this->midiChannel    = MidiChannel;
+        pMidiPort->Connect(this, MidiChannel);
+    }
+
+    void EngineChannel::DisconnectMidiInputPort() {
+        MidiInputPort* pOldPort = this->pMidiInputPort;
+        this->pMidiInputPort = NULL;
+        if (pOldPort) pOldPort->Disconnect(this);
+    }
+
+    MidiInputPort* EngineChannel::GetMidiInputPort() {
+        return pMidiInputPort;
+    }
+
+    midi_chan_t EngineChannel::MidiChannel() {
+        return midiChannel;
+    }
+
     /**
      *  Will be called by the MIDIIn Thread to let the audio thread trigger a new
      *  voice for the given key.
@@ -408,10 +422,6 @@
 
     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();
@@ -423,6 +433,12 @@
     }
 
     void EngineChannel::ResetControllers() {
+        Pitch          = 0;
+        SustainPedal   = false;
+        SostenutoPedal = false;
+        GlobalVolume   = 1.0;
+        GlobalPanLeft  = 1.0f;
+        GlobalPanRight = 1.0f;
         // set all MIDI controller values to zero
         memset(ControllerTable, 0x00, 128);
     }