smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-19 05:06:31 +01:00
Code Issues Projects Releases Wiki Activity

Add BasicUI::engine_sample_time()

Browse source 
Towards removing the direct use of Session by surfaces.
This commit is contained in:
David Robillard 2021-06-15 19:59:19 -04:00
parent 36789f080c
commit 850bd44702
10 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libs/surfaces/cc121/cc121.cc
View file

@ -309,7 +309,7 @@ CC121::button_press_handler (MIDI::Parser &, MIDI::EventTwoBytes* tb)
if (_current_stripable) { if (_current_stripable) {
boost::shared_ptr<AutomationControl> gain = _current_stripable->gain_control (); boost::shared_ptr<AutomationControl> gain = _current_stripable->gain_control ();
if (gain) { if (gain) {
timepos_t now (_session->engine().sample_time()); timepos_t now (engine_sample_time());
gain->start_touch (now); gain->start_touch (now);
} }
} }
@ -356,7 +356,7 @@ CC121::button_release_handler (MIDI::Parser &, MIDI::EventTwoBytes* tb)
if (_current_stripable) { if (_current_stripable) {
boost::shared_ptr<AutomationControl> gain = _current_stripable->gain_control (); boost::shared_ptr<AutomationControl> gain = _current_stripable->gain_control ();
if (gain) { if (gain) {
timepos_t now (_session->engine().sample_time()); timepos_t now (engine_sample_time());
gain->stop_touch (now); gain->stop_touch (now);
} }
} }
@ -706,8 +706,7 @@ CC121::midi_input_handler (Glib::IOCondition ioc, boost::shared_ptr<ARDOUR::Asyn
port->clear (); port->clear ();
DEBUG_TRACE (DEBUG::CC121, string_compose ("data available on %1\n", boost::shared_ptr<MIDI::Port>(port)->name())); DEBUG_TRACE (DEBUG::CC121, string_compose ("data available on %1\n", boost::shared_ptr<MIDI::Port>(port)->name()));
samplepos_t now = _session->engine().sample_time(); port->parse (engine_sample_time ());
port->parse (now);
} }
return true; return true;

6
libs/surfaces/control_protocol/basic_ui.cc
View file

@ -726,6 +726,12 @@ BasicUI::locked ()
return _session->transport_locked (); return _session->transport_locked ();
} }
ARDOUR::samplepos_t
BasicUI::engine_sample_time ()
{
return _session->engine ().sample_time ();
}
ARDOUR::samplecnt_t ARDOUR::samplecnt_t
BasicUI::timecode_frames_per_hour () BasicUI::timecode_frames_per_hour ()
{ {

2
libs/surfaces/control_protocol/control_protocol/basic_ui.h
View file

@ -76,6 +76,8 @@ class LIBCONTROLCP_API BasicUI {
bool locating (); bool locating ();
bool locked (); bool locked ();
samplepos_t engine_sample_time ();
void save_state (); void save_state ();
void prev_marker (); void prev_marker ();
void next_marker (); void next_marker ();

5
libs/surfaces/faderport/faderport.cc
View file

@ -367,7 +367,7 @@ FaderPort::button_handler (MIDI::Parser &, MIDI::EventTwoBytes* tb)
if (_current_stripable) { if (_current_stripable) {
boost::shared_ptr<AutomationControl> gain = _current_stripable->gain_control (); boost::shared_ptr<AutomationControl> gain = _current_stripable->gain_control ();
if (gain) { if (gain) {
timepos_t now = timepos_t (_session->engine().sample_time()); timepos_t now = timepos_t (engine_sample_time());
if (tb->value) { if (tb->value) {
gain->start_touch (now); gain->start_touch (now);
} else { } else {
@ -747,8 +747,7 @@ FaderPort::midi_input_handler (Glib::IOCondition ioc, boost::weak_ptr<ARDOUR::As
port->clear (); port->clear ();
DEBUG_TRACE (DEBUG::FaderPort, string_compose ("data available on %1\n", boost::shared_ptr<MIDI::Port>(port)->name())); DEBUG_TRACE (DEBUG::FaderPort, string_compose ("data available on %1\n", boost::shared_ptr<MIDI::Port>(port)->name()));
samplepos_t now = _session->engine().sample_time(); port->parse (engine_sample_time());
port->parse (now);
} }
return true; return true;

3
libs/surfaces/faderport8/faderport8.cc
View file

@ -526,8 +526,7 @@ FaderPort8::midi_input_handler (Glib::IOCondition ioc, boost::weak_ptr<ARDOUR::A
#ifdef VERBOSE_DEBUG #ifdef VERBOSE_DEBUG
DEBUG_TRACE (DEBUG::FaderPort8, string_compose ("data available on %1\n", boost::shared_ptr<MIDI::Port>(port)->name())); DEBUG_TRACE (DEBUG::FaderPort8, string_compose ("data available on %1\n", boost::shared_ptr<MIDI::Port>(port)->name()));
#endif #endif
samplepos_t now = _session->engine().sample_time(); port->parse (engine_sample_time());
port->parse (now);
} }
return true; return true;

3
libs/surfaces/generic_midi/generic_midi_control_protocol.cc
View file

@ -1657,8 +1657,7 @@ GenericMidiControlProtocol::midi_input_handler (Glib::IOCondition ioc, boost::we
port->clear (); port->clear ();
DEBUG_TRACE (DEBUG::GenericMidi, string_compose ("data available on %1\n", boost::shared_ptr<MIDI::Port>(port)->name())); DEBUG_TRACE (DEBUG::GenericMidi, string_compose ("data available on %1\n", boost::shared_ptr<MIDI::Port>(port)->name()));
samplepos_t now = _session->engine().sample_time(); port->parse (engine_sample_time());
port->parse (now);
} }
return true; return true;

3
libs/surfaces/launch_control_xl/launch_control_xl.cc
View file

@ -515,8 +515,7 @@ LaunchControlXL::midi_input_handler (IOCondition ioc, MIDI::Port* port)
DEBUG_TRACE (DEBUG::LaunchControlXL, string_compose ("data available on %1\n", port->name())); DEBUG_TRACE (DEBUG::LaunchControlXL, string_compose ("data available on %1\n", port->name()));
if (in_use) { if (in_use) {
samplepos_t now = AudioEngine::instance()->sample_time(); port->parse (engine_sample_time());
port->parse (now);
} }
} }

3
libs/surfaces/mackie/mackie_control_protocol.cc
View file

@ -1699,8 +1699,7 @@ MackieControlProtocol::midi_input_handler (IOCondition ioc, MIDI::Port* port)
} }
// DEBUG_TRACE (DEBUG::MackieControl, string_compose ("data available on %1\n", port->name())); // DEBUG_TRACE (DEBUG::MackieControl, string_compose ("data available on %1\n", port->name()));
samplepos_t now = _session->engine().sample_time(); port->parse (engine_sample_time());
port->parse (now);
} }
return true; return true;

3
libs/surfaces/push2/push2.cc
View file

@ -561,8 +561,7 @@ Push2::midi_input_handler (IOCondition ioc, MIDI::Port* port)
DEBUG_TRACE (DEBUG::Push2, string_compose ("data available on %1\n", port->name())); DEBUG_TRACE (DEBUG::Push2, string_compose ("data available on %1\n", port->name()));
if (in_use) { if (in_use) {
samplepos_t now = AudioEngine::instance()->sample_time(); port->parse (engine_sample_time());
port->parse (now);
} }
} }

3
libs/surfaces/us2400/us2400_control_protocol.cc
View file

@ -1351,8 +1351,7 @@ US2400Protocol::midi_input_handler (IOCondition ioc, MIDI::Port* port)
} }
// DEBUG_TRACE (DEBUG::US2400, string_compose ("data available on %1\n", port->name())); // DEBUG_TRACE (DEBUG::US2400, string_compose ("data available on %1\n", port->name()));
samplepos_t now = _session->engine().sample_time(); port->parse (engine_sample_time());
port->parse (now);
} }
return true; return true;