smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-11 17:16:38 +01:00
Code Issues Projects Releases Wiki Activity

cleaner version of previous commit

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7783 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-09-15 16:54:17 +00:00
parent 5f948f6961
commit 7eea9fac9d
3 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gtk2_ardour/editor_drag.cc
View file

@ -3715,21 +3715,15 @@ NoteDrag::motion (GdkEvent *, bool)
double const tdy = dy * _note_height - _cumulative_dy; double const tdy = dy * _note_height - _cumulative_dy;
if (tdx || tdy) { if (tdx || tdy) {
_region->move_selection (tdx, tdy);
_cumulative_dx += tdx; _cumulative_dx += tdx;
_cumulative_dy += tdy; _cumulative_dy += tdy;
_region->move_selection (tdx, tdy, _cumulative_dy);
char buf[12]; char buf[12];
snprintf (buf, sizeof (buf), "%s (%d)", Evoral::midi_note_name (_primary->note()->note() + dy).c_str(), snprintf (buf, sizeof (buf), "%s (%d)", Evoral::midi_note_name (_primary->note()->note() + dy).c_str(),
(int) floor (_primary->note()->note() + dy)); (int) floor (_primary->note()->note() + dy));
if (dy) {
boost::shared_ptr<Evoral::Note<Evoral::MusicalTime> >
moved_note (new Evoral::Note<Evoral::MusicalTime> (*(_primary->note())));
moved_note->set_note (moved_note->note() + dy);
_region->play_midi_note (moved_note);
}
_editor->show_verbose_canvas_cursor_with (buf); _editor->show_verbose_canvas_cursor_with (buf);
} }
} }

19
gtk2_ardour/midi_region_view.cc
View file

@ -1316,7 +1316,10 @@ MidiRegionView::play_midi_note(boost::shared_ptr<NoteType> note)
} }
RouteUI* route_ui = dynamic_cast<RouteUI*> (&trackview); RouteUI* route_ui = dynamic_cast<RouteUI*> (&trackview);
assert(route_ui);
if (!route_ui || !route_ui->midi_track()) {
return;
}
route_ui->midi_track()->write_immediate_event( route_ui->midi_track()->write_immediate_event(
note->on_event().size(), note->on_event().buffer()); note->on_event().size(), note->on_event().buffer());
@ -1337,7 +1340,10 @@ bool
MidiRegionView::play_midi_note_off(boost::shared_ptr<NoteType> note) MidiRegionView::play_midi_note_off(boost::shared_ptr<NoteType> note)
{ {
RouteUI* route_ui = dynamic_cast<RouteUI*> (&trackview); RouteUI* route_ui = dynamic_cast<RouteUI*> (&trackview);
assert(route_ui);
if (!route_ui || !route_ui->midi_track()) {
return false;
}
route_ui->midi_track()->write_immediate_event( route_ui->midi_track()->write_immediate_event(
note->off_event().size(), note->off_event().buffer()); note->off_event().size(), note->off_event().buffer());
@ -1953,10 +1959,17 @@ MidiRegionView::add_to_selection (CanvasNoteEvent* ev)
} }
void void
MidiRegionView::move_selection(double dx, double dy) MidiRegionView::move_selection(double dx, double dy, double cumulative_dy)
{ {
for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) { for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
(*i)->move_event(dx, dy); (*i)->move_event(dx, dy);
if (dy) {
boost::shared_ptr<NoteType>
moved_note (new NoteType (*((*i)->note())));
moved_note->set_note (moved_note->note() + cumulative_dy);
play_midi_note (moved_note);
}
} }
} }

3
gtk2_ardour/midi_region_view.h
View file

@ -199,7 +199,7 @@ class MidiRegionView : public RegionView
void delete_note (boost::shared_ptr<NoteType>); void delete_note (boost::shared_ptr<NoteType>);
size_t selection_size() { return _selection.size(); } size_t selection_size() { return _selection.size(); }
void move_selection(double dx, double dy); void move_selection(double dx, double dy, double cumulative_dy);
void note_dropped (ArdourCanvas::CanvasNoteEvent* ev, ARDOUR::frameoffset_t, int8_t d_note); void note_dropped (ArdourCanvas::CanvasNoteEvent* ev, ARDOUR::frameoffset_t, int8_t d_note);
void select_matching_notes (uint8_t notenum, uint16_t channel_mask, bool add, bool extend); void select_matching_notes (uint8_t notenum, uint16_t channel_mask, bool add, bool extend);
@ -303,7 +303,6 @@ class MidiRegionView : public RegionView
private: private:
friend class EditNoteDialog; friend class EditNoteDialog;
friend class NoteDrag;
/** Play the NoteOn event of the given note immediately /** Play the NoteOn event of the given note immediately
* and schedule the playback of the corresponding NoteOff event. * and schedule the playback of the corresponding NoteOff event.