Fix assertion failure on dropping a track out of rec-arm.

[ardour.git] / libs / ardour / ardour / vst_plugin.h

diff --git a/libs/ardour/ardour/vst_plugin.h b/libs/ardour/ardour/vst_plugin.h
index 7541740cf8ae3829fc8bd393f345b961650616f9..753d94294f4ba55a968a6760c2bf4641dd18cf82 100644 (file)
--- a/libs/ardour/ardour/vst_plugin.h
+++ b/libs/ardour/ardour/vst_plugin.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2004 Paul Davis 
+    Copyright (C) 2004 Paul Davis
 
     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
@@ -27,16 +27,10 @@
 #include <string>
 #include <dlfcn.h>
 
-#include <sigc++/signal.h>
-#include "pbd/stateful.h" 
+#include "pbd/stateful.h"
 #include <jack/types.h>
 #include "ardour/plugin.h"
 
-using std::string;
-using std::vector;
-using std::list;
-using std::map;
-
 struct _FSTHandle;
 struct _FST;
 typedef struct _FSTHandle FSTHandle;
@@ -55,7 +49,7 @@ class VSTPlugin : public ARDOUR::Plugin
        ~VSTPlugin ();
 
        /* Plugin interface */
-       
+
        std::string unique_id() const;
        const char * label() const;
        const char * name() const;
@@ -71,9 +65,13 @@ class VSTPlugin : public ARDOUR::Plugin
        void activate ();
        void deactivate ();
        void set_block_size (nframes_t nframes);
-       int connect_and_run (BufferSet&, uint32_t& in, uint32_t& out, nframes_t nframes, nframes_t offset);
-       string describe_parameter (Evoral::Parameter);
-       string state_node_name() const { return "vst"; }
+
+       int connect_and_run (BufferSet&,
+                       ChanMapping in, ChanMapping out,
+                       nframes_t nframes, nframes_t offset);
+
+       std::string describe_parameter (Evoral::Parameter);
+       std::string state_node_name() const { return "vst"; }
        void print_parameter (uint32_t, char*, uint32_t len) const;
 
        bool parameter_is_audio(uint32_t i) const { return false; }
@@ -81,8 +79,8 @@ class VSTPlugin : public ARDOUR::Plugin
        bool parameter_is_input(uint32_t i) const { return true; }
        bool parameter_is_output(uint32_t i) const { return false; }
 
-       bool load_preset (const string preset_label );
-       bool save_preset(string name);
+       bool load_preset (const std::string preset_label );
+       bool save_preset (std::string name);
 
        bool has_editor () const;
 
@@ -105,7 +103,7 @@ class VSTPluginInfo : public PluginInfo
   public:
        VSTPluginInfo () {}
        ~VSTPluginInfo () {}
-       
+
        PluginPtr load (Session& session);
 };