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

MusicalTime => Beats.

Browse source
This commit is contained in:
David Robillard 2015-01-07 00:12:07 -05:00
parent 4d202d9157
commit 2a251b4570
66 changed files with 625 additions and 584 deletions
Download patch file Download diff file Expand all files Collapse all files

18
gtk2_ardour/patch_change_dialog.cc
View file

@ -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,