diff options
| author | Carl Hetherington <carl@carlh.net> | 2009-05-14 00:13:27 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2009-05-14 00:13:27 +0000 |
| commit | 015fc7b39fab97cee1875231694adce43155ceb5 (patch) | |
| tree | 76dded18cc9441e7325af999358ab3a3235cdb1e /gtk2_ardour/editor_rulers.cc | |
| parent | 0569107ddc0d2a8df6ca0a2c8cc16ebe8f3dee99 (diff) | |
First stage of options rework.
- Split Configuration into RCConfiguration and SessionConfiguration;
the first for options which are saved to .rc files and the second
for options which are saved in a session file.
- Move some options from the old `master' Configuration object into
SessionConfiguration; this needs more refinement.
- Reflect many RCConfiguration options in an expanded Edit->Preferences
dialog; my intention is to remove the corresponding menu items
eventually.
git-svn-id: svn://localhost/ardour2/branches/3.0@5075 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_rulers.cc')
| -rw-r--r-- | gtk2_ardour/editor_rulers.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index 0998b86bd9..4daf57d3ae 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/gtk2_ardour/editor_rulers.cc @@ -988,7 +988,7 @@ Editor::set_smpte_ruler_scale (gdouble lower, gdouble upper) if (range < (2 * session->frames_per_smpte_frame())) { /* 0 - 2 frames */ smpte_ruler_scale = smpte_show_bits; smpte_mark_modulo = 20; - smpte_nmarks = 2 + (2 * Config->get_subframes_per_frame()); + smpte_nmarks = 2 + (2 * session->config.get_subframes_per_frame()); } else if (range <= (fr / 4)) { /* 2 frames - 0.250 second */ smpte_ruler_scale = smpte_show_frames; smpte_mark_modulo = 1; @@ -1111,7 +1111,7 @@ Editor::metric_get_smpte (GtkCustomRulerMark **marks, gdouble lower, gdouble upp (*marks)[n].position = pos; // Increment subframes by one - SMPTE::increment_subframes( smpte ); + SMPTE::increment_subframes( smpte, session->config.get_subframes_per_frame() ); } break; case smpte_show_seconds: @@ -1138,7 +1138,7 @@ Editor::metric_get_smpte (GtkCustomRulerMark **marks, gdouble lower, gdouble upp } (*marks)[n].label = g_strdup (buf); - SMPTE::increment_seconds( smpte ); + SMPTE::increment_seconds( smpte, session->config.get_subframes_per_frame() ); } break; case smpte_show_minutes: @@ -1163,7 +1163,7 @@ Editor::metric_get_smpte (GtkCustomRulerMark **marks, gdouble lower, gdouble upp } (*marks)[n].label = g_strdup (buf); (*marks)[n].position = pos; - SMPTE::increment_minutes( smpte ); + SMPTE::increment_minutes( smpte, session->config.get_subframes_per_frame() ); } break; @@ -1186,7 +1186,7 @@ Editor::metric_get_smpte (GtkCustomRulerMark **marks, gdouble lower, gdouble upp (*marks)[n].label = g_strdup (buf); (*marks)[n].position = pos; - SMPTE::increment_hours( smpte ); + SMPTE::increment_hours( smpte, session->config.get_subframes_per_frame() ); } break; case smpte_show_frames: @@ -1212,7 +1212,7 @@ Editor::metric_get_smpte (GtkCustomRulerMark **marks, gdouble lower, gdouble upp } (*marks)[n].label = g_strdup (buf); - SMPTE::increment( smpte ); + SMPTE::increment( smpte, session->config.get_subframes_per_frame() ); } break; |