diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-18 12:39:17 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-18 12:39:17 -0400 |
| commit | 30b087ab3d28f1585987fa3f6ae006562ae192e3 (patch) | |
| tree | 620ae0250b5d77f90a18f8c2b83be61e4fe7b0b5 /gtk2_ardour/midi_time_axis.cc | |
| parent | cb956e3e480716a3efd280a5287bdd7bee1cedc5 (diff) | |
globally change all use of "frame" to refer to audio into "sample".
Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode
and video in order to keep the legible
Diffstat (limited to 'gtk2_ardour/midi_time_axis.cc')
| -rw-r--r-- | gtk2_ardour/midi_time_axis.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc index 91cf2b9544..6dfc770a03 100644 --- a/gtk2_ardour/midi_time_axis.cc +++ b/gtk2_ardour/midi_time_axis.cc @@ -1330,10 +1330,10 @@ MidiTimeAxisView::update_control_names () if (selected()) { controls_ebox.set_name (controls_base_selected_name); - time_axis_frame.set_name (controls_base_selected_name); + time_axis_sample.set_name (controls_base_selected_name); } else { controls_ebox.set_name (controls_base_unselected_name); - time_axis_frame.set_name (controls_base_unselected_name); + time_axis_sample.set_name (controls_base_unselected_name); } } @@ -1535,10 +1535,10 @@ MidiTimeAxisView::automation_child_menu_item (Evoral::Parameter param) } boost::shared_ptr<MidiRegion> -MidiTimeAxisView::add_region (framepos_t f, framecnt_t length, bool commit) +MidiTimeAxisView::add_region (samplepos_t f, samplecnt_t length, bool commit) { Editor* real_editor = dynamic_cast<Editor*> (&_editor); - MusicFrame pos (f, 0); + MusicSample pos (f, 0); if (commit) { real_editor->begin_reversible_command (Operations::create_region); @@ -1556,8 +1556,8 @@ MidiTimeAxisView::add_region (framepos_t f, framecnt_t length, bool commit) boost::shared_ptr<Region> region = (RegionFactory::create (src, plist)); /* sets beat position */ - region->set_position (pos.frame, pos.division); - playlist()->add_region (region, pos.frame, 1.0, false, pos.division); + region->set_position (pos.sample, pos.division); + playlist()->add_region (region, pos.sample, 1.0, false, pos.division); _session->add_command (new StatefulDiffCommand (playlist())); if (commit) { @@ -1632,7 +1632,7 @@ MidiTimeAxisView::contents_height_changed () } bool -MidiTimeAxisView::paste (framepos_t pos, const Selection& selection, PasteContext& ctx, const int32_t sub_num) +MidiTimeAxisView::paste (samplepos_t pos, const Selection& selection, PasteContext& ctx, const int32_t sub_num) { if (!_editor.internal_editing()) { // Non-internal paste, paste regions like any other route |