13
0

NO-OP: whitespace

This commit is contained in:
Robin Gareus 2016-10-23 22:18:07 +02:00
parent 7c8ab05c09
commit 7e861bd12e

View File

@ -43,64 +43,63 @@ namespace ARDOUR {
class LIBARDOUR_API AsyncMIDIPort : public ARDOUR::MidiPort, public MIDI::Port { class LIBARDOUR_API AsyncMIDIPort : public ARDOUR::MidiPort, public MIDI::Port {
public: public:
AsyncMIDIPort (std::string const &, PortFlags); AsyncMIDIPort (std::string const &, PortFlags);
~AsyncMIDIPort (); ~AsyncMIDIPort ();
/* called from an RT context */ /* called from an RT context */
void cycle_start (pframes_t nframes); void cycle_start (pframes_t nframes);
void cycle_end (pframes_t nframes); void cycle_end (pframes_t nframes);
/* called from non-RT context */ /* called from non-RT context */
void parse (framecnt_t timestamp);
int write (const MIDI::byte *msg, size_t msglen, MIDI::timestamp_t timestamp);
int read (MIDI::byte *buf, size_t bufsize);
/* waits for output to be cleared */
void drain (int check_interval_usecs, int total_usecs_to_wait);
void parse (framecnt_t timestamp); /* clears async request communication channel */
int write (const MIDI::byte *msg, size_t msglen, MIDI::timestamp_t timestamp); void clear () {
int read (MIDI::byte *buf, size_t bufsize); _xthread.drain ();
/* waits for output to be cleared */ }
void drain (int check_interval_usecs, int total_usecs_to_wait);
/* clears async request communication channel */ CrossThreadChannel& xthread() {
void clear () { return _xthread;
_xthread.drain (); }
}
CrossThreadChannel& xthread() { /* Not selectable; use ios() */
return _xthread; int selectable() const { return -1; }
} void set_timer (boost::function<framecnt_t (void)>&);
/* Not selectable; use ios() */ static void set_process_thread (pthread_t);
int selectable() const { return -1; } static pthread_t get_process_thread () { return _process_thread; }
void set_timer (boost::function<framecnt_t (void)>&); static bool is_process_thread();
static void set_process_thread (pthread_t); private:
static pthread_t get_process_thread () { return _process_thread; } bool _currently_in_cycle;
static bool is_process_thread(); MIDI::timestamp_t _last_write_timestamp;
bool have_timer;
boost::function<framecnt_t (void)> timer;
RingBuffer< Evoral::Event<double> > output_fifo;
EventRingBuffer<MIDI::timestamp_t> input_fifo;
Glib::Threads::Mutex output_fifo_lock;
CrossThreadChannel _xthread;
private: int create_port ();
bool _currently_in_cycle;
MIDI::timestamp_t _last_write_timestamp;
bool have_timer;
boost::function<framecnt_t (void)> timer;
RingBuffer< Evoral::Event<double> > output_fifo;
EventRingBuffer<MIDI::timestamp_t> input_fifo;
Glib::Threads::Mutex output_fifo_lock;
CrossThreadChannel _xthread;
int create_port (); /** Channel used to signal to the MidiControlUI that input has arrived */
/** Channel used to signal to the MidiControlUI that input has arrived */ std::string _connections;
PBD::ScopedConnection connect_connection;
PBD::ScopedConnection halt_connection;
void jack_halted ();
void make_connections ();
void init (std::string const &, Flags);
std::string _connections; void flush_output_fifo (pframes_t);
PBD::ScopedConnection connect_connection;
PBD::ScopedConnection halt_connection;
void jack_halted ();
void make_connections ();
void init (std::string const &, Flags);
void flush_output_fifo (pframes_t); static pthread_t _process_thread;
static pthread_t _process_thread;
}; };
} // namespace ARDOUR } // namespace ARDOUR