smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-24 07:27:44 +01:00
Code Issues Projects Releases Wiki Activity

[Summary]: add check of max/min value of temporal zoom tool

Browse source
This commit is contained in:
YPozdnyakov 2015-02-09 15:37:02 +02:00
parent b6edf1a870
commit b59990cdf2
2 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/editor.h
View file

@ -2203,6 +2203,8 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
void midi_output_chosen (WavesDropdown*, int);
void populate_midi_inout_dropdowns ();
void populate_midi_inout_dropdown (bool playback);
int64_t get_zoom_from_temporal_adjustment_value (double);
Gtk::Image& midi_marker_input_activity_image;
Gtk::Image& midi_marker_output_activity_image;

18
gtk2_ardour/editor_ops.cc
View file

@ -1858,8 +1858,12 @@ Editor::temporal_zoom_to_frame (bool coarser, framepos_t frame)
range_before /= 2;
}
if (new_spp == 0) {
int64_t upper_value_spp = get_zoom_from_temporal_adjustment_value (_temporal_zoom_adjustment.get_upper ());
int64_t lower_value_spp = get_zoom_from_temporal_adjustment_value (_temporal_zoom_adjustment.get_lower ());
if (new_spp > upper_value_spp || new_spp < lower_value_spp) {
// we shouldn't change temporal zoom value
// if we out of range
return;
}
@ -1881,6 +1885,12 @@ Editor::temporal_zoom_to_frame (bool coarser, framepos_t frame)
reposition_and_zoom (new_leftmost, new_spp);
}
int64_t
Editor::get_zoom_from_temporal_adjustment_value (double temporal_adjustment_value)
{
return (int64_t)(pow (2.0f, (int)temporal_adjustment_value) + 0.001);
}
void
Editor::temporal_zoom_by_slider ()
{
@ -1890,8 +1900,8 @@ Editor::temporal_zoom_by_slider ()
_zoom_tool_was_used = false;
return ;
}
double value = _temporal_zoom_adjustment.get_value();
int64_t spp = (int64_t)(pow (2.0f, (int)value) + 0.001);
int64_t spp = get_zoom_from_temporal_adjustment_value (_temporal_zoom_adjustment.get_value ());
set_zoom_focus (ZoomFocusPlayhead);
temporal_zoom (spp);
}