diff options
| author | David Robillard <d@drobilla.net> | 2015-01-07 00:12:07 -0500 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2015-01-07 00:12:07 -0500 |
| commit | 2a251b457069ffb4b744fbd0dd7aca7acb31f381 (patch) | |
| tree | 4311e63fe7ef1b5d7a5b841a4dd0eb7b26b324a7 /gtk2_ardour/patch_change_dialog.cc | |
| parent | 4d202d9157bef5b6325fe54b7874080952f86a37 (diff) | |
MusicalTime => Beats.
Diffstat (limited to 'gtk2_ardour/patch_change_dialog.cc')
| -rw-r--r-- | gtk2_ardour/patch_change_dialog.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gtk2_ardour/patch_change_dialog.cc b/gtk2_ardour/patch_change_dialog.cc index 9072801c83..05cbaab459 100644 --- a/gtk2_ardour/patch_change_dialog.cc +++ b/gtk2_ardour/patch_change_dialog.cc @@ -41,12 +41,12 @@ using namespace Gtkmm2ext; /** @param tc If non-0, a time converter for this patch change. If 0, time control will be desensitized */ PatchChangeDialog::PatchChangeDialog ( - const ARDOUR::BeatsFramesConverter* tc, - ARDOUR::Session* session, - Evoral::PatchChange<Evoral::MusicalTime> const & patch, - ARDOUR::InstrumentInfo& info, - const Gtk::BuiltinStockID& ok, - bool allow_delete) + const ARDOUR::BeatsFramesConverter* tc, + ARDOUR::Session* session, + Evoral::PatchChange<Evoral::Beats> const & patch, + ARDOUR::InstrumentInfo& info, + const Gtk::BuiltinStockID& ok, + bool allow_delete) : ArdourDialog (_("Patch Change"), true) , _time_converter (tc) , _info (info) @@ -139,16 +139,16 @@ PatchChangeDialog::instrument_info_changed () fill_patch_combo (); } -Evoral::PatchChange<Evoral::MusicalTime> +Evoral::PatchChange<Evoral::Beats> PatchChangeDialog::patch () const { - Evoral::MusicalTime t = Evoral::MusicalTime(); + Evoral::Beats t = Evoral::Beats(); if (_time_converter) { t = _time_converter->from (_time.current_time ()); } - return Evoral::PatchChange<Evoral::MusicalTime> ( + return Evoral::PatchChange<Evoral::Beats> ( t, _channel.get_value_as_int() - 1, _program.get_value_as_int() - 1, |