ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

NO-OP: clang-format

This commit is contained in:
Robin Gareus 2023-09-24 14:25:14 +02:00
parent ad24d397f5
commit 184bd500f7
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 449 additions and 463 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

272
gtk2_ardour/midi_list_editor.cc
View File

@ -23,8 +23,8 @@
#include <gtkmm/cellrenderercombo.h>
#include "evoral/midi_util.h"
#include "evoral/Note.h"
#include "evoral/midi_util.h"
#include "ardour/midi_model.h"
#include "ardour/midi_region.h"
@ -32,9 +32,9 @@
#include "ardour/session.h"
#include "ardour/tempo.h"
#include "gtkmm2ext/actions.h"
#include "gtkmm2ext/gui_thread.h"
#include "gtkmm2ext/keyboard.h"
#include "gtkmm2ext/actions.h"
#include "midi_list_editor.h"
#include "note_player.h"
@ -49,35 +49,35 @@ using namespace Glib;
using namespace ARDOUR;
using Temporal::BBT_Time;
static map<int32_t,std::string> note_length_map;
static map<int32_t, std::string> note_length_map;
static void
fill_note_length_map ()
{
note_length_map.insert (make_pair<int32_t,string> (Temporal::ticks_per_beat*4, _("Whole")));
note_length_map.insert (make_pair<int32_t,string> (Temporal::ticks_per_beat*2, _("Half")));
note_length_map.insert (make_pair<int32_t,string> (Temporal::ticks_per_beat*2/3 , _("Triplet")));
note_length_map.insert (make_pair<int32_t,string> (Temporal::ticks_per_beat/1, _("Quarter")));
note_length_map.insert (make_pair<int32_t,string> (Temporal::ticks_per_beat/2, _("Eighth")));
note_length_map.insert (make_pair<int32_t,string> (Temporal::ticks_per_beat/4, _("Sixteenth")));
note_length_map.insert (make_pair<int32_t,string> (Temporal::ticks_per_beat/8, _("Thirty-second")));
note_length_map.insert (make_pair<int32_t,string> (Temporal::ticks_per_beat/16, _("Sixty-fourth")));
note_length_map.insert (make_pair<int32_t, string> (Temporal::ticks_per_beat * 4, _("Whole")));
note_length_map.insert (make_pair<int32_t, string> (Temporal::ticks_per_beat * 2, _("Half")));
note_length_map.insert (make_pair<int32_t, string> (Temporal::ticks_per_beat * 2 / 3, _("Triplet")));
note_length_map.insert (make_pair<int32_t, string> (Temporal::ticks_per_beat / 1, _("Quarter")));
note_length_map.insert (make_pair<int32_t, string> (Temporal::ticks_per_beat / 2, _("Eighth")));
note_length_map.insert (make_pair<int32_t, string> (Temporal::ticks_per_beat / 4, _("Sixteenth")));
note_length_map.insert (make_pair<int32_t, string> (Temporal::ticks_per_beat / 8, _("Thirty-second")));
note_length_map.insert (make_pair<int32_t, string> (Temporal::ticks_per_beat / 16, _("Sixty-fourth")));
}
MidiListEditor::MidiListEditor (Session* s, std::shared_ptr<MidiRegion> r, std::shared_ptr<MidiTrack> tr)
: ArdourWindow (r->name())
: ArdourWindow (r->name ())
, buttons (1, 1)
, region (r)
, track (tr)
{
if (note_length_map.empty()) {
if (note_length_map.empty ()) {
fill_note_length_map ();
}
/* We do not handle nested sources/regions. Caller should have tackled this */
if (r->max_source_level() > 0) {
throw failed_constructor();
if (r->max_source_level () > 0) {
throw failed_constructor ();
}
set_session (s);
@ -92,15 +92,15 @@ MidiListEditor::MidiListEditor (Session* s, std::shared_ptr<MidiRegion> r, std::
note_length_model = ListStore::create (note_length_columns);
TreeModel::Row row;
for (std::map<int,string>::iterator i = note_length_map.begin(); i != note_length_map.end(); ++i) {
row = *(note_length_model->append());
for (std::map<int, string>::iterator i = note_length_map.begin (); i != note_length_map.end (); ++i) {
row = *(note_length_model->append ());
row[note_length_columns.ticks] = i->first;
row[note_length_columns.name] = i->second;
}
view.signal_key_press_event().connect (sigc::mem_fun (*this, &MidiListEditor::key_press), false);
view.signal_key_release_event().connect (sigc::mem_fun (*this, &MidiListEditor::key_release), false);
view.signal_scroll_event().connect (sigc::mem_fun (*this, &MidiListEditor::scroll_event), false);
view.signal_key_press_event ().connect (sigc::mem_fun (*this, &MidiListEditor::key_press), false);
view.signal_key_release_event ().connect (sigc::mem_fun (*this, &MidiListEditor::key_release), false);
view.signal_scroll_event ().connect (sigc::mem_fun (*this, &MidiListEditor::scroll_event), false);
view.append_column (_("Start"), columns.start);
view.append_column (_("Channel"), columns.channel);
@ -109,39 +109,39 @@ MidiListEditor::MidiListEditor (Session* s, std::shared_ptr<MidiRegion> r, std::
view.append_column (_("Vel"), columns.velocity);
/* use a combo renderer for length, so that we can offer a selection
of pre-defined note lengths. we still allow edited values with
arbitrary length (in ticks).
* of pre-defined note lengths. we still allow edited values with
* arbitrary length (in ticks).
*/
Gtk::TreeViewColumn* lenCol = Gtk::manage (new Gtk::TreeViewColumn (_("Length")));
Gtk::CellRendererCombo* comboCell = Gtk::manage(new Gtk::CellRendererCombo);
lenCol->pack_start(*comboCell);
lenCol->add_attribute (comboCell->property_text(), columns.length);
Gtk::CellRendererCombo* comboCell = Gtk::manage (new Gtk::CellRendererCombo);
lenCol->pack_start (*comboCell);
lenCol->add_attribute (comboCell->property_text (), columns.length);
comboCell->property_model() = note_length_model;
comboCell->property_text_column() = 1;
comboCell->property_has_entry() = false;
comboCell->property_model () = note_length_model;
comboCell->property_text_column () = 1;
comboCell->property_has_entry () = false;
view.append_column (*lenCol);
view.set_headers_visible (true);
view.set_rules_hint (true);
view.get_selection()->set_mode (SELECTION_MULTIPLE);
view.get_selection()->signal_changed().connect (sigc::mem_fun (*this, &MidiListEditor::selection_changed));
view.get_selection ()->set_mode (SELECTION_MULTIPLE);
view.get_selection ()->signal_changed ().connect (sigc::mem_fun (*this, &MidiListEditor::selection_changed));
/* Editing the first column (BBT) as text is currently not supported
* -> use editable AudioClock, implement parse_as_bbt */
for (int i = 1; i < 6; ++i) {
CellRendererText* renderer = dynamic_cast<CellRendererText*>(view.get_column_cell_renderer (i));
CellRendererText* renderer = dynamic_cast<CellRendererText*> (view.get_column_cell_renderer (i));
TreeViewColumn* col = view.get_column (i);
col->set_data (X_("colnum"), GUINT_TO_POINTER(i));
col->set_data (X_("colnum"), GUINT_TO_POINTER (i));
renderer->property_editable() = true;
renderer->property_editable () = true;
renderer->signal_editing_started().connect (sigc::bind (sigc::mem_fun (*this, &MidiListEditor::editing_started), i));
renderer->signal_editing_canceled().connect (sigc::mem_fun (*this, &MidiListEditor::editing_canceled));
renderer->signal_edited().connect (sigc::mem_fun (*this, &MidiListEditor::edited));
renderer->signal_editing_started ().connect (sigc::bind (sigc::mem_fun (*this, &MidiListEditor::editing_started), i));
renderer->signal_editing_canceled ().connect (sigc::mem_fun (*this, &MidiListEditor::editing_canceled));
renderer->signal_edited ().connect (sigc::mem_fun (*this, &MidiListEditor::edited));
}
scroller.add (view);
@ -149,15 +149,15 @@ MidiListEditor::MidiListEditor (Session* s, std::shared_ptr<MidiRegion> r, std::
redisplay_model ();
region->midi_source(0)->model()->ContentsChanged.connect (content_connections, invalidator (*this),
boost::bind (&MidiListEditor::redisplay_model, this), gui_context());
region->midi_source (0)->model ()->ContentsChanged.connect (content_connections, invalidator (*this),
boost::bind (&MidiListEditor::redisplay_model, this), gui_context ());
region->PropertyChanged.connect (content_connections, invalidator (*this),
boost::bind (&MidiListEditor::redisplay_model, this), gui_context());
boost::bind (&MidiListEditor::redisplay_model, this), gui_context ());
buttons.attach (sound_notes_button, 0, 1, 0, 1);
Glib::RefPtr<Gtk::Action> act = ActionManager::get_action ("Editor", "sound-midi-notes");
if (act) {
gtk_activatable_set_related_action (GTK_ACTIVATABLE (sound_notes_button.gobj()), act->gobj());
gtk_activatable_set_related_action (GTK_ACTIVATABLE (sound_notes_button.gobj ()), act->gobj ());
}
view.show ();
@ -188,18 +188,19 @@ MidiListEditor::scroll_event (GdkEventScroll* ev)
int celly;
int idelta = 0;
Temporal::Beats beat_delta;
MidiModel::NoteDiffCommand::Property prop (MidiModel::NoteDiffCommand::NoteNumber);
bool apply = false;
bool was_selected = false;
char const * opname;
char const* opname;
MidiModel::NoteDiffCommand::Property prop (MidiModel::NoteDiffCommand::NoteNumber);
if (!view.get_path_at_pos (ev->x, ev->y, path, col, cellx, celly)) {
return false;
}
if (view.get_selection()->count_selected_rows() == 0) {
if (view.get_selection ()->count_selected_rows () == 0) {
was_selected = false;
} else if (view.get_selection()->is_selected (path)) {
} else if (view.get_selection ()->is_selected (path)) {
was_selected = true;
} else {
was_selected = false;
@ -272,57 +273,52 @@ MidiListEditor::scroll_event (GdkEventScroll* ev)
break;
}
if (apply) {
std::shared_ptr<MidiModel> m (region->midi_source(0)->model());
std::shared_ptr<MidiModel> m (region->midi_source (0)->model ());
MidiModel::NoteDiffCommand* cmd = m->new_note_diff_command (opname);
vector<TreeModel::Path> previous_selection;
if (was_selected) {
/* use selection */
TreeView::Selection::ListHandle_Path rows = view.get_selection()->get_selected_rows ();
TreeView::Selection::ListHandle_Path rows = view.get_selection ()->get_selected_rows ();
TreeModel::iterator iter;
std::shared_ptr<NoteType> note;
for (TreeView::Selection::ListHandle_Path::iterator i = rows.begin(); i != rows.end(); ++i) {
for (TreeView::Selection::ListHandle_Path::iterator i = rows.begin (); i != rows.end (); ++i) {
previous_selection.push_back (*i);
if ((iter = model->get_iter (*i))) {
note = (*iter)[columns._note];
switch (prop) {
case MidiModel::NoteDiffCommand::StartTime:
if (note->time() + beat_delta >= Temporal::Beats()) {
cmd->change (note, prop, note->time() + beat_delta);
if (note->time () + beat_delta >= Temporal::Beats ()) {
cmd->change (note, prop, note->time () + beat_delta);
} else {
cmd->change (note, prop, Temporal::Beats());
cmd->change (note, prop, Temporal::Beats ());
}
break;
case MidiModel::NoteDiffCommand::Velocity:
cmd->change (note, prop, (uint8_t) (note->velocity() + idelta));
cmd->change (note, prop, (uint8_t) (note->velocity () + idelta));
break;
case MidiModel::NoteDiffCommand::Length:
if (note->length() <= Temporal::Beats::one_tick() && beat_delta.to_ticks () > 0) {
if (note->length () <= Temporal::Beats::one_tick () && beat_delta.to_ticks () > 0) {
/* Special case increments starting at 1 tick.
* Next step up after 1 is 1920 (not 1921) - or fine grained 30 (not 31).
*/
cmd->change (note, prop, beat_delta);
} else if (note->length() + beat_delta >= Temporal::Beats::one_tick()) {
cmd->change (note, prop, note->length() + beat_delta);
} else if (note->length () + beat_delta >= Temporal::Beats::one_tick ()) {
cmd->change (note, prop, note->length () + beat_delta);
} else {
cmd->change (note, prop, Temporal::Beats::one_tick());
cmd->change (note, prop, Temporal::Beats::one_tick ());
}
break;
case MidiModel::NoteDiffCommand::Channel:
cmd->change (note, prop, (uint8_t) (note->channel() + idelta));
cmd->change (note, prop, (uint8_t) (note->channel () + idelta));
break;
case MidiModel::NoteDiffCommand::NoteNumber:
cmd->change (note, prop, (uint8_t) (note->note() + idelta));
cmd->change (note, prop, (uint8_t) (note->note () + idelta));
break;
default:
continue;
@ -331,7 +327,6 @@ MidiListEditor::scroll_event (GdkEventScroll* ev)
}
} else {
/* just this row */
TreeModel::iterator iter;
@ -344,27 +339,27 @@ MidiListEditor::scroll_event (GdkEventScroll* ev)
switch (prop) {
case MidiModel::NoteDiffCommand::StartTime:
if (note->time() + beat_delta >= Temporal::Beats()) {
cmd->change (note, prop, note->time() + beat_delta);
if (note->time () + beat_delta >= Temporal::Beats ()) {
cmd->change (note, prop, note->time () + beat_delta);
} else {
cmd->change (note, prop, Temporal::Beats());
cmd->change (note, prop, Temporal::Beats ());
}
break;
case MidiModel::NoteDiffCommand::Velocity:
cmd->change (note, prop, (uint8_t) (note->velocity() + idelta));
cmd->change (note, prop, (uint8_t) (note->velocity () + idelta));
break;
case MidiModel::NoteDiffCommand::Length:
if (note->length() + beat_delta >= Temporal::Beats::one_tick()) {
cmd->change (note, prop, note->length() + beat_delta);
if (note->length () + beat_delta >= Temporal::Beats::one_tick ()) {
cmd->change (note, prop, note->length () + beat_delta);
} else {
cmd->change (note, prop, Temporal::Beats::one_tick());
cmd->change (note, prop, Temporal::Beats::one_tick ());
}
break;
case MidiModel::NoteDiffCommand::Channel:
cmd->change (note, prop, (uint8_t) (note->channel() + idelta));
cmd->change (note, prop, (uint8_t) (note->channel () + idelta));
break;
case MidiModel::NoteDiffCommand::NoteNumber:
cmd->change (note, prop, (uint8_t) (note->note() + idelta));
cmd->change (note, prop, (uint8_t) (note->note () + idelta));
break;
default:
break;
@ -376,8 +371,8 @@ MidiListEditor::scroll_event (GdkEventScroll* ev)
/* reset selection to be as it was before we rebuilt */
for (vector<TreeModel::Path>::iterator i = previous_selection.begin(); i != previous_selection.end(); ++i) {
view.get_selection()->select (*i);
for (vector<TreeModel::Path>::iterator i = previous_selection.begin (); i != previous_selection.end (); ++i) {
view.get_selection ()->select (*i);
}
}
@ -406,7 +401,7 @@ MidiListEditor::key_press (GdkEventKey* ev)
* which returns edit focus to the dialog.
*/
colnum = 0;
path.next();
path.next ();
} else {
colnum++;
}
@ -455,7 +450,6 @@ MidiListEditor::key_press (GdkEventKey* ev)
case GDK_Escape:
stop_editing (true);
break;
}
return ret;
@ -469,7 +463,7 @@ MidiListEditor::key_release (GdkEventKey* ev)
TreeViewColumn* col;
TreeModel::iterator iter;
MidiModel::NoteDiffCommand* cmd;
std::shared_ptr<MidiModel> m (region->midi_source(0)->model());
std::shared_ptr<MidiModel> m (region->midi_source (0)->model ());
std::shared_ptr<NoteType> note;
std::shared_ptr<NoteType> copy;
@ -481,9 +475,9 @@ MidiListEditor::key_release (GdkEventKey* ev)
cmd = m->new_note_diff_command (_("insert new note"));
if (iter) {
note = (*iter)[columns._note];
copy.reset (new NoteType (*note.get()));
copy.reset (new NoteType (*note.get ()));
} else {
Temporal::Beats pos = Temporal::TempoMap::use()->quarters_at_sample (region->start().samples());
Temporal::Beats pos = Temporal::TempoMap::use ()->quarters_at_sample (region->start ().samples ());
copy.reset (new NoteType (0, pos, Temporal::Beats (1, 0), 60, 100));
}
cmd->add (copy);
@ -529,17 +523,17 @@ MidiListEditor::key_release (GdkEventKey* ev)
void
MidiListEditor::delete_selected_note ()
{
Glib::RefPtr<TreeSelection> selection = view.get_selection();
Glib::RefPtr<TreeSelection> selection = view.get_selection ();
TreeView::Selection::ListHandle_Path rows = selection->get_selected_rows ();
if (rows.empty()) {
if (rows.empty ()) {
return;
}
typedef vector<std::shared_ptr<NoteType> > Notes;
typedef vector<std::shared_ptr<NoteType>> Notes;
Notes to_delete;
for (TreeView::Selection::ListHandle_Path::iterator i = rows.begin(); i != rows.end(); ++i) {
for (TreeView::Selection::ListHandle_Path::iterator i = rows.begin (); i != rows.end (); ++i) {
TreeIter iter;
if ((iter = model->get_iter (*i))) {
@ -548,10 +542,10 @@ MidiListEditor::delete_selected_note ()
}
}
std::shared_ptr<MidiModel> m (region->midi_source(0)->model());
std::shared_ptr<MidiModel> m (region->midi_source (0)->model ());
MidiModel::NoteDiffCommand* cmd = m->new_note_diff_command (_("delete notes (from list)"));
for (Notes::iterator i = to_delete.begin(); i != to_delete.end(); ++i) {
for (Notes::iterator i = to_delete.begin (); i != to_delete.end (); ++i) {
cmd->remove (*i);
}
@ -577,14 +571,14 @@ MidiListEditor::editing_started (CellEditable* ed, const string& path, int colno
{
edit_path = TreePath (path);
edit_column = colno;
editing_renderer = dynamic_cast<CellRendererText*>(view.get_column_cell_renderer (colno));
editing_renderer = dynamic_cast<CellRendererText*> (view.get_column_cell_renderer (colno));
editing_editable = ed;
if (ed) {
Gtk::Entry *e = dynamic_cast<Gtk::Entry*> (ed);
Gtk::Entry* e = dynamic_cast<Gtk::Entry*> (ed);
if (e) {
e->signal_key_press_event().connect (sigc::mem_fun (*this, &MidiListEditor::key_press), false);
e->signal_key_release_event().connect (sigc::mem_fun (*this, &MidiListEditor::key_release), false);
e->signal_key_press_event ().connect (sigc::mem_fun (*this, &MidiListEditor::key_press), false);
e->signal_key_release_event ().connect (sigc::mem_fun (*this, &MidiListEditor::key_release), false);
}
}
}
@ -603,7 +597,7 @@ MidiListEditor::edited (const std::string& path, const std::string& text)
{
TreeModel::iterator iter = model->get_iter (path);
if (!iter || text.empty()) {
if (!iter || text.empty ()) {
return;
}
@ -615,22 +609,22 @@ MidiListEditor::edited (const std::string& path, const std::string& text)
bool apply = false;
int idelta = 0;
Temporal::Beats delta;
char const * opname;
char const* opname;
switch (edit_column) {
case 0: // start
break;
case 1: // channel
// correct ival for zero-based counting after scan
if (sscanf (text.c_str(), "%d", &ival) == 1 && --ival != note->channel()) {
idelta = ival - note->channel();
/* correct ival for zero-based counting after scan */
if (sscanf (text.c_str (), "%d", &ival) == 1 && --ival != note->channel ()) {
idelta = ival - note->channel ();
prop = MidiModel::NoteDiffCommand::Channel;
opname = _("change note channel");
apply = true;
}
break;
case 2: // note
if (sscanf (text.c_str(), "%d", &ival) == 1 && ival != note->note()) {
idelta = ival - note->note();
if (sscanf (text.c_str (), "%d", &ival) == 1 && ival != note->note ()) {
idelta = ival - note->note ();
prop = MidiModel::NoteDiffCommand::NoteNumber;
opname = _("change note number");
apply = true;
@ -639,15 +633,15 @@ MidiListEditor::edited (const std::string& path, const std::string& text)
case 3: // name
ival = ParameterDescriptor::midi_note_num (text);
if (ival < 128) {
idelta = ival - note->note();
idelta = ival - note->note ();
prop = MidiModel::NoteDiffCommand::NoteNumber;
opname = _("change note number");
apply = true;
}
break;
case 4: // velocity
if (sscanf (text.c_str(), "%d", &ival) == 1 && ival != note->velocity()) {
idelta = ival - note->velocity();
if (sscanf (text.c_str (), "%d", &ival) == 1 && ival != note->velocity ()) {
idelta = ival - note->velocity ();
prop = MidiModel::NoteDiffCommand::Velocity;
opname = _("change note velocity");
apply = true;
@ -655,54 +649,49 @@ MidiListEditor::edited (const std::string& path, const std::string& text)
break;
case 5: // length
try {
stringstream ss (text);
ss >> bval;
} catch (...) {
/* assume its text from the combo. look for the map
* entry for the actual note ticks
*/
uint64_t len_ticks = note->length().to_ticks();
std::map<int,string>::iterator x = note_length_map.find (len_ticks);
if (x == note_length_map.end()) {
uint64_t len_ticks = note->length ().to_ticks ();
std::map<int, string>::iterator x = note_length_map.find (len_ticks);
if (x == note_length_map.end ()) {
/* tick length not in map - was
* displaying numeric value ... use new value
* from note length map, and convert to beats.
*/
for (x = note_length_map.begin(); x != note_length_map.end(); ++x) {
for (x = note_length_map.begin (); x != note_length_map.end (); ++x) {
if (x->second == text) {
break;
}
}
if (x != note_length_map.end()) {
if (x != note_length_map.end ()) {
bval = Temporal::Beats::ticks (x->first);
}
} else {
bval = Temporal::Beats();
bval = Temporal::Beats ();
if (text != x->second) {
/* get ticks for the newly selected
* note length
*/
for (x = note_length_map.begin(); x != note_length_map.end(); ++x) {
for (x = note_length_map.begin (); x != note_length_map.end (); ++x) {
if (x->second == text) {
break;
}
}
if (x != note_length_map.end()) {
if (x != note_length_map.end ()) {
/* convert to beats */
bval = Temporal::Beats::ticks (x->first);
}
@ -711,7 +700,7 @@ MidiListEditor::edited (const std::string& path, const std::string& text)
}
if (bval) {
delta = bval - note->length();
delta = bval - note->length ();
prop = MidiModel::NoteDiffCommand::Length;
opname = _("change note length");
apply = true;
@ -723,29 +712,27 @@ MidiListEditor::edited (const std::string& path, const std::string& text)
}
if (apply) {
std::shared_ptr<MidiModel> m (region->midi_source(0)->model());
std::shared_ptr<MidiModel> m (region->midi_source (0)->model ());
MidiModel::NoteDiffCommand* cmd = m->new_note_diff_command (opname);
TreeView::Selection::ListHandle_Path rows = view.get_selection()->get_selected_rows ();
TreeView::Selection::ListHandle_Path rows = view.get_selection ()->get_selected_rows ();
for (TreeView::Selection::ListHandle_Path::iterator i = rows.begin(); i != rows.end(); ++i) {
for (TreeView::Selection::ListHandle_Path::iterator i = rows.begin (); i != rows.end (); ++i) {
if ((iter = model->get_iter (*i))) {
note = (*iter)[columns._note];
switch (prop) {
case MidiModel::NoteDiffCommand::Velocity:
cmd->change (note, prop, (uint8_t) (note->velocity() + idelta));
cmd->change (note, prop, (uint8_t) (note->velocity () + idelta));
break;
case MidiModel::NoteDiffCommand::Length:
cmd->change (note, prop, note->length() + delta);
cmd->change (note, prop, note->length () + delta);
break;
case MidiModel::NoteDiffCommand::Channel:
cmd->change (note, prop, (uint8_t) (note->channel() + idelta));
cmd->change (note, prop, (uint8_t) (note->channel () + idelta));
break;
case MidiModel::NoteDiffCommand::NoteNumber:
cmd->change (note, prop, (uint8_t) (note->note() + idelta));
cmd->change (note, prop, (uint8_t) (note->note () + idelta));
break;
default:
continue;
@ -773,45 +760,44 @@ MidiListEditor::edited (const std::string& path, const std::string& text)
void
MidiListEditor::redisplay_model ()
{
view.set_model (Glib::RefPtr<Gtk::ListStore>(0));
view.set_model (Glib::RefPtr<Gtk::ListStore> (0));
model->clear ();
if (_session) {
std::shared_ptr<MidiModel> m (region->midi_source(0)->model());
std::shared_ptr<MidiModel> m (region->midi_source (0)->model ());
TreeModel::Row row;
stringstream ss;
MidiModel::Notes::const_iterator i = m->note_lower_bound (region->start().beats());
Temporal::Beats end_time = (region->start() + region->length()).beats();
MidiModel::Notes::const_iterator i = m->note_lower_bound (region->start ().beats ());
Temporal::Beats end_time = (region->start () + region->length ()).beats ();
for (; i != m->notes().end() && (*i)->time() < end_time; ++i) {
row = *(model->append());
row[columns.channel] = (*i)->channel() + 1;
row[columns.note_name] = ParameterDescriptor::midi_note_name ((*i)->note());
row[columns.note] = (*i)->note();
row[columns.velocity] = (*i)->velocity();
for (; i != m->notes ().end () && (*i)->time () < end_time; ++i) {
row = *(model->append ());
row[columns.channel] = (*i)->channel () + 1;
row[columns.note_name] = ParameterDescriptor::midi_note_name ((*i)->note ());
row[columns.note] = (*i)->note ();
row[columns.velocity] = (*i)->velocity ();
Temporal::BBT_Time bbt = Temporal::TempoMap::use()->bbt_at ((region->position() + timepos_t ((*i)->time())).earlier (region->start()));
Temporal::BBT_Time bbt = Temporal::TempoMap::use ()->bbt_at ((region->position () + timepos_t ((*i)->time ())).earlier (region->start ()));
ss.str ("");
ss << bbt;
row[columns.start] = ss.str();
row[columns.start] = ss.str ();
bbt.bars = 0;
const Temporal::Beats dur = (*i)->end_time() - (*i)->time();
const Temporal::Beats dur = (*i)->end_time () - (*i)->time ();
bbt.beats = dur.get_beats ();
bbt.ticks = dur.get_ticks ();
uint64_t len_ticks = (*i)->length().to_ticks();
std::map<int,string>::iterator x = note_length_map.find (len_ticks);
uint64_t len_ticks = (*i)->length ().to_ticks ();
std::map<int, string>::iterator x = note_length_map.find (len_ticks);
if (x != note_length_map.end()) {
if (x != note_length_map.end ()) {
row[columns.length] = x->second;
} else {
ss.str ("");
ss << len_ticks;
row[columns.length] = ss.str();
row[columns.length] = ss.str ();
}
row[columns._note] = (*i);
@ -824,18 +810,18 @@ MidiListEditor::redisplay_model ()
void
MidiListEditor::selection_changed ()
{
if (!UIConfiguration::instance().get_sound_midi_notes()) {
if (!UIConfiguration::instance ().get_sound_midi_notes ()) {
return;
}
TreeModel::Path path;
TreeModel::iterator iter;
std::shared_ptr<NoteType> note;
TreeView::Selection::ListHandle_Path rows = view.get_selection()->get_selected_rows ();
TreeView::Selection::ListHandle_Path rows = view.get_selection ()->get_selected_rows ();
NotePlayer* player = new NotePlayer (track);
for (TreeView::Selection::ListHandle_Path::iterator i = rows.begin(); i != rows.end(); ++i) {
for (TreeView::Selection::ListHandle_Path::iterator i = rows.begin (); i != rows.end (); ++i) {
if ((iter = model->get_iter (*i))) {
note = (*iter)[columns._note];
player->add (note);

20
gtk2_ardour/midi_list_editor.h
View File

@ -20,18 +20,18 @@
#ifndef __ardour_gtk2_midi_list_editor_h_
#define __ardour_gtk2_midi_list_editor_h_
#include <gtkmm/treeview.h>
#include <gtkmm/table.h>
#include <gtkmm/box.h>
#include <gtkmm/liststore.h>
#include <gtkmm/scrolledwindow.h>
#include <gtkmm/table.h>
#include <gtkmm/treeview.h>
#include "ardour/session_handle.h"
#include "ardour_window.h"
namespace Evoral {
template<typename Time> class Note;
template <typename Time> class Note;
};
namespace ARDOUR {
@ -46,14 +46,14 @@ class MidiListEditor : public ArdourWindow
public:
typedef Evoral::Note<Temporal::Beats> NoteType;
MidiListEditor(ARDOUR::Session*, std::shared_ptr<ARDOUR::MidiRegion>,
MidiListEditor (ARDOUR::Session*, std::shared_ptr<ARDOUR::MidiRegion>,
std::shared_ptr<ARDOUR::MidiTrack>);
~MidiListEditor();
~MidiListEditor ();
private:
struct MidiListModelColumns : public Gtk::TreeModel::ColumnRecord
struct MidiListModelColumns : public Gtk::TreeModel::ColumnRecord {
MidiListModelColumns ()
{
MidiListModelColumns() {
add (channel);
add (note);
add (note_name);
@ -68,12 +68,12 @@ private:
Gtk::TreeModelColumn<uint8_t> velocity;
Gtk::TreeModelColumn<std::string> start;
Gtk::TreeModelColumn<std::string> length;
Gtk::TreeModelColumn<std::shared_ptr<NoteType> > _note;
Gtk::TreeModelColumn<std::shared_ptr<NoteType>> _note;
};
struct NoteLengthColumns : public Gtk::TreeModel::ColumnRecord
struct NoteLengthColumns : public Gtk::TreeModel::ColumnRecord {
NoteLengthColumns ()
{
NoteLengthColumns() {
add (ticks);
add (name);
}