ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Add/edit tempo/meter change at right position with 'delta to edit cursor' 

Find the absolute position of the main clock when 'display delta to edit
cursor' is set when adding/editing tempo/meter changes from the context
menu.
This commit is contained in:
Colin Fletcher 2015-02-07 23:22:59 +00:00
parent 24e8e865a6
commit ecd265222a
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gtk2_ardour/audio_clock.h
View File

@ -96,6 +96,7 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr
protected:
void render (cairo_t*, cairo_rectangle_t*);
bool get_is_duration () const { return is_duration; } ;
virtual void build_ops_menu ();
Gtk::Menu *ops_menu;

21
gtk2_ardour/main_clock.cc
View File

@ -73,6 +73,17 @@ MainClock::build_ops_menu ()
ops_items.push_back (MenuElem (_("Insert Meter Change"), sigc::mem_fun(*this, &MainClock::insert_new_meter)));
}
framepos_t
MainClock::absolute_time () const
{
if (get_is_duration ()) {
// delta to edit cursor
return current_time () + PublicEditor::instance().get_preferred_edit_position (true);
} else {
return current_time ();
}
}
void
MainClock::display_delta_to_edit_cursor ()
{
@ -86,27 +97,27 @@ MainClock::display_delta_to_edit_cursor ()
void
MainClock::edit_current_tempo ()
{
ARDOUR::TempoSection ts = PublicEditor::instance().session()->tempo_map().tempo_section_at(current_time());
ARDOUR::TempoSection ts = PublicEditor::instance().session()->tempo_map().tempo_section_at (absolute_time());
PublicEditor::instance().edit_tempo_section (&ts);
}
void
MainClock::edit_current_meter ()
{
ARDOUR::Meter m = PublicEditor::instance().session()->tempo_map().meter_at(current_time());
ARDOUR::MeterSection ms(current_time(), m.divisions_per_bar(), m.note_divisor());
ARDOUR::Meter m = PublicEditor::instance().session()->tempo_map().meter_at (absolute_time());
ARDOUR::MeterSection ms (absolute_time(), m.divisions_per_bar(), m.note_divisor());
PublicEditor::instance().edit_meter_section (&ms);
}
void
MainClock::insert_new_tempo ()
{
PublicEditor::instance().mouse_add_new_tempo_event (current_time ());
PublicEditor::instance().mouse_add_new_tempo_event (absolute_time ());
}
void
MainClock::insert_new_meter ()
{
PublicEditor::instance().mouse_add_new_meter_event (current_time ());
PublicEditor::instance().mouse_add_new_meter_event (absolute_time ());
}

1
gtk2_ardour/main_clock.h
View File

@ -38,5 +38,6 @@ private:
void edit_current_meter ();
void insert_new_tempo ();
void insert_new_meter ();
framepos_t absolute_time () const;
bool _primary;
};