diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-11-24 22:21:19 +0200 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-11-26 18:22:22 +0200 |
| commit | 25e1eddc50219dca119bc55370c3e2a5dd776752 (patch) | |
| tree | 74c9f17b6c89a3a638811bf018447256e6a1b587 /libs/ardour/midi_ui.cc | |
| parent | 140540ef59652cf7283afc06e2ea7922b1789c88 (diff) | |
remove "port sources" management from MidiControlUI and Mackie support.
This was necessary due to a bug/design issue between Glibmm and Glib (see https://bugzilla.gnome.org/show_bug.cgi?id=561885)
but the problem needs to be managed by the *creator* of the IOSource and that has now moved inside CrossThreadChannel.
Diffstat (limited to 'libs/ardour/midi_ui.cc')
| -rw-r--r-- | libs/ardour/midi_ui.cc | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/libs/ardour/midi_ui.cc b/libs/ardour/midi_ui.cc index d5a0b2b444..ecdcb303e8 100644 --- a/libs/ardour/midi_ui.cc +++ b/libs/ardour/midi_ui.cc @@ -97,21 +97,11 @@ MidiControlUI::midi_input_handler (IOCondition ioc, AsyncMIDIPort* port) void MidiControlUI::clear_ports () { - for (PortSources::iterator i = port_sources.begin(); i != port_sources.end(); ++i) { - g_source_destroy (*i); - g_source_unref (*i); - } - - port_sources.clear (); } void MidiControlUI::reset_ports () { - if (!port_sources.empty()) { - return; - } - vector<AsyncMIDIPort*> ports; AsyncMIDIPort* p; @@ -139,11 +129,6 @@ MidiControlUI::reset_ports () if (psrc) { psrc->connect (sigc::bind (sigc::mem_fun (this, &MidiControlUI::midi_input_handler), *pi)); psrc->attach (_main_loop->get_context()); - - // glibmm hack: for now, store only the GSource* - - port_sources.push_back (psrc->gobj()); - g_source_ref (psrc->gobj()); } } } |