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

tidy up MIDI list editor; make delete/backspace actually delete notes, and make Primary-z and Primary-r do the undo thing

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@11397 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-01-31 03:03:13 +00:00
parent e023de6da5
commit 737f91174f
2 changed files with 41 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
gtk2_ardour/midi_list_editor.cc
View File

@ -28,6 +28,9 @@
#include "ardour/session.h" #include "ardour/session.h"
#include "ardour/tempo.h" #include "ardour/tempo.h"
#include "gtkmm2ext/gui_thread.h"
#include "gtkmm2ext/keyboard.h"
#include "midi_list_editor.h" #include "midi_list_editor.h"
#include "i18n.h" #include "i18n.h"
@ -63,8 +66,8 @@ MidiListEditor::MidiListEditor (Session* s, boost::shared_ptr<MidiRegion> r)
view.append_column (_("Length"), columns.length); view.append_column (_("Length"), columns.length);
view.append_column (_("End"), columns.end); view.append_column (_("End"), columns.end);
view.set_headers_visible (true); view.set_headers_visible (true);
view.set_name (X_("MidiListView"));
view.set_rules_hint (true); view.set_rules_hint (true);
view.get_selection()->set_mode (SELECTION_MULTIPLE);
for (int i = 0; i < 6; ++i) { for (int i = 0; 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));
@ -80,11 +83,14 @@ MidiListEditor::MidiListEditor (Session* s, boost::shared_ptr<MidiRegion> r)
redisplay_model (); redisplay_model ();
region->midi_source(0)->model()->ContentsChanged.connect (content_connection, invalidator (*this),
boost::bind (&MidiListEditor::redisplay_model, this), gui_context());
view.show (); view.show ();
scroller.show (); scroller.show ();
add (scroller); add (scroller);
set_size_request (400, 400); set_size_request (-1, 400);
} }
MidiListEditor::~MidiListEditor () MidiListEditor::~MidiListEditor ()
@ -111,6 +117,7 @@ MidiListEditor::key_press (GdkEventKey* ev)
break; break;
case GDK_Escape: case GDK_Escape:
break; break;
} }
} }
@ -124,9 +131,22 @@ MidiListEditor::key_release (GdkEventKey* ev)
switch (ev->keyval) { switch (ev->keyval) {
case GDK_Delete: case GDK_Delete:
case GDK_BackSpace:
delete_selected_note (); delete_selected_note ();
ret = true; ret = true;
break; break;
case GDK_z:
if (_session && Gtkmm2ext::Keyboard::modifier_state_contains (ev->state, Gtkmm2ext::Keyboard::PrimaryModifier)) {
_session->undo (1);
}
break;
case GDK_r:
if (_session && Gtkmm2ext::Keyboard::modifier_state_contains (ev->state, Gtkmm2ext::Keyboard::PrimaryModifier)) {
_session->redo (1);
}
break;
default: default:
break; break;
} }
@ -144,16 +164,26 @@ MidiListEditor::delete_selected_note ()
return; return;
} }
TreeView::Selection::ListHandle_Path::iterator i = rows.begin(); typedef vector<boost::shared_ptr<NoteType> > Notes;
TreeIter iter; Notes to_delete;
/* selection mode is single, so rows.begin() is it */ for (TreeView::Selection::ListHandle_Path::iterator i = rows.begin(); i != rows.end(); ++i) {
TreeIter iter;
if ((iter = model->get_iter (*i))) { if ((iter = model->get_iter (*i))) {
boost::shared_ptr<NoteType> note = (*iter)[columns._note]; boost::shared_ptr<NoteType> note = (*iter)[columns._note];
cerr << "Would have deleted " << *note << endl; to_delete.push_back (note);
}
} }
boost::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) {
cmd->remove (*i);
}
m->apply_command (*_session, cmd);
} }
void void

3
gtk2_ardour/midi_list_editor.h
View File

@ -77,6 +77,9 @@ class MidiListEditor : public ArdourWindow
boost::shared_ptr<ARDOUR::MidiRegion> region; boost::shared_ptr<ARDOUR::MidiRegion> region;
/** connection used to connect to model's ContentChanged signal */
PBD::ScopedConnection content_connection;
void edited (const std::string&, const std::string&); void edited (const std::string&, const std::string&);
void editing_started (Gtk::CellEditable*, const std::string& path, int); void editing_started (Gtk::CellEditable*, const std::string& path, int);
void editing_canceled (); void editing_canceled ();