diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2015-04-20 15:10:41 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-04-20 15:10:41 -0400 |
| commit | ced4378d0914bcfb926267772c45d1d23f3bed38 (patch) | |
| tree | e31875d77bf2742cd8684b3a9f02d1b2d7c98967 /gtk2_ardour/note_player.h | |
| parent | 6dea7ebfb0bb66fa58b353467724a90805fb7a47 (diff) | |
| parent | 00f06ca9e91470f92d8f6d5ef83cbae069904f51 (diff) | |
Merge branch 'master' into saveas
Conflicts:
gtk2_ardour/ardour.menus.in
libs/ardour/session_state.cc
Diffstat (limited to 'gtk2_ardour/note_player.h')
| -rw-r--r-- | gtk2_ardour/note_player.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk2_ardour/note_player.h b/gtk2_ardour/note_player.h index 4a1df8c319..9127842732 100644 --- a/gtk2_ardour/note_player.h +++ b/gtk2_ardour/note_player.h @@ -31,7 +31,7 @@ namespace ARDOUR { class NotePlayer : public sigc::trackable { public: - typedef Evoral::Note<Evoral::MusicalTime> NoteType; + typedef Evoral::Note<Evoral::Beats> NoteType; NotePlayer (boost::shared_ptr<ARDOUR::MidiTrack>); ~NotePlayer (); |