--- linuxsampler/trunk/src/Sampler.cpp	2004/07/18 00:29:39	209
+++ linuxsampler/trunk/src/Sampler.cpp	2004/08/20 17:25:19	221
@@ -39,13 +39,13 @@
         pMidiInputDevice   = NULL;
         pAudioOutputDevice = NULL;
         midiPort           = 0;
-        midiChannel        = MidiInputDevice::MidiInputPort::midi_chan_all;
+        midiChannel        = MidiInputPort::midi_chan_all;
         iIndex             = -1;
     }
 
     SamplerChannel::~SamplerChannel() {
         if (pEngine) {
-            MidiInputDevice::MidiInputPort *pMidiInputPort = GetMidiInputDevicePort(this->midiPort);
+            MidiInputPort* pMidiInputPort = GetMidiInputDevicePort(this->midiPort);
             if (pMidiInputPort) pMidiInputPort->Disconnect(pEngine);
             if (pAudioOutputDevice) pAudioOutputDevice->Disconnect(pEngine);
             delete pEngine;
@@ -66,7 +66,7 @@
         }
 
         // dereference midi input port.
-        MidiInputDevice::MidiInputPort *pMidiInputPort = GetMidiInputDevicePort(this->midiPort);
+        MidiInputPort* pMidiInputPort = GetMidiInputDevicePort(this->midiPort);
         // disconnect old engine
         if (pEngine) {
             if (pMidiInputPort) pMidiInputPort->Disconnect(pEngine);
@@ -97,37 +97,37 @@
        SetMidiInput(pMidiInputDevice, MidiPort, this->midiChannel);
     }
 
-    void SamplerChannel::SetMidiInputChannel(MidiInputDevice::MidiInputPort::midi_chan_t MidiChannel) {
+    void SamplerChannel::SetMidiInputChannel(MidiInputPort::midi_chan_t MidiChannel) {
        SetMidiInput(pMidiInputDevice, this->midiPort, MidiChannel);
     }
 
-    void SamplerChannel::SetMidiInput(MidiInputDevice* pDevice, int MidiPort, MidiInputDevice::MidiInputPort::midi_chan_t MidiChannel) {
+    void SamplerChannel::SetMidiInput(MidiInputDevice* pDevice, int iMidiPort, MidiInputPort::midi_chan_t MidiChannel) {
         // dereference old midi input port.
-        MidiInputDevice::MidiInputPort *pMidiInputPort = GetMidiInputDevicePort(this->midiPort);
+        MidiInputPort* pMidiInputPort = GetMidiInputDevicePort(this->midiPort);
         // disconnect old device port
         if (pMidiInputPort && pEngine) pMidiInputPort->Disconnect(pEngine);
         // new device, port and channel
         pMidiInputDevice = pDevice;
-        this->midiPort = MidiPort;
+        this->midiPort = iMidiPort;
         this->midiChannel = MidiChannel;
         // connect new device port
         pMidiInputPort = GetMidiInputDevicePort(this->midiPort);
         if (pMidiInputPort && pEngine) pMidiInputPort->Connect(pEngine, MidiChannel);
         // Ooops.
         if (pMidiInputPort == NULL)
-            throw LinuxSamplerException("There is no MIDI input port with index " + ToString(MidiPort) + ".");
+            throw LinuxSamplerException("There is no MIDI input port with index " + ToString(iMidiPort) + ".");
     }
 
     Engine* SamplerChannel::GetEngine() {
         return pEngine;
     }
 
-    MidiInputDevice::MidiInputPort::midi_chan_t SamplerChannel::GetMidiInputChannel() {
+    MidiInputPort::midi_chan_t SamplerChannel::GetMidiInputChannel() {
         return this->midiChannel;
     }
 
     int SamplerChannel::GetMidiInputPort() {
-        MidiInputDevice::MidiInputPort *pMidiInputPort = GetMidiInputDevicePort(this->midiPort);
+        MidiInputPort* pMidiInputPort = GetMidiInputDevicePort(this->midiPort);
         return (pMidiInputPort ? (int) pMidiInputPort->GetPortNumber() : -1);
     }
 
@@ -153,13 +153,15 @@
         throw LinuxSamplerException("Internal error: SamplerChannel index not found");
     }
 
-    MidiInputDevice::MidiInputPort* SamplerChannel::GetMidiInputDevicePort(int MidiPort) {
-        MidiInputDevice::MidiInputPort *pMidiInputPort = NULL;
+    MidiInputPort* SamplerChannel::GetMidiInputDevicePort(int iMidiPort) {
+        MidiInputPort* pMidiInputPort = NULL;
         if (pMidiInputDevice)
-            pMidiInputPort = pMidiInputDevice->GetPort(MidiPort);
+            pMidiInputPort = pMidiInputDevice->GetPort(iMidiPort);
         return pMidiInputPort;
     }
 
+
+
     // ******************************************************************
     // * Sampler
 
@@ -167,31 +169,7 @@
     }
 
     Sampler::~Sampler() {
-        // delete sampler channels
-        {
-            SamplerChannelMap::iterator iter = mSamplerChannels.begin();
-            for (; iter != mSamplerChannels.end(); iter++) delete iter->second;
-        }
-
-        // delete midi input devices
-        {
-            MidiInputDeviceMap::iterator iter = mMidiInputDevices.begin();
-            for (; iter != mMidiInputDevices.end(); iter++) {
-                MidiInputDevice* pDevice = iter->second;
-                pDevice->StopListen();
-                delete pDevice;
-            }
-        }
-
-        // delete audio output devices
-        {
-            AudioOutputDeviceMap::iterator iter = mAudioOutputDevices.begin();
-            for (; iter != mAudioOutputDevices.end(); iter++) {
-                AudioOutputDevice* pDevice = iter->second;
-                pDevice->Stop();
-                delete pDevice;
-            }
-        }
+        Reset();
     }
 
     uint Sampler::SamplerChannels() {
@@ -343,4 +321,42 @@
         return pDevice;
     }
 
+    void Sampler::Reset() {
+        // delete sampler channels
+        try {
+            SamplerChannelMap::iterator iter = mSamplerChannels.begin();
+            for (; iter != mSamplerChannels.end(); iter++) {
+                RemoveSamplerChannel(iter->second);
+            }
+        }
+        catch(...) {
+            std::cerr << "Sampler::Reset(): Exception occured while trying to delete all sampler channels, exiting.\n" << std::flush;
+            exit(EXIT_FAILURE);
+        }
+
+        // delete midi input devices
+        try {
+            MidiInputDeviceMap::iterator iter = mMidiInputDevices.begin();
+            for (; iter != mMidiInputDevices.end(); iter++) {
+                DestroyMidiInputDevice(iter->second);
+            }
+        }
+        catch(...) {
+            std::cerr << "Sampler::Reset(): Exception occured while trying to delete all MIDI input devices, exiting.\n" << std::flush;
+            exit(EXIT_FAILURE);
+        }
+
+        // delete audio output devices
+        try {
+            AudioOutputDeviceMap::iterator iter = mAudioOutputDevices.begin();
+            for (; iter != mAudioOutputDevices.end(); iter++) {
+                DestroyAudioOutputDevice(iter->second);
+            }
+        }
+        catch(...) {
+            std::cerr << "Sampler::Reset(): Exception occured while trying to delete all audio output devices, exiting.\n" << std::flush;
+            exit(EXIT_FAILURE);
+        }
+    }
+
 } // namespace LinuxSampler