allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

remove unused "zoom range clock" from code as part of zoom simplifications

Browse Source
This commit is contained in:
Paul Davis
2014-07-02 14:56:36 -04:00
parent 976f006cc0
commit 4c79d35838
2 changed files with 0 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
gtk2_ardour/editor.cc
View File

@@ -264,7 +264,6 @@ Editor::Editor ()
/* tool bar related */
, zoom_range_clock (new AudioClock (X_("zoomrange"), false, X_("zoom range"), true, false, true))
, toolbar_selection_clock_table (2,3)
, _mouse_mode_tearoff (0)
, automation_mode_button (_("mode"))
@@ -394,8 +393,6 @@ Editor::Editor ()
_scroll_callbacks = 0;
zoom_range_clock->ValueChanged.connect (sigc::mem_fun(*this, &Editor::zoom_adjustment_changed));
bbt_label.set_name ("EditorRulerLabel");
bbt_label.set_size_request (-1, (int)timebar_height);
bbt_label.set_alignment (1.0, 0.5);
@@ -920,23 +917,6 @@ Editor::instant_save ()
}
}
void
Editor::zoom_adjustment_changed ()
{
if (_session == 0) {
return;
}
framecnt_t fpu = llrintf (zoom_range_clock->current_duration() / _visible_canvas_width);
bool clamped = clamp_samples_per_pixel (fpu);
if (clamped) {
zoom_range_clock->set ((framepos_t) floor (fpu * _visible_canvas_width));
}
temporal_zoom (fpu);
}
void
Editor::control_vertical_zoom_in_all ()
{
@@ -1254,7 +1234,6 @@ Editor::set_session (Session *t)
return;
}
zoom_range_clock->set_session (_session);
_playlist_selector->set_session (_session);
nudge_clock->set_session (_session);
_summary->set_session (_session);
@@ -4202,14 +4181,6 @@ Editor::set_samples_per_pixel (framecnt_t spp)
tempo_lines->tempo_map_changed();
}
/* convert fpu to frame count */
framepos_t frames = samples_per_pixel * _visible_canvas_width;
if (samples_per_pixel != zoom_range_clock->current_duration()) {
zoom_range_clock->set (frames);
}
bool const showing_time_selection = selection->time.length() > 0;
if (showing_time_selection && selection->time.start () != selection->time.end_frame ()) {
@@ -5322,7 +5293,6 @@ Editor::session_going_away ()
}
track_views.clear ();
zoom_range_clock->set_session (0);
nudge_clock->set_session (0);
editor_list_button.set_active(false);

2
gtk2_ardour/editor.h
View File

@@ -1578,8 +1578,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
void editor_mixer_button_toggled ();
void editor_list_button_toggled ();
AudioClock* zoom_range_clock;
ArdourButton zoom_in_button;
ArdourButton zoom_out_button;
ArdourButton zoom_out_full_button;