ardour/livetrax
13
0
Fork 0
Code

Merge branch 'ardour'

Browse Source
This commit is contained in:
Robin Gareus 2024-06-15 16:35:06 +02:00
commit 51d182b7c3
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
4 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gtk2_ardour/mixer_strip.cc
View File

@ -365,6 +365,14 @@ MixerStrip::init ()
global_vpacker.pack_start (output_button, Gtk::PACK_SHRINK);
}
midi_input_enable_button.set_size_request (PX_SCALE(19), PX_SCALE(19));
midi_input_enable_button.set_name ("midi input button");
midi_input_enable_button.set_elements ((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
midi_input_enable_button.set_icon (ArdourIcon::DinMidi);
midi_input_enable_button.signal_button_press_event().connect (sigc::mem_fun (*this, &MixerStrip::input_active_button_press), false);
midi_input_enable_button.signal_button_release_event().connect (sigc::mem_fun (*this, &MixerStrip::input_active_button_release), false);
set_tooltip (midi_input_enable_button, _("Enable/Disable MIDI input"));
#ifndef MIXBUS
//add a spacer underneath the master bus;
//this fills the area that is taken up by the scrollbar on the tracks;
@ -715,15 +723,9 @@ MixerStrip::set_route (std::shared_ptr<Route> rt)
update_trim_control();
if (is_midi_track()) {
midi_input_enable_button.set_size_request (PX_SCALE(19), PX_SCALE(19));
midi_input_enable_button.set_name ("midi input button");
midi_input_enable_button.set_elements ((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
midi_input_enable_button.set_icon (ArdourIcon::DinMidi);
midi_input_enable_button.signal_button_press_event().connect (sigc::mem_fun (*this, &MixerStrip::input_active_button_press), false);
midi_input_enable_button.signal_button_release_event().connect (sigc::mem_fun (*this, &MixerStrip::input_active_button_release), false);
set_tooltip (midi_input_enable_button, _("Enable/Disable MIDI input"));
input_button_box.pack_start (midi_input_enable_button, false, false);
if (!midi_input_enable_button.get_parent()) {
input_button_box.pack_start (midi_input_enable_button, false, false);
}
/* get current state */
midi_input_status_changed ();

2
libs/ardour/ardour/port_manager.h
View File

@ -151,7 +151,7 @@ public:
bool connected (const std::string&);
bool physically_connected (const std::string&);
int get_connections (const std::string&, std::vector<std::string>&);
int get_connections (const std::string&, std::vector<std::string>&, bool process_context_safe = true);
/* Naming */

4
libs/ardour/port_manager.cc
View File

@ -751,7 +751,7 @@ PortManager::physically_connected (const string& port_name)
}
int
PortManager::get_connections (const string& port_name, std::vector<std::string>& s)
PortManager::get_connections (const string& port_name, std::vector<std::string>& s, bool process_context_safe)
{
if (!_backend) {
s.clear ();
@ -765,7 +765,7 @@ PortManager::get_connections (const string& port_name, std::vector<std::string>&
return 0;
}
return _backend->get_connections (handle, s);
return _backend->get_connections (handle, s, process_context_safe);
}
int

3
libs/ardour/session_midi.cc
View File

@ -744,7 +744,8 @@ Session::disconnect_port_for_rewire (std::string const& port) const
bool keep_ctrl = mpf & MidiPortControl;
vector<string> port_connections;
AudioEngine::instance()->get_connections (port, port_connections);
AudioEngine::instance()->get_connections (port, port_connections, false);
for (vector<string>::iterator i = port_connections.begin(); i != port_connections.end(); ++i) {
/* test if (*i) is a control-surface input port */