possible fix for stack overflow when parsing video info

[ardour.git] / gtk2_ardour / editor_tempodisplay.cc

diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index daf36d2d72e145cb0dac18ee2b8f7c11c17b12bb..4c2b40f1f0a0ea66380a279a0ed81ee5e5d7d231 100644 (file)
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -85,15 +85,15 @@ Editor::draw_metric_marks (const Metrics& metrics)
 
                if ((ms = dynamic_cast<const MeterSection*>(*i)) != 0) {
                        snprintf (buf, sizeof(buf), "%g/%g", ms->divisions_per_bar(), ms->note_divisor ());
-                       metric_marks.push_back (new MeterMarker (*this, *meter_group, ARDOUR_UI::config()->get_MeterMarker(), buf,
+                       metric_marks.push_back (new MeterMarker (*this, *meter_group, ARDOUR_UI::config()->color ("meter marker"), buf,
                                                                 *(const_cast<MeterSection*>(ms))));
                } else if ((ts = dynamic_cast<const TempoSection*>(*i)) != 0) {
-                       if (Config->get_allow_non_quarter_pulse()) {
+                       if (ARDOUR_UI::config()->get_allow_non_quarter_pulse()) {
                                snprintf (buf, sizeof (buf), "%.2f/%.0f", ts->beats_per_minute(), ts->note_type());
                        } else {
                                snprintf (buf, sizeof (buf), "%.2f", ts->beats_per_minute());
                        }
-                       metric_marks.push_back (new TempoMarker (*this, *tempo_group, ARDOUR_UI::config()->get_TempoMarker(), buf,
+                       metric_marks.push_back (new TempoMarker (*this, *tempo_group, ARDOUR_UI::config()->color ("tempo marker"), buf,
                                                                 *(const_cast<TempoSection*>(ts))));
                }
 
@@ -178,8 +178,9 @@ Editor::draw_measures (ARDOUR::TempoMap::BBTPointList::const_iterator& begin,
        if (tempo_lines == 0) {
                tempo_lines = new TempoLines (time_line_group, ArdourCanvas::LineSet::Vertical);
        }
-       
-       tempo_lines->draw (begin, end);
+
+       const unsigned divisions = get_grid_beat_divisions(leftmost_frame);
+       tempo_lines->draw (begin, end, divisions, leftmost_frame, _session->frame_rate());
 }
 
 void
@@ -195,8 +196,6 @@ Editor::mouse_add_new_tempo_event (framepos_t frame)
        //this causes compiz to display no border.
        //tempo_dialog.signal_realize().connect (sigc::bind (sigc::ptr_fun (set_decoration), &tempo_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
 
-       ensure_float (tempo_dialog);
-
        switch (tempo_dialog.run()) {
        case RESPONSE_ACCEPT:
                break;
@@ -237,8 +236,6 @@ Editor::mouse_add_new_meter_event (framepos_t frame)
        //this causes compiz to display no border..
        //meter_dialog.signal_realize().connect (sigc::bind (sigc::ptr_fun (set_decoration), &meter_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
 
-       ensure_float (meter_dialog);
-
        switch (meter_dialog.run ()) {
        case RESPONSE_ACCEPT:
                break;
@@ -289,8 +286,6 @@ Editor::edit_meter_section (MeterSection* section)
 {
        MeterDialog meter_dialog (*section, _("done"));
 
-       ensure_float (meter_dialog);
-
        switch (meter_dialog.run()) {
        case RESPONSE_ACCEPT:
                break;
@@ -319,8 +314,6 @@ Editor::edit_tempo_section (TempoSection* section)
 {
        TempoDialog tempo_dialog (*section, _("done"));
 
-       ensure_float (tempo_dialog);
-
        switch (tempo_dialog.run ()) {
        case RESPONSE_ACCEPT:
                break;