Fix uninitialised variable causing garbage output from panners in some cases.

[ardour.git] / libs / ardour / plugin.cc

diff --git a/libs/ardour/plugin.cc b/libs/ardour/plugin.cc
index 90e9146af10882e3d9c828cb28c8623094632eaf..4afc39b4ecdb63abedd873169115262b92bf8307 100644 (file)
--- a/libs/ardour/plugin.cc
+++ b/libs/ardour/plugin.cc
@@ -38,14 +38,18 @@
 #include "pbd/error.h"
 #include "pbd/xml++.h"
 
-#include "ardour/ardour.h"
-#include "ardour/session.h"
-#include "ardour/audioengine.h"
+#include "ardour/buffer_set.h"
+#include "ardour/chan_count.h"
+#include "ardour/chan_mapping.h"
+#include "ardour/data_type.h"
+#include "ardour/midi_buffer.h"
+#include "ardour/midi_state_tracker.h"
 #include "ardour/plugin.h"
-#include "ardour/ladspa_plugin.h"
 #include "ardour/plugin_manager.h"
+#include "ardour/session.h"
+#include "ardour/types.h"
 
-#ifdef HAVE_AUDIOUNITS
+#ifdef AUDIOUNIT_SUPPORT
 #include "ardour/audio_unit.h"
 #endif
 
@@ -62,6 +66,14 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
+namespace ARDOUR { class AudioEngine; }
+
+bool
+PluginInfo::is_instrument () const
+{
+       return (n_inputs.n_midi() != 0) && (n_outputs.n_audio() > 0);
+}
+
 Plugin::Plugin (AudioEngine& e, Session& s)
        : _engine (e)
        , _session (s)
@@ -70,6 +82,7 @@ Plugin::Plugin (AudioEngine& e, Session& s)
        , _have_pending_stop_events (false)
        , _parameter_changed_since_last_preset (false)
 {
+       _pending_stop_events.ensure_buffers (DataType::MIDI, 1, 4096);
 }
 
 Plugin::Plugin (const Plugin& other)
@@ -83,12 +96,11 @@ Plugin::Plugin (const Plugin& other)
        , _have_pending_stop_events (false)
        , _parameter_changed_since_last_preset (false)
 {
-
+       _pending_stop_events.ensure_buffers (DataType::MIDI, 1, 4096);
 }
 
 Plugin::~Plugin ()
 {
-
 }
 
 void
@@ -119,29 +131,35 @@ Plugin::save_preset (string name)
 PluginPtr
 ARDOUR::find_plugin(Session& session, string identifier, PluginType type)
 {
-       PluginManager *mgr = PluginManager::the_manager();
+       PluginManager& mgr (PluginManager::instance());
        PluginInfoList plugs;
 
        switch (type) {
        case ARDOUR::LADSPA:
-               plugs = mgr->ladspa_plugin_info();
+               plugs = mgr.ladspa_plugin_info();
                break;
 
 #ifdef LV2_SUPPORT
        case ARDOUR::LV2:
-               plugs = mgr->lv2_plugin_info();
+               plugs = mgr.lv2_plugin_info();
+               break;
+#endif
+
+#ifdef WINDOWS_VST_SUPPORT
+       case ARDOUR::Windows_VST:
+               plugs = mgr.windows_vst_plugin_info();
                break;
 #endif
 
-#ifdef VST_SUPPORT
-       case ARDOUR::VST:
-               plugs = mgr->vst_plugin_info();
+#ifdef LXVST_SUPPORT
+       case ARDOUR::LXVST:
+               plugs = mgr.lxvst_plugin_info();
                break;
 #endif
 
-#ifdef HAVE_AUDIOUNITS
+#ifdef AUDIOUNIT_SUPPORT
        case ARDOUR::AudioUnit:
-               plugs = mgr->au_plugin_info();
+               plugs = mgr.au_plugin_info();
                break;
 #endif
 
@@ -157,7 +175,20 @@ ARDOUR::find_plugin(Session& session, string identifier, PluginType type)
                }
        }
 
-#ifdef VST_SUPPORT
+#ifdef WINDOWS_VST_SUPPORT
+       /* hmm, we didn't find it. could be because in older versions of Ardour.
+          we used to store the name of a VST plugin, not its unique ID. so try
+          again.
+       */
+
+       for (i = plugs.begin(); i != plugs.end(); ++i) {
+               if (identifier == (*i)->name){
+                       return (*i)->load (session);
+               }
+       }
+#endif
+
+#ifdef LXVST_SUPPORT
        /* hmm, we didn't find it. could be because in older versions of Ardour.
           we used to store the name of a VST plugin, not its unique ID. so try
           again.
@@ -217,14 +248,16 @@ Plugin::preset_by_uri (const string& uri)
 
 int
 Plugin::connect_and_run (BufferSet& bufs,
-                        ChanMapping in_map, ChanMapping out_map,
-                        pframes_t nframes, framecnt_t offset)
+                        ChanMapping /*in_map*/, ChanMapping /*out_map*/,
+                        pframes_t /* nframes */, framecnt_t /*offset*/)
 {
        if (bufs.count().n_midi() > 0) {
 
                /* Track notes that we are sending to the plugin */
+
                MidiBuffer& b = bufs.get_midi (0);
                bool looped;
+
                _tracker.track (b.begin(), b.end(), looped);
 
                if (_have_pending_stop_events) {
@@ -239,12 +272,29 @@ Plugin::connect_and_run (BufferSet& bufs,
 
 void
 Plugin::realtime_handle_transport_stopped ()
+{
+       resolve_midi ();
+}
+
+void
+Plugin::realtime_locate ()
+{
+       resolve_midi ();
+}
+
+void
+Plugin::monitoring_changed ()
+{
+       resolve_midi ();
+}
+
+void
+Plugin::resolve_midi ()
 {
        /* Create note-offs for any active notes and put them in _pending_stop_events, to be picked
           up on the next call to connect_and_run ().
        */
 
-       _pending_stop_events.ensure_buffers (DataType::MIDI, 1, 4096);
        _pending_stop_events.get_midi(0).clear ();
        _tracker.resolve_notes (_pending_stop_events.get_midi (0), 0);
        _have_pending_stop_events = true;
@@ -287,7 +337,7 @@ Plugin::set_parameter (uint32_t which, float val)
 }
 
 int
-Plugin::set_state (const XMLNode& node, int version)
+Plugin::set_state (const XMLNode& node, int /*version*/)
 {
        XMLProperty const * p = node.property (X_("last-preset-uri"));
        if (p) {
@@ -320,3 +370,11 @@ Plugin::get_state ()
        add_state (root);
        return *root;
 }
+
+void
+Plugin::set_info (PluginInfoPtr info)
+{
+       _info = info;
+}
+
+