LADI
/
ardour
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no more edit point clock (except SAE version, but who knows why or even if) 

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@5928 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2009-10-26 20:08:32 +00:00
parent 9a5828e27a
commit c89c77c8c3
4 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/editor.cc
View File

@ -3046,7 +3046,9 @@ Editor::setup_toolbar ()
edit_point_selector.signal_changed().connect (mem_fun(*this, &Editor::edit_point_selection_done));
ARDOUR_UI::instance()->tooltips().set_tip (edit_point_selector, _("Edit point"));
snap_box.pack_start (edit_point_clock, false, false);
if (Profile->get_sae()) {
snap_box.pack_start (edit_point_clock, false, false);
}
snap_box.pack_start (snap_mode_selector, false, false);
snap_box.pack_start (snap_type_selector, false, false);
snap_box.pack_start (edit_point_selector, false, false);

6
gtk2_ardour/editor_markers.cc
View File

@ -1214,12 +1214,14 @@ Editor::marker_selection_changed ()
(*x)->show_line ();
}
edit_point_clock.set (selection->markers.front()->position());
if (Profile->get_sae()) {
edit_point_clock.set (selection->markers.front()->position());
}
bool ignored;
Location* loc = find_location_from_marker (selection->markers.front(), ignored);
if (loc) {
if (loc && Profile->get_sae()) {
edit_point_clock_connection_a = loc->changed.connect (mem_fun (*this, &Editor::selected_marker_moved));
edit_point_clock_connection_b = loc->start_changed.connect (mem_fun (*this, &Editor::selected_marker_moved));
}

4
gtk2_ardour/editor_mouse.cc
View File

@ -2627,7 +2627,9 @@ Editor::marker_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
abort();
}
edit_point_clock.set (drag_info.copied_locations.front()->start());
if (Profile->get_sae()) {
edit_point_clock.set (drag_info.copied_locations.front()->start());
}
show_verbose_time_cursor (newframe, 10);
#ifdef GTKOSX

11
gtk2_ardour/mixer_ui.cc
View File

@ -787,16 +787,7 @@ Mixer_UI::set_auto_rebinding( bool val )
void
Mixer_UI::toggle_auto_rebinding()
{
if (auto_rebinding)
{
set_auto_rebinding( FALSE );
}
else
{
set_auto_rebinding( TRUE );
}
set_auto_rebinding (!auto_rebinding);
auto_rebind_midi_controls();
}