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

add middle-clock-on-range/marker-clock to locate there 

git-svn-id: svn://localhost/ardour2/branches/3.0@10980 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-12-11 17:26:48 +00:00
parent 1b3b9633b0
commit 33f62360a2
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtk2_ardour/location_ui.cc
View File

@ -131,6 +131,7 @@ LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num)
start_to_playhead_button.signal_clicked().connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::to_playhead_button_pressed), LocStart));
start_clock.ValueChanged.connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::clock_changed), LocStart));
start_clock.signal_button_press_event().connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::locate_to_clock), &start_clock), false);
end_hbox.set_spacing (2);
end_hbox.pack_start (end_clock, false, false);
@ -138,6 +139,7 @@ LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num)
end_to_playhead_button.signal_clicked().connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::to_playhead_button_pressed), LocEnd));
end_clock.ValueChanged.connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::clock_changed), LocEnd));
end_clock.signal_button_press_event().connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::locate_to_clock), &end_clock), false);
length_clock.ValueChanged.connect (sigc::bind ( sigc::mem_fun(*this, &LocationEditRow::clock_changed), LocLength));
@ -237,6 +239,8 @@ LocationEditRow::set_location (Location *loc)
name_label.set_text (location->name());
name_label.set_size_request (80, -1);
remove_button.hide ();
if (!name_label.get_parent()) {
item_table.attach (name_label, 1, 2, 0, 1, FILL, FILL, 4, 0);
}
@ -402,6 +406,16 @@ LocationEditRow::to_playhead_button_pressed (LocationPart part)
}
}
bool
LocationEditRow::locate_to_clock (GdkEventButton* ev, AudioClock* clock)
{
if (Keyboard::is_button2_event (ev)) {
_session->request_locate (clock->current_time());
return true;
}
return false;
}
void
LocationEditRow::clock_changed (LocationPart part)
{

1
gtk2_ardour/location_ui.h
View File

@ -118,6 +118,7 @@ class LocationEditRow : public Gtk::HBox, public ARDOUR::SessionHandlePtr
void to_playhead_button_pressed (LocationPart part);
void clock_changed (LocationPart part);
bool locate_to_clock (GdkEventButton*, AudioClock*);
void cd_toggled ();
void hide_toggled ();