changes in logic used by source cleanup to avoid endless recursion in sessions with...

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

diff --git a/libs/ardour/ardour/midi_ui.h b/libs/ardour/ardour/midi_ui.h
index c66df96a6de13681f3b15234ffd382a41c888e5e..88ea021361a8e2a754dd69574c29fe4ef99a3f8c 100644 (file)
--- a/libs/ardour/ardour/midi_ui.h
+++ b/libs/ardour/ardour/midi_ui.h
@@ -1,40 +1,57 @@
+/*
+    Copyright (C) 2012 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
+    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; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __libardour_midi_ui_h__
 #define __libardour_midi_ui_h__
 
 #include <list>
 
+#define ABSTRACT_UI_EXPORTS
 #include "pbd/abstract_ui.h"
 #include "pbd/signals.h"
 #include "pbd/stacktrace.h"
 
-namespace MIDI {
-       class Port;
-}
 
 namespace ARDOUR {
 
 class Session;
+class AsyncMIDIPort;
 
 /* this is mostly a placeholder because I suspect that at some
    point we will want to add more members to accomodate
    certain types of requests to the MIDI UI
 */
 
-struct MidiUIRequest : public BaseUI::BaseRequestObject {
+struct LIBARDOUR_API MidiUIRequest : public BaseUI::BaseRequestObject {
   public:
        MidiUIRequest () { }
        ~MidiUIRequest() { }
 };
 
-class MidiControlUI : public AbstractUI<MidiUIRequest>
+class LIBARDOUR_API MidiControlUI : public AbstractUI<MidiUIRequest>
 {
   public:
        MidiControlUI (Session& s);
        ~MidiControlUI ();
 
        static MidiControlUI* instance() { return _instance; }
-
-       static BaseUI::RequestType PortChange;
+       static void* request_factory (uint32_t num_requests);
 
        void change_midi_ports ();
 
@@ -43,12 +60,9 @@ class MidiControlUI : public AbstractUI<MidiUIRequest>
        void do_request (MidiUIRequest*);
 
   private:
-       typedef std::list<GSource*> PortSources;
-       PortSources port_sources;
        ARDOUR::Session& _session;
-       PBD::ScopedConnection rebind_connection;
 
-       bool midi_input_handler (Glib::IOCondition, MIDI::Port*);
+       bool midi_input_handler (Glib::IOCondition, boost::weak_ptr<AsyncMIDIPort>);
        void reset_ports ();
        void clear_ports ();