Fixes...

4 files changed, 125 insertions, 375 deletions

diff --git a/muse2/muse/vst_native.cpp b/muse2/muse/vst_native.cpp
index bc058e9c..30f7d207 100644
--- a/muse2/muse/vst_native.cpp
+++ b/muse2/muse/vst_native.cpp
@@ -45,6 +45,10 @@
 #include "xml.h"
 #include "plugin.h"
 #include "popupmenu.h"
+#include "pos.h"
+#include "tempo.h"
+#include "sync.h"
+#include "al/sig.h"
 
 #include "vst_native.h"
 
@@ -66,13 +70,16 @@ extern JackAudioDevice* jackAudio;
 
 VstIntPtr VSTCALLBACK vstNativeHostCallback(AEffect* effect, VstInt32 opcode, VstInt32 index, VstIntPtr value, void* ptr, float opt)
 {
+      // Is this callback for an actual instance? Hand-off to the instance if so.
       VSTPlugin* plugin;
       if(effect && effect->user)
       {
         plugin = (VSTPlugin*)(effect->user);
         return ((VstNativeSynthIF*)plugin)->hostCallback(opcode, index, value, ptr, opt);
       }
-      
+
+      // No instance found. So we are just scanning for plugins...
+    
 #ifdef VST_NATIVE_DEBUG      
       fprintf(stderr, "vstNativeHostCallback eff:%p opcode:%ld\n", effect, opcode);
 #endif      
@@ -387,6 +394,7 @@ static void scanVstNativeLib(QFileInfo& fi)
 
   vendorVersion = plugin->dispatcher(plugin, effGetVendorVersion, 0, 0, NULL, 0);
 
+  // Some (older) plugins don't have any of these strings. We only have the filename to use.
   if(effectName.isEmpty())
     effectName = fi.completeBaseName();
   if(productString.isEmpty())
@@ -723,7 +731,6 @@ VstNativeSynthIF::VstNativeSynthIF(SynthI* s) : SynthIF(s)
 //       controlsOut = 0;
       _audioInBuffers = NULL;
       _audioInSilenceBuf = NULL;
-      //_audioInSilenceBufs = NULL;
       _audioOutBuffers = NULL;
 }
 
@@ -758,16 +765,6 @@ VstNativeSynthIF::~VstNativeSynthIF()
   if(_audioInSilenceBuf)
     free(_audioInSilenceBuf);
     
-//   if(_audioInSilenceBufs)
-//   {
-//     for(unsigned long i = 0; i < _synth->inPorts(); ++i)
-//     {
-//       if(_audioInSilenceBufs[i])
-//         free(_audioInSilenceBufs[i]);
-//     }
-//     delete[] _audioInSilenceBufs;
-//   }
-  
   if(_controls)
     delete[] _controls;
 }
@@ -801,13 +798,10 @@ bool VstNativeSynthIF::init(Synth* s)
       if(inports != 0)
       {
         _audioInBuffers = new float*[inports];
-        //_audioInSilenceBufs = new float*[inports];
         for(unsigned long k = 0; k < inports; ++k)
         {
           posix_memalign((void**)&_audioInBuffers[k], 16, sizeof(float) * MusEGlobal::segmentSize);
           memset(_audioInBuffers[k], 0, sizeof(float) * MusEGlobal::segmentSize);
-          //posix_memalign((void**)&_audioInSilenceBufs[k], 16, sizeof(float) * MusEGlobal::segmentSize);
-          //memset(_audioInSilenceBufs[k], 0, sizeof(float) * MusEGlobal::segmentSize);
           _iUsedIdx.push_back(false); // Start out with all false.
         }
         
@@ -815,7 +809,7 @@ bool VstNativeSynthIF::init(Synth* s)
         memset(_audioInSilenceBuf, 0, sizeof(float) * MusEGlobal::segmentSize);
       }
 
-      int controlPorts = _synth->inControls();
+      unsigned long controlPorts = _synth->inControls();
       if(controlPorts != 0)
         _controls = new Port[controlPorts];
       else
@@ -824,7 +818,7 @@ bool VstNativeSynthIF::init(Synth* s)
       //_synth->midiCtl2PortMap.clear();
       //_synth->port2MidiCtlMap.clear();
 
-      for(unsigned long i = 0; i < _synth->inControls(); ++i)
+      for(unsigned long i = 0; i < controlPorts; ++i)
       {
         _controls[i].idx = i;
         //float val;  // TODO
@@ -852,14 +846,14 @@ bool VstNativeSynthIF::init(Synth* s)
         {
           cl = new CtrlList(id);
           cll->add(cl);
-          //cl->setCurVal(controls[cip].val);
-          cl->setCurVal(_plugin->getParameter(_plugin, i));
+          cl->setCurVal(_controls[i].val);
+          //cl->setCurVal(_plugin->getParameter(_plugin, i));
         }
         else
         {
           cl = icl->second;
-          ///controls[cip].val = cl->curVal();
-          //setParam(i, cl->curVal());
+          _controls[i].val = cl->curVal();
+          
 #ifndef VST_VESTIGE_SUPPORT
           if(dispatch(effCanBeAutomated, i, 0, NULL, 0.0f) == 1)
           {
@@ -869,14 +863,15 @@ bool VstNativeSynthIF::init(Synth* s)
               _plugin->setParameter(_plugin, i, v);
 #ifndef VST_VESTIGE_SUPPORT
           }
-#endif
 
-#ifdef VST_NATIVE_DEBUG
+  #ifdef VST_NATIVE_DEBUG
           else  
             fprintf(stderr, "VstNativeSynthIF::init %s parameter:%lu cannot be automated\n", name().toLatin1().constData(), i);
-#endif
+  #endif
 
+#endif
         }
+        
         cl->setRange(min, max);
         cl->setName(QString(param_name));
         //cl->setValueType(ladspaCtrlValueType(ld, k));
@@ -910,12 +905,11 @@ bool VstNativeSynthIF::resizeEditor(int w, int h)
 
 VstIntPtr VstNativeSynthIF::hostCallback(VstInt32 opcode, VstInt32 index, VstIntPtr value, void* ptr, float opt)
       {
-      //static VstTimeInfo _timeInfo;
-      //jack_position_t jack_pos;
-      //jack_transport_state_t tstate;
+      static VstTimeInfo _timeInfo;
 
 #ifdef VST_NATIVE_DEBUG
-      fprintf(stderr, "VstNativeSynthIF::hostCallback %s opcode:%ld\n", name().toLatin1().constData(), opcode);
+      if(opcode != audioMasterGetTime)
+        fprintf(stderr, "VstNativeSynthIF::hostCallback %s opcode:%ld\n", name().toLatin1().constData(), opcode);
 #endif
 
       switch (opcode) {
@@ -943,42 +937,69 @@ VstIntPtr VstNativeSynthIF::hostCallback(VstInt32 opcode, VstInt32 index, VstInt
                   return 0;
 
             case audioMasterGetTime:
+            {
                   // returns const VstTimeInfo* (or 0 if not supported)
                   // <value> should contain a mask indicating which fields are required
                   // (see valid masks above), as some items may require extensive
                   // conversions
 
-// FIXME: TODO: Change this to MusE tempo and sig, and even if Jack is used,
-//               the jackAudio pointer may be 0. Jack may not be running and dummy used instead.
-#if 1
-                  return 0;
-#else
                   memset(&_timeInfo, 0, sizeof(_timeInfo));
 
-                  if (_plugin) {
-                        tstate = jackAudio->transportQuery(&jack_pos);
-
-                        _timeInfo.samplePos  = jack_pos.frame;
-                        _timeInfo.sampleRate = jack_pos.frame_rate;
-                        _timeInfo.flags = 0;
-
-                        if ((value & (kVstBarsValid|kVstTempoValid)) && (jack_pos.valid & JackPositionBBT)) {
-                              _timeInfo.tempo = jack_pos.beats_per_minute;
-                              _timeInfo.timeSigNumerator = (long) floor (jack_pos.beats_per_bar);
-                              _timeInfo.timeSigDenominator = (long) floor (jack_pos.beat_type);
-                              _timeInfo.flags |= (kVstBarsValid|kVstTempoValid);
-                              }
-                        if (tstate == JackTransportRolling) {
-                              _timeInfo.flags |= kVstTransportPlaying;
-                              }
-                        }
-                  else {
-                        _timeInfo.samplePos  = 0;
-                        _timeInfo.sampleRate = MusEGlobal::sampleRate;
-                        }
-                  return (long)&_timeInfo;
+                  unsigned int curr_frame = MusEGlobal::audio->pos().frame();
+                  _timeInfo.samplePos = (double)curr_frame;
+                  _timeInfo.sampleRate = (double)MusEGlobal::sampleRate;
+                  _timeInfo.flags = 0;
+
+                  if(value & (kVstBarsValid | kVstTimeSigValid | kVstTempoValid | kVstPpqPosValid))
+                  {
+                    Pos p(MusEGlobal::extSyncFlag.value() ? MusEGlobal::audio->tickPos() : curr_frame, MusEGlobal::extSyncFlag.value() ? true : false);
+                    // Can't use song pos - it is only updated every (slow) GUI heartbeat !
+                    //Pos p(MusEGlobal::extSyncFlag.value() ? MusEGlobal::song->cpos() : pos->frame, MusEGlobal::extSyncFlag.value() ? true : false);
+
+                    // TODO
+                    int p_bar, p_beat, p_tick;
+                    p.mbt(&p_bar, &p_beat, &p_tick);
+                    
+#ifndef VST_VESTIGE_SUPPORT
+                    _timeInfo.barStartPos = Pos(p_bar, 0, 0).tick();
+                    _timeInfo.ppqPos = MusEGlobal::audio->tickPos();
+#else
+                    *((double*)&_timeInfo.empty2[0]) = (double)Pos(p_bar, 0, 0).tick() / 120.0;
+                    *((double*)&_timeInfo.empty1[8]) = (double)MusEGlobal::audio->tickPos() / 120.0;  
+#endif
+                    //pos->bar++;
+                    //pos->beat++;
+
+                    int z, n;
+                    AL::sigmap.timesig(p.tick(), z, n);
+
+#ifndef VST_VESTIGE_SUPPORT
+                    _timeInfo.timeSigNumerator = (long)z;
+                    _timeInfo.timeSigDenominator = (long)n;
+#else
+                    _timeInfo.timeSigNumerator = z;
+                    _timeInfo.timeSigDenominator = n;
+#endif
+
+                    // TODO
+                    ////pos->ticks_per_beat = 24;
+                    //pos->ticks_per_beat = MusEGlobal::config.division;
+
+                    double tempo = MusEGlobal::tempomap.tempo(p.tick());
+                    _timeInfo.tempo = (60000000.0 / tempo) * double(MusEGlobal::tempomap.globalTempo())/100.0;
+                    _timeInfo.flags |= (kVstBarsValid | kVstTimeSigValid | kVstTempoValid | kVstPpqPosValid);
+
+#ifdef VST_NATIVE_DEBUG
+                    fprintf(stderr, "VstNativeSynthIF::hostCallback master time: sample pos:%f samplerate:%f sig num:%ld den:%ld tempo:%f\n",
+                      _timeInfo.samplePos, _timeInfo.sampleRate, _timeInfo.timeSigNumerator, _timeInfo.timeSigDenominator, _timeInfo.tempo);
 #endif
+                  }
 
+                  if(MusEGlobal::audio->isPlaying())
+                    _timeInfo.flags |= (kVstTransportPlaying | kVstTransportChanged);
+                  return (long)&_timeInfo;
+            }
+            
             case audioMasterProcessEvents:
                   // VstEvents* in <ptr>
                   return 0;  // TODO:
@@ -1058,9 +1079,9 @@ VstIntPtr VstNativeSynthIF::hostCallback(VstInt32 opcode, VstInt32 index, VstInt
             case audioMasterCanDo:
                   // string in ptr, see below
                   if(!strcmp((char*)ptr, "sendVstEvents") ||          
-                     // !strcmp((char*)ptr, "receiveVstMidiEvent") ||    // TODO
+                     !strcmp((char*)ptr, "receiveVstMidiEvent") ||   
                      !strcmp((char*)ptr, "sendVstMidiEvent") ||
-                     // !strcmp((char*)ptr, "sendVstTimeInfo") ||        // TODO 
+                     !strcmp((char*)ptr, "sendVstTimeInfo") ||        
                      !strcmp((char*)ptr, "sizeWindow") ||
                      !strcmp((char*)ptr, "supplyIdle"))               
                     return 1;
@@ -1465,10 +1486,15 @@ void VstNativeSynthIF::doSelectProgram(int bankH, int bankL, int prog)
   // Need to update the automation value, otherwise it overwrites later with the last automation value.
   if(id() != -1)
   {
-    for(unsigned long k = 0; k < _synth->inControls(); ++k)
+    const unsigned long sic = _synth->inControls();
+    for(unsigned long k = 0; k < sic; ++k)
     {
       // We're in the audio thread context: no need to send a message, just modify directly.
-      synti->setPluginCtrlVal(genACnum(id(), k), _plugin->getParameter(_plugin, k));
+      //synti->setPluginCtrlVal(genACnum(id(), k), _controls[k].val);
+      //synti->setPluginCtrlVal(genACnum(id(), k), _plugin->getParameter(_plugin, k));
+      const float v = _plugin->getParameter(_plugin, k);
+      _controls[k].val = v;
+      synti->setPluginCtrlVal(genACnum(id(), k), v);
     }
   }
 
@@ -2166,9 +2192,9 @@ iMPEvent VstNativeSynthIF::getData(MidiPort* /*mp*/, MPEventList* el, iMPEvent s
   const bool usefixedrate = false;  
   unsigned long fixedsize = nframes; 
 
-  // For now, the fixed size is clamped to the MusEGlobal::audio buffer size.
+  // For now, the fixed size is clamped to the audio buffer size.
   // TODO: We could later add slower processing over several cycles -
-  //  so that users can select a small MusEGlobal::audio period but a larger control period.
+  //  so that users can select a small audio period but a larger control period.
   if(fixedsize > nframes)
     fixedsize = nframes;
 
@@ -2278,26 +2304,26 @@ iMPEvent VstNativeSynthIF::getData(MidiPort* /*mp*/, MPEventList* el, iMPEvent s
       const unsigned long in_ctrls = _synth->inControls();
       for(unsigned long k = 0; k < in_ctrls; ++k)
       {
-        //_controls[k].val = track->controller()->value(genACnum(id(), k), frame,
-        //                        no_auto || !_controls[k].enCtrl || !_controls[k].en2Ctrl,
-        //                        &nextFrame);
-#ifndef VST_VESTIGE_SUPPORT
-        if(dispatch(effCanBeAutomated, k, 0, NULL, 0.0f) == 1)
-        {
-#endif          
-          double v = track->controller()->value(genACnum(id(), k), frame,
+        const float v = track->controller()->value(genACnum(id(), k), frame,
                                    no_auto || !_controls[k].enCtrl || !_controls[k].en2Ctrl,
                                    &nextFrame);
-          if(v != _plugin->getParameter(_plugin, k))
-            _plugin->setParameter(_plugin, k, v);
+        if(_controls[k].val != v)
+        {
+          _controls[k].val = v;
 #ifndef VST_VESTIGE_SUPPORT
-        }
+          if(dispatch(effCanBeAutomated, k, 0, NULL, 0.0f) == 1)
+          {
 #endif
-
-#ifdef VST_NATIVE_DEBUG
-        else
-          fprintf(stderr, "VstNativeSynthIF::getData %s parameter:%lu cannot be automated\n", name().toLatin1().constData(), k);
+            if(_plugin->getParameter(_plugin, k) != v)
+              _plugin->setParameter(_plugin, k, v);
+#ifndef VST_VESTIGE_SUPPORT
+          }
+  #ifdef VST_NATIVE_DEBUG
+          else
+            fprintf(stderr, "VstNativeSynthIF::getData %s parameter:%lu cannot be automated\n", name().toLatin1().constData(), k);
+  #endif
 #endif
+        }
             
 #ifdef VST_NATIVE_DEBUG_PROCESS
         fprintf(stderr, "VstNativeSynthIF::getData k:%lu sample:%lu frame:%lu nextFrame:%d nsamp:%lu \n", k, sample, frame, nextFrame, nsamp);
@@ -2366,26 +2392,27 @@ iMPEvent VstNativeSynthIF::getData(MidiPort* /*mp*/, MPEventList* el, iMPEvent s
       found = true;
       frame = evframe;
       index = v.idx;
-      // Set the ladspa control port value.
-      //controls[v.idx].val = v.value;
+
+      //if(_controls[v.idx].val != v.value)  // Mm nah, force it always. REMOVE Tim.
+      //{
+        _controls[v.idx].val = v.value;
 #ifndef VST_VESTIGE_SUPPORT
-      if(dispatch(effCanBeAutomated, v.idx, 0, NULL, 0.0f) == 1)
-      {
+        if(dispatch(effCanBeAutomated, v.idx, 0, NULL, 0.0f) == 1)
+        {
 #endif        
-        if(v.value != _plugin->getParameter(_plugin, v.idx))
-          _plugin->setParameter(_plugin, v.idx, v.value);
+          if(v.value != _plugin->getParameter(_plugin, v.idx))
+            _plugin->setParameter(_plugin, v.idx, v.value);
 #ifndef VST_VESTIGE_SUPPORT
-      }
-#endif
-
-#ifdef VST_NATIVE_DEBUG
-      else
-        fprintf(stderr, "VstNativeSynthIF::getData %s parameter:%lu cannot be automated\n", name().toLatin1().constData(), v.idx);
+        }
+  #ifdef VST_NATIVE_DEBUG
+        else
+          fprintf(stderr, "VstNativeSynthIF::getData %s parameter:%lu cannot be automated\n", name().toLatin1().constData(), v.idx);
+  #endif
 #endif
-
-      // Need to update the automation value, otherwise it overwrites later with the last automation value.
-      if(id() != -1)
-        synti->setPluginCtrlVal(genACnum(id(), v.idx), v.value);
+        // Need to update the automation value, otherwise it overwrites later with the last automation value.
+        if(id() != -1)
+          synti->setPluginCtrlVal(genACnum(id(), v.idx), v.value);
+      //}
     }
 
     if(found && !usefixedrate)  // If a control FIFO item was found, takes priority over automation controller stream.
@@ -2602,14 +2629,16 @@ void VstNativeSynthIF::enableAllControllers(bool v)
 {
   if(!_synth)
     return;
-  for(unsigned long i = 0; i < _synth->inControls(); ++i)
+  const unsigned long sic = _synth->inControls();
+  for(unsigned long i = 0; i < sic; ++i)
     _controls[i].enCtrl = v;
 }
 void VstNativeSynthIF::enable2AllControllers(bool v)
 {
   if(!_synth)
     return;
-  for(unsigned long i = 0; i < _synth->inControls(); ++i)
+  const unsigned long sic = _synth->inControls();
+  for(unsigned long i = 0; i < sic; ++i)
     _controls[i].en2Ctrl = v;
 }
 void VstNativeSynthIF::updateControllers() { }
diff --git a/muse2/muse/vst_native.h b/muse2/muse/vst_native.h
index c97cca7c..5b8f1328 100644
--- a/muse2/muse/vst_native.h
+++ b/muse2/muse/vst_native.h
@@ -163,7 +163,6 @@ class VstNativeSynthIF : public SynthIF
       float** _audioInBuffers;
       std::vector<unsigned long> _iUsedIdx;  // During process, tells whether an audio input port was used by any input routes.
       float*  _audioInSilenceBuf;            // Just all zeros all the time, so we don't have to clear for silence.
-      //float**  _audioInSilenceBufs;          // Just all zeros all the time, so we don't have to clear for silence.
 
       std::vector<VST_Program> programs;
       void queryPrograms();
diff --git a/muse2/muse/widgets/vst_native_editor.cpp b/muse2/muse/widgets/vst_native_editor.cpp
index cf044d2a..b194529d 100644
--- a/muse2/muse/widgets/vst_native_editor.cpp
+++ b/muse2/muse/widgets/vst_native_editor.cpp
@@ -136,7 +136,8 @@ void VstNativeEditor::open(MusECore::VstNativeSynthIF* sif)
                   QWidget::setFixedSize(w, h);
   }
 
-  int rv = _sif->dispatch(effEditOpen, 0, value, ptr, 0.0f);
+  _sif->dispatch(effEditOpen, 0, value, ptr, 0.0f);
+  //int rv = _sif->dispatch(effEditOpen, 0, value, ptr, 0.0f);
   //fprintf(stderr, "VstNativeEditor::open effEditOpen returned:%d effEditGetRect rect l:%d r:%d t:%d b:%d\n", rv, pRect->left, pRect->right, pRect->top, pRect->bottom); // REMOVE Tim.
   
 #if defined(Q_WS_X11)
diff --git a/muse2/vestige/aeffectx.h b/muse2/vestige/aeffectx.h
deleted file mode 100644
index 5238df1c..00000000
--- a/muse2/vestige/aeffectx.h
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * aeffectx.h - simple header to allow VeSTige compilation and eventually work
- *
- * Copyright (c) 2006 Javier Serrano Polo <jasp00/at/users.sourceforge.net>
- * 
- * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program (see COPYING); if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301 USA.
- *
- */
-#include <stdint.h>
-#ifndef _AEFFECTX_H
-#define _AEFFECTX_H
-
-#define CCONST(a, b, c, d)( ( ( (int) a ) << 24 ) |		\
-				( ( (int) b ) << 16 ) |		\
-				( ( (int) c ) << 8 ) |		\
-				( ( (int) d ) << 0 ) )
-
-#define audioMasterAutomate 0
-#define audioMasterVersion 1
-#define audioMasterCurrentId 2
-#define audioMasterIdle 3
-#define audioMasterPinConnected 4
-// unsupported? 5
-#define audioMasterWantMidi 6
-#define audioMasterGetTime 7
-#define audioMasterProcessEvents 8
-#define audioMasterSetTime 9
-#define audioMasterTempoAt 10
-#define audioMasterGetNumAutomatableParameters 11
-#define audioMasterGetParameterQuantization 12
-#define audioMasterIOChanged 13
-#define audioMasterNeedIdle 14
-#define audioMasterSizeWindow 15
-#define audioMasterGetSampleRate 16
-#define audioMasterGetBlockSize 17
-#define audioMasterGetInputLatency 18
-#define audioMasterGetOutputLatency 19
-#define audioMasterGetPreviousPlug 20
-#define audioMasterGetNextPlug 21
-#define audioMasterWillReplaceOrAccumulate 22
-#define audioMasterGetCurrentProcessLevel 23
-#define audioMasterGetAutomationState 24
-#define audioMasterOfflineStart 25
-#define audioMasterOfflineRead 26
-#define audioMasterOfflineWrite 27
-#define audioMasterOfflineGetCurrentPass 28
-#define audioMasterOfflineGetCurrentMetaPass 29
-#define audioMasterSetOutputSampleRate 30
-// unsupported? 31
-#define audioMasterGetSpeakerArrangement 31 // deprecated in 2.4?
-#define audioMasterGetVendorString 32
-#define audioMasterGetProductString 33
-#define audioMasterGetVendorVersion 34
-#define audioMasterVendorSpecific 35
-#define audioMasterSetIcon 36
-#define audioMasterCanDo 37
-#define audioMasterGetLanguage 38
-#define audioMasterOpenWindow 39
-#define audioMasterCloseWindow 40
-#define audioMasterGetDirectory 41
-#define audioMasterUpdateDisplay 42
-#define audioMasterBeginEdit 43
-#define audioMasterEndEdit 44
-#define audioMasterOpenFileSelector 45
-#define audioMasterCloseFileSelector 46 // currently unused
-#define audioMasterEditFile 47 // currently unused
-#define audioMasterGetChunkFile 48 // currently unused
-#define audioMasterGetInputSpeakerArrangement 49 // currently unused
-
-#define effFlagsHasEditor 1
-#define effFlagsCanReplacing (1 << 4) // very likely
-#define effFlagsIsSynth (1 << 8) // currently unused
-
-#define effOpen 0
-#define effClose 1 // currently unused
-#define effSetProgram 2 // currently unused
-#define effGetProgram 3 // currently unused
-#define effGetProgramName 5 // currently unused
-#define effGetParamName 8 // currently unused
-#define effSetSampleRate 10
-#define effSetBlockSize 11
-#define effMainsChanged 12
-#define effEditGetRect 13
-#define effEditOpen 14
-#define effEditClose 15
-#define effEditIdle 19
-#define effEditTop 20
-#define effProcessEvents 25
-#define effGetEffectName 45
-#define effGetVendorString 47
-#define effGetProductString 48
-#define effGetVendorVersion 49
-#define effCanDo 51 // currently unused
-/* from http://asseca.com/vst-24-specs/efGetParameterProperties.html */
-#define effGetParameterProperties 56
-#define effGetVstVersion 58 // currently unused
-
-#define kEffectMagic (CCONST( 'V', 's', 't', 'P' ))
-#define kVstLangEnglish 1
-#define kVstMidiType 1
-#define kVstTempoValid (1 << 10)
-#define kVstTransportPlaying (1 << 1)
-
-
-struct RemoteVstPlugin;
-
-#define kVstNanosValid (1 << 8)
-#define kVstPpqPosValid (1 << 9)
-#define kVstTempoValid (1 << 10)
-#define kVstBarsValid (1 << 11)
-#define kVstCyclePosValid (1 << 12)
-#define kVstTimeSigValid (1 << 13)
-#define kVstSmpteValid (1 << 14)
-#define kVstClockValid (1 << 15)
-
-struct _VstMidiEvent
-{
-	// 00
-	int type;
-	// 04
-	int byteSize;
-	// 08
-	int deltaFrames;
-	// 0c?
-	int flags;
-	// 10?
-	int noteLength;
-	// 14?
-	int noteOffset;
-	// 18
-	char midiData[4];
-	// 1c?
-	char detune;
-	// 1d?
-	char noteOffVelocity;
-	// 1e?
-	char reserved1;
-	// 1f?
-	char reserved2;
-};
-
-typedef struct _VstMidiEvent VstMidiEvent;
-
-
-struct _VstEvent
-{
-	char dump[sizeof (VstMidiEvent)];
-
-};
-
-typedef struct _VstEvent VstEvent;
-
-struct _VstEvents
-{
-	// 00
-	int numEvents;
-	// 04
-	void *reserved;
-	// 08
-	VstEvent * events[];
-};
-
-typedef struct _VstEvents VstEvents;
-
-/* this struct taken from http://asseca.com/vst-24-specs/efGetParameterProperties.html */
-struct _VstParameterProperties
-{
-	float stepFloat;
-	float smallStepFloat;
-	float largeStepFloat;
-	char label[64];
-	int32_t flags;
-	int32_t minInteger;
-	int32_t maxInteger;
-	int32_t stepInteger;
-	int32_t largeStepInteger;
-	char shortLabel[8];
-};
-
-typedef struct _VstParameterProperties VstParameterProperties;
-
-/* this enum taken from http://asseca.com/vst-24-specs/efGetParameterProperties.html */
-enum VstParameterFlags
-{
-	kVstParameterIsSwitch                = 1 << 0,  /* parameter is a switch (on/off) */
-	kVstParameterUsesIntegerMinMax       = 1 << 1,  /* minInteger, maxInteger valid */
-	kVstParameterUsesFloatStep           = 1 << 2,  /* stepFloat, smallStepFloat, largeStepFloat valid */
-	kVstParameterUsesIntStep             = 1 << 3,  /* stepInteger, largeStepInteger valid */
-	kVstParameterSupportsDisplayIndex    = 1 << 4,  /* displayIndex valid */
-	kVstParameterSupportsDisplayCategory = 1 << 5,  /* category, etc. valid */
-	kVstParameterCanRamp                 = 1 << 6   /* set if parameter value can ramp up/down */
-};
-
-struct _AEffect
-{
-	// Never use virtual functions!!!
-	// 00-03
-	int magic;
-	// dispatcher 04-07
-	intptr_t (* dispatcher) (struct _AEffect *, int, int, intptr_t, void *, float);
-	// process, quite sure 08-0b
-	void (* process) (struct _AEffect *, float **, float **, int);
-	// setParameter 0c-0f
-	void (* setParameter) (struct _AEffect *, int, float);
-	// getParameter 10-13
-	float (* getParameter) (struct _AEffect *, int);
-	// programs 14-17
-	int numPrograms;
-	// Params 18-1b
-	int numParams;
-	// Input 1c-1f
-	int numInputs;
-	// Output 20-23
-	int numOutputs;
-	// flags 24-27
-	int flags;
-	// Fill somewhere 28-2b
-	void *ptr1;
-	void *ptr2;
-	// Zeroes 2c-2f 30-33 34-37 38-3b
-	char empty3[4 + 4 + 4];
-	// 1.0f 3c-3f
-	float unkown_float;
-	// An object? pointer 40-43
-	void *ptr3;
-	// Zeroes 44-47
-	void *user;
-	// Id 48-4b
-	int32_t uniqueID;
-	// Don't know 4c-4f
-	char unknown1[4];
-	// processReplacing 50-53
-	void (* processReplacing) (struct _AEffect *, float **, float **, int);
-};
-
-typedef struct _AEffect AEffect;
-
-struct _VstTimeInfo
-{
-	// 00
-	double samplePos;
-	// 08
-	double sampleRate;
-	// unconfirmed 10 18
-	char empty1[8 + 8];
-	// 20?
-	double tempo;
-	// unconfirmed 28 30 38
-	char empty2[8 + 8 + 8];
-	// 40?
-	int timeSigNumerator;
-	// 44?
-	int timeSigDenominator;
-	// unconfirmed 48 4c 50
-	char empty3[4 + 4 + 4];
-	// 54
-	int flags;
-};
-
-typedef struct _VstTimeInfo VstTimeInfo;
-
-typedef intptr_t (* audioMasterCallback) (AEffect *, int32_t, int32_t, intptr_t, void *, float);
-
-#endif