diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-05-02 20:21:54 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-05-02 20:21:54 -0400 |
| commit | e2f0c5f91e2579c41d8efc9495b6ebac31a61ba3 (patch) | |
| tree | b8a15778c018df9c3615d7a1b0d6cc41dfef6626 /gtk2_ardour/edit_note_dialog.h | |
| parent | c358e77e1e81a68fcb8b18cd71a31c38262b2af7 (diff) | |
| parent | 3973ce81b37a9ba6fcd2e7ff95ca730b0aa32252 (diff) | |
merge resolution with master
Diffstat (limited to 'gtk2_ardour/edit_note_dialog.h')
| -rw-r--r-- | gtk2_ardour/edit_note_dialog.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/edit_note_dialog.h b/gtk2_ardour/edit_note_dialog.h index 11fd70a91c..59e53722a0 100644 --- a/gtk2_ardour/edit_note_dialog.h +++ b/gtk2_ardour/edit_note_dialog.h @@ -28,11 +28,11 @@ class NoteBase; class EditNoteDialog : public ArdourDialog { public: - EditNoteDialog (MidiRegionView *, std::set<NoteBase*>); + EditNoteDialog (MidiRegionView* rv, set<NoteBase*> n); - int run (); - -private: + void done (int); + + private: MidiRegionView* _region_view; std::set<NoteBase*> _events; Gtk::SpinButton _channel; |