ardour/livetrax
13
0
Fork 0
Code

Partially revert "Clean init process to prevent exceptions"

Browse Source 
This reverts commit 94fec7fd8a
except whitespace and intent changes as per discussion on
https://github.com/Ardour/ardour/pull/834
This commit is contained in:
Robin Gareus 2023-10-26 21:16:12 +02:00
parent afc6c060a8
commit 53e24168b6
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
libs/surfaces/console1/console1.cc
View File

@ -179,15 +179,15 @@ Console1::begin_using_device ()
{
DEBUG_TRACE (DEBUG::Console1, "sending device inquiry message...\n");
if (MIDISurface::begin_using_device ()) {
return -1;
}
/*
with this sysex command we can enter the 'native mode'
But there's no need to do so
f0 7d 20 00 00 00 01 00 7f 49 6f 6c 73 00 f7
*/
if (_in_use)
return 0;
load_mappings ();
setup_controls ();
@ -202,30 +202,11 @@ Console1::begin_using_device ()
Glib::RefPtr<Glib::TimeoutSource> periodic_timer = Glib::TimeoutSource::create (100);
periodic_connection = periodic_timer->connect (sigc::mem_fun (*this, &Console1::periodic));
periodic_timer->attach (main_loop ()->get_context ());
connect_session_signals ();
connect_internal_signals ();
create_strip_inventory ();
_in_use = true;
DEBUG_TRACE (DEBUG::Console1, "************** begin_using_device() ********************\n");
return 0;
}
int
Console1::stop_using_device ()
{
DEBUG_TRACE (DEBUG::Console1, "stop_using_device()\n");
if (!_in_use)
return 0;
blink_connection.disconnect ();
periodic_connection.disconnect ();
stripable_connections.drop_connections ();
session_connections.drop_connections ();
console1_connections.drop_connections ();
_in_use = false;
return 0;
}
void
Console1::connect_session_signals ()
{
@ -288,6 +269,8 @@ void
Console1::notify_session_loaded ()
{
DEBUG_TRACE (DEBUG::Console1, "************** Session Loaded() ********************\n");
create_strip_inventory ();
connect_internal_signals ();
stripable_selection_changed ();
}
@ -445,6 +428,17 @@ Console1::setup_controls ()
new Meter (this, ControllerID::OUTPUT_METER_R, boost::function<void ()> ([] () {}));
}
int
Console1::stop_using_device ()
{
DEBUG_TRACE (DEBUG::Console1, "stop_using_device()\n");
blink_connection.disconnect ();
periodic_connection.disconnect ();
stripable_connections.drop_connections ();
return 0;
}
void
Console1::handle_midi_controller_message (MIDI::Parser&, MIDI::EventTwoBytes* tb)
{
@ -543,12 +537,11 @@ Console1::notify_transport_state_changed ()
void
Console1::stripable_selection_changed ()
{
if (!_in_use)
return;
DEBUG_TRACE (DEBUG::Console1, "stripable_selection_changed \n");
std::shared_ptr<Stripable> r = ControlProtocol::first_selected_stripable ();
if (r)
if (r) {
set_current_stripable (r);
}
}
void
@ -1205,21 +1198,24 @@ Console1::select_rid_by_index (uint32_t index)
#ifdef MIXBUS
rid = index + offset;
#else
if (index == master_index)
if (index == master_index) {
rid = 1;
else
} else {
rid = index + 1 + offset;
}
#endif
DEBUG_TRACE (DEBUG::Console1, string_compose ("rid %1\n", rid));
if (rid > (max_strip_index + 1 + offset))
success = false;
if (rid > ( max_strip_index + 1 + offset )) {
success = false;
}
std::shared_ptr<Stripable> s = session->get_remote_nth_stripable (rid, PresentationInfo::MixerStripables);
if (s) {
session->selection ().select_stripable_and_maybe_group (s, true, false, 0);
} else {
success = false;
}
if (!success) {
else {
success = false;
}
if( !success ){
map_select ();
}
}