From: Hans Baier Date: Wed, 21 May 2008 23:01:40 +0000 (+0000) Subject: * bugfix: Inputs and Outputs swapped in the Track/Bus Inspector X-Git-Tag: 3.0-alpha5~4215 X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=7a9b4a0aa2f5ccdcd9257a0df12917c0e3b1fd91;p=ardour.git * bugfix: Inputs and Outputs swapped in the Track/Bus Inspector * bugfix: control_to_midi_event has no effect * typo (track/bus inspector) git-svn-id: svn://localhost/ardour2/branches/3.0@3379 d708f5d6-7413-0410-9779-e7cbd77b26cf --- diff --git a/gtk2_ardour/io_selector.cc b/gtk2_ardour/io_selector.cc index f0d589c138..1708c9036e 100644 --- a/gtk2_ardour/io_selector.cc +++ b/gtk2_ardour/io_selector.cc @@ -40,7 +40,7 @@ IOSelector::IOSelector (ARDOUR::Session& session, boost::shared_ptr _io (io) { /* Listen for ports changing on the IO */ - if (!offer_inputs) { + if (_offer_inputs) { _io->input_changed.connect (mem_fun(*this, &IOSelector::ports_changed)); } else { _io->output_changed.connect (mem_fun(*this, &IOSelector::ports_changed)); @@ -69,13 +69,13 @@ void IOSelector::set_state (int r, std::string const & p, bool s) { if (s) { - if (!_offer_inputs) { + if (_offer_inputs) { _io->connect_input (_io->input(r), p, 0); } else { _io->connect_output (_io->output(r), p, 0); } } else { - if (!_offer_inputs) { + if (_offer_inputs) { _io->disconnect_input (_io->input(r), p, 0); } else { _io->disconnect_output (_io->output(r), p, 0); @@ -89,9 +89,9 @@ IOSelector::get_state (int r, std::string const & p) const vector connections; if (_offer_inputs) { - _io->output(r)->get_connections (connections); - } else { _io->input(r)->get_connections (connections); + } else { + _io->output(r)->get_connections (connections); } int k = 0; @@ -110,7 +110,7 @@ IOSelector::get_state (int r, std::string const & p) const uint32_t IOSelector::n_rows () const { - if (!_offer_inputs) { + if (_offer_inputs) { return _io->inputs().num_ports (_io->default_type()); } else { return _io->outputs().num_ports (_io->default_type()); @@ -120,7 +120,7 @@ IOSelector::n_rows () const uint32_t IOSelector::maximum_rows () const { - if (!_offer_inputs) { + if (_offer_inputs) { return _io->input_maximum ().get (_io->default_type()); } else { return _io->output_maximum ().get (_io->default_type()); @@ -131,7 +131,7 @@ IOSelector::maximum_rows () const uint32_t IOSelector::minimum_rows () const { - if (!_offer_inputs) { + if (_offer_inputs) { return _io->input_minimum ().get (_io->default_type()); } else { return _io->output_minimum ().get (_io->default_type()); @@ -141,7 +141,7 @@ IOSelector::minimum_rows () const std::string IOSelector::row_name (int r) const { - if (!_offer_inputs) { + if (_offer_inputs) { return _io->input(r)->name(); } else { return _io->output(r)->name(); @@ -155,7 +155,7 @@ IOSelector::add_row () // The IO selector only works for single typed IOs const ARDOUR::DataType t = _io->default_type (); - if (!_offer_inputs) { + if (_offer_inputs) { try { _io->add_input_port ("", this); @@ -186,7 +186,7 @@ IOSelector::remove_row (int r) // The IO selector only works for single typed IOs const ARDOUR::DataType t = _io->default_type (); - if (!_offer_inputs) { + if (_offer_inputs) { _io->remove_input_port (_io->input (r), this); } else { _io->remove_output_port (_io->output (r), this); diff --git a/gtk2_ardour/port_matrix.cc b/gtk2_ardour/port_matrix.cc index f47a4ff191..425ad80bbc 100644 --- a/gtk2_ardour/port_matrix.cc +++ b/gtk2_ardour/port_matrix.cc @@ -601,7 +601,7 @@ PortMatrix::set_offer_inputs (bool i) PortGroupList::PortGroupList (ARDOUR::Session & session, ARDOUR::DataType type, bool offer_inputs, Mask mask) : _session (session), _type (type), _offer_inputs (offer_inputs), - buss (_("Buss"), "ardour:", mask & BUSS), + buss (_("Bus"), "ardour:", mask & BUSS), track (_("Track"), "ardour:", mask & TRACK), system (_("System"), "system:", mask & SYSTEM), other (_("Other"), "", mask & OTHER) diff --git a/libs/ardour/ardour/midi_model.h b/libs/ardour/ardour/midi_model.h index a49a878371..2481aa8d34 100644 --- a/libs/ardour/ardour/midi_model.h +++ b/libs/ardour/ardour/midi_model.h @@ -200,7 +200,7 @@ public: const MidiSource* midi_source() const { return _midi_source; } void set_midi_source(MidiSource* source) { _midi_source = source; } - bool control_to_midi_event(boost::shared_ptr ev, const MidiControlIterator& iter) const; + bool control_to_midi_event(boost::shared_ptr& ev, const MidiControlIterator& iter) const; private: friend class DeltaCommand; diff --git a/libs/ardour/midi_model.cc b/libs/ardour/midi_model.cc index d01bf4276b..02b076a5e5 100644 --- a/libs/ardour/midi_model.cc +++ b/libs/ardour/midi_model.cc @@ -59,13 +59,14 @@ void MidiModel::read_unlock() const { MidiModel::const_iterator::const_iterator(const MidiModel& model, double t) : _model(&model) - , _is_end( (t == DBL_MAX) || model.empty()) - , _locked( !_is_end) + , _is_end( (t == DBL_MAX) || model.empty() ) + , _locked( !_is_end ) { //cerr << "Created MIDI iterator @ " << t << " (is end: " << _is_end << ")" << endl; - if (_is_end) + if (_is_end) { return; + } model.read_lock(); @@ -286,8 +287,9 @@ MidiModel::const_iterator& MidiModel::const_iterator::operator=(const const_iter size_t index = other._control_iter - other._control_iters.begin(); _control_iter = _control_iters.begin() + index; - if (!_is_end) + if (!_is_end) { _event = boost::shared_ptr(new MIDI::Event(*other._event, true)); + } return *this; } @@ -355,11 +357,12 @@ size_t MidiModel::read(MidiRingBuffer& dst, nframes_t start, nframes_t nframes, * \return true on success */ bool -MidiModel::control_to_midi_event(boost::shared_ptr ev, const MidiControlIterator& iter) const +MidiModel::control_to_midi_event(boost::shared_ptr& ev, const MidiControlIterator& iter) const { assert(iter.automation_list.get()); - if (!ev) + if (!ev) { ev = boost::shared_ptr(new MIDI::Event(0, 3, NULL, true)); + } switch (iter.automation_list->parameter().type()) { case MidiCCAutomation: