ardour/livetrax
13
0
Fork 0
Code

NO-OP: clean up whitespace, separate methods

Browse Source
This commit is contained in:
Robin Gareus 2018-07-27 00:25:01 +02:00
parent 0883f02de9
commit 232096bcb2
2 changed files with 80 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
gtk2_ardour/editor.cc
View File

@ -2208,35 +2208,9 @@ Editor::snap_mode() const
} }
void void
Editor::set_grid_to (GridType gt) Editor::show_rulers_for_grid ()
{ {
if (_grid_type == gt) { // already set /* show appropriate rulers for this grid setting. */
return;
}
unsigned int grid_ind = (unsigned int)gt;
if (internal_editing() && UIConfiguration::instance().get_grid_follows_internal()) {
internal_grid_type = gt;
} else {
pre_internal_grid_type = gt;
}
_grid_type = gt;
if (grid_ind > grid_type_strings.size() - 1) {
grid_ind = 0;
_grid_type = (GridType)grid_ind;
}
string str = grid_type_strings[grid_ind];
if (str != grid_type_selector.get_text()) {
grid_type_selector.set_text (str);
}
/* show appropriate rulers for this grid setting.
*/
if (grid_musical()) { if (grid_musical()) {
ruler_tempo_action->set_active(true); ruler_tempo_action->set_active(true);
ruler_meter_action->set_active(true); ruler_meter_action->set_active(true);
@ -2279,6 +2253,37 @@ Editor::set_grid_to (GridType gt)
ruler_samples_action->set_active(false); ruler_samples_action->set_active(false);
} }
} }
}
void
Editor::set_grid_to (GridType gt)
{
if (_grid_type == gt) { // already set
return;
}
unsigned int grid_ind = (unsigned int)gt;
if (internal_editing() && UIConfiguration::instance().get_grid_follows_internal()) {
internal_grid_type = gt;
} else {
pre_internal_grid_type = gt;
}
_grid_type = gt;
if (grid_ind > grid_type_strings.size() - 1) {
grid_ind = 0;
_grid_type = (GridType)grid_ind;
}
string str = grid_type_strings[grid_ind];
if (str != grid_type_selector.get_text()) {
grid_type_selector.set_text (str);
}
show_rulers_for_grid ();
instant_save (); instant_save ();

3
gtk2_ardour/editor.h
View File

@ -915,8 +915,7 @@ private:
bool ruler_label_button_release (GdkEventButton*); bool ruler_label_button_release (GdkEventButton*);
void store_ruler_visibility (); void store_ruler_visibility ();
void restore_ruler_visibility (); void restore_ruler_visibility ();
void show_rulers_for_grid ();
enum MinsecRulerScale { enum MinsecRulerScale {
minsec_show_msecs, minsec_show_msecs,