ardour/livetrax
13
0
Fork 0
Code

NO-OP: indent, tabs/whitespace fixes

Browse Source
This commit is contained in:
Robin Gareus 2019-10-18 03:40:52 +02:00
parent b4cbee724e
commit f4ebb5995d
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 61 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
libs/ardour/ardour/midiport_manager.h
View File

@ -25,8 +25,8 @@
#include "pbd/rcu.h" #include "pbd/rcu.h"
#include "midi++/types.h"
#include "midi++/port.h" #include "midi++/port.h"
#include "midi++/types.h"
#include "ardour/libardour_visibility.h" #include "ardour/libardour_visibility.h"
#include "ardour/midi_port.h" #include "ardour/midi_port.h"
@ -37,12 +37,13 @@ namespace ARDOUR {
class MidiPort; class MidiPort;
class Port; class Port;
class LIBARDOUR_API MidiPortManager { class LIBARDOUR_API MidiPortManager
public: {
MidiPortManager(); public:
virtual ~MidiPortManager (); MidiPortManager ();
virtual ~MidiPortManager ();
/* Ports used for control. These are read/written to outside of the /* Ports used for control. These are read/written to outside of the
* process callback (asynchronously with respect to when data * process callback (asynchronously with respect to when data
* actually arrives). * actually arrives).
* *
@ -52,44 +53,67 @@ class LIBARDOUR_API MidiPortManager {
* callback. * callback.
*/ */
boost::shared_ptr<ARDOUR::Port> midi_input_port () const { return _midi_in; } boost::shared_ptr<ARDOUR::Port> midi_input_port () const
boost::shared_ptr<ARDOUR::Port> midi_output_port () const { return _midi_out; } {
return _midi_in;
}
boost::shared_ptr<ARDOUR::Port> midi_output_port () const
{
return _midi_out;
}
boost::shared_ptr<ARDOUR::Port> mmc_input_port() const { return boost::dynamic_pointer_cast<MidiPort>(_mmc_in); } boost::shared_ptr<ARDOUR::Port> mmc_input_port () const
boost::shared_ptr<ARDOUR::Port> mmc_output_port() const { return boost::dynamic_pointer_cast<MidiPort>(_mmc_out); } {
return boost::dynamic_pointer_cast<MidiPort> (_mmc_in);
}
boost::shared_ptr<ARDOUR::Port> mmc_output_port () const
{
return boost::dynamic_pointer_cast<MidiPort> (_mmc_out);
}
boost::shared_ptr<ARDOUR::Port> scene_input_port() const { return boost::dynamic_pointer_cast<MidiPort>(_scene_in); } boost::shared_ptr<ARDOUR::Port> scene_input_port () const
boost::shared_ptr<ARDOUR::Port> scene_output_port() const { return boost::dynamic_pointer_cast<MidiPort>(_scene_out); } {
return boost::dynamic_pointer_cast<MidiPort> (_scene_in);
}
boost::shared_ptr<ARDOUR::Port> scene_output_port () const
{
return boost::dynamic_pointer_cast<MidiPort> (_scene_out);
}
/* Ports used to send synchronization. These have their output handled inside the /* Ports used to send synchronization. These have their output handled inside the
* process callback. * process callback.
*/ */
boost::shared_ptr<MidiPort> mtc_output_port() const { return _mtc_output_port; } boost::shared_ptr<MidiPort> mtc_output_port () const
boost::shared_ptr<MidiPort> midi_clock_output_port() const { return _midi_clock_output_port; } {
return _mtc_output_port;
}
boost::shared_ptr<MidiPort> midi_clock_output_port () const
{
return _midi_clock_output_port;
}
void set_midi_port_states (const XMLNodeList&); void set_midi_port_states (const XMLNodeList&);
std::list<XMLNode*> get_midi_port_states () const; std::list<XMLNode*> get_midi_port_states () const;
PBD::Signal0<void> PortsChanged; PBD::Signal0<void> PortsChanged;
protected: protected:
/* asynchronously handled ports: ARDOUR::AsyncMIDIPort */ /* asynchronously handled ports: ARDOUR::AsyncMIDIPort */
boost::shared_ptr<Port> _midi_in; boost::shared_ptr<Port> _midi_in;
boost::shared_ptr<Port> _midi_out; boost::shared_ptr<Port> _midi_out;
boost::shared_ptr<Port> _mmc_in; boost::shared_ptr<Port> _mmc_in;
boost::shared_ptr<Port> _mmc_out; boost::shared_ptr<Port> _mmc_out;
boost::shared_ptr<Port> _scene_in; boost::shared_ptr<Port> _scene_in;
boost::shared_ptr<Port> _scene_out; boost::shared_ptr<Port> _scene_out;
/* synchronously handled ports: ARDOUR::MidiPort */ /* synchronously handled ports: ARDOUR::MidiPort */
boost::shared_ptr<MidiPort> _mtc_output_port; boost::shared_ptr<MidiPort> _mtc_output_port;
boost::shared_ptr<MidiPort> _midi_clock_output_port; boost::shared_ptr<MidiPort> _midi_clock_output_port;
void create_ports ();
void create_ports ();
}; };
} // namespace MIDI } // namespace ARDOUR
#endif // __midi_port_manager_h__ #endif

6
libs/ardour/midiport_manager.cc
View File

@ -62,8 +62,7 @@ MidiPortManager::~MidiPortManager ()
void void
MidiPortManager::create_ports () MidiPortManager::create_ports ()
{ {
/* this method is idempotent /* this method is idempotent */
*/
if (_midi_in) { if (_midi_in) {
return; return;
@ -78,8 +77,7 @@ MidiPortManager::create_ports ()
_scene_in = AudioEngine::instance()->register_input_port (DataType::MIDI, X_("Scene in"), true); _scene_in = AudioEngine::instance()->register_input_port (DataType::MIDI, X_("Scene in"), true);
_scene_out = AudioEngine::instance()->register_output_port (DataType::MIDI, X_("Scene out"), true); _scene_out = AudioEngine::instance()->register_output_port (DataType::MIDI, X_("Scene out"), true);
/* Now register ports used to send positional sync data (MTC and MIDI Clock) /* Now register ports used to send positional sync data (MTC and MIDI Clock) */
*/
boost::shared_ptr<ARDOUR::Port> p; boost::shared_ptr<ARDOUR::Port> p;