Fixed overflow issue. Code originally meant to truncate the 64 bit integer did not...

[ardour.git] / gtk2_ardour / audio_clock.cc

diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc
index 33f522f234716c65669e7c62029073ba35647741..6848644266cad907e0598e4929479cace8b574d7 100644 (file)
--- a/gtk2_ardour/audio_clock.cc
+++ b/gtk2_ardour/audio_clock.cc
@@ -28,6 +28,7 @@
 #include <ardour/ardour.h>
 #include <ardour/session.h>
 #include <ardour/tempo.h>
+#include <ardour/profile.h>
 #include <sigc++/bind.h>
 
 #include "ardour_ui.h"
@@ -82,7 +83,8 @@ AudioClock::AudioClock (std::string clock_name, bool transient, std::string widg
        key_entry_state = 0;
        ops_menu = 0;
        dragging = false;
-       
+       bbt_reference_time = -1;
+
        if (with_info) {
                frames_upper_info_label = manage (new Label);
                frames_lower_info_label = manage (new Label);
@@ -101,6 +103,9 @@ AudioClock::AudioClock (std::string clock_name, bool transient, std::string widg
                Gtkmm2ext::set_size_request_to_display_given_text(*smpte_upper_info_label, "23.98",0,0);
                Gtkmm2ext::set_size_request_to_display_given_text(*smpte_lower_info_label, "NDF",0,0);
 
+               Gtkmm2ext::set_size_request_to_display_given_text(*bbt_upper_info_label, "88|88",0,0);
+               Gtkmm2ext::set_size_request_to_display_given_text(*bbt_lower_info_label, "888.88",0,0);
+
                frames_info_box.pack_start (*frames_upper_info_label, true, true);
                frames_info_box.pack_start (*frames_lower_info_label, true, true);
                smpte_info_box.pack_start (*smpte_upper_info_label, true, true);
@@ -427,7 +432,6 @@ AudioClock::set (nframes_t when, bool force, nframes_t offset, int which)
        }
 
        if (which == 1 && pdelta && !last_pdelta) {
-               cout << "set_widget_name() called" << endl;
                set_widget_name("TransportClockDisplayDelta");
                last_pdelta = true;
        } else if (which == 1 && !pdelta && last_pdelta) {
@@ -500,15 +504,21 @@ AudioClock::set_frames (nframes_t when, bool force)
                        sprintf (buf, "%.3fK", rate/1000.0f);
                }
                
-               frames_upper_info_label->set_text (buf);
+               if (frames_upper_info_label->get_text() != buf) {
+                       frames_upper_info_label->set_text (buf);
+               }
                
                float vid_pullup = Config->get_video_pullup();
                
                if (vid_pullup == 0.0) {
-                       frames_lower_info_label->set_text(_("none"));
+                       if (frames_lower_info_label->get_text () != _("none")) {
+                               frames_lower_info_label->set_text(_("none"));
+                       }
                } else {
                        sprintf (buf, "%-6.4f", vid_pullup);
-                       frames_lower_info_label->set_text (buf);
+                       if (frames_lower_info_label->get_text() != buf) {
+                               frames_lower_info_label->set_text (buf);
+                       }
                }
        }
 }      
@@ -598,7 +608,9 @@ AudioClock::set_smpte (nframes_t when, bool force)
                        sprintf (buf, "%.2f", smpte_frames);
                }
                
-               smpte_upper_info_label->set_text (buf);
+               if (smpte_upper_info_label->get_text() != buf) {
+                       smpte_upper_info_label->set_text (buf);
+               }
                
                if ((fabs(smpte_frames - 29.97) < 0.0001) || smpte_frames == 30) {
                        if (session->smpte_drop_frames()) {
@@ -611,7 +623,9 @@ AudioClock::set_smpte (nframes_t when, bool force)
                        buf[0] = '\0';
                }
                
-               smpte_lower_info_label->set_text (buf);
+               if (smpte_lower_info_label->get_text() != buf) {
+                       smpte_lower_info_label->set_text (buf);
+               }
        }
 }
 
@@ -622,19 +636,47 @@ AudioClock::set_bbt (nframes_t when, bool force)
        BBT_Time bbt;
 
        session->tempo_map().bbt_time (when, bbt);
+
+       /* handle a common case */
+
+       if (is_duration && when == 0) {
+               bbt.bars = 0;
+               bbt.beats = 0;
+
+       }
+
        sprintf (buf, "%03" PRIu32, bbt.bars);
-       bars_label.set_text (buf);
+       if (force || bars_label.get_text () != buf) {
+               bars_label.set_text (buf);
+       }
        sprintf (buf, "%02" PRIu32, bbt.beats);
-       beats_label.set_text (buf);
+       if (force || beats_label.get_text () != buf) {
+               beats_label.set_text (buf);
+       }
        sprintf (buf, "%04" PRIu32, bbt.ticks);
-       ticks_label.set_text (buf);
+       if (force || ticks_label.get_text () != buf) {
+               ticks_label.set_text (buf);
+       }
        
        if (bbt_upper_info_label) {
-               TempoMap::Metric m (session->tempo_map().metric_at (when));
+               nframes64_t pos;
+
+               if (bbt_reference_time < 0) {
+                       pos = when;
+               } else {
+                       pos = bbt_reference_time;
+               }
+
+               TempoMap::Metric m (session->tempo_map().metric_at (pos));
+
                sprintf (buf, "%-5.2f", m.tempo().beats_per_minute());
-               bbt_lower_info_label->set_text (buf);
+               if (bbt_lower_info_label->get_text() != buf) {
+                       bbt_lower_info_label->set_text (buf);
+               }
                sprintf (buf, "%g|%g", m.meter().beats_per_bar(), m.meter().note_divisor());
-               bbt_upper_info_label->set_text (buf);
+               if (bbt_upper_info_label->get_text() != buf) {
+                       bbt_upper_info_label->set_text (buf);
+               }
        }
 }
 
@@ -794,13 +836,15 @@ AudioClock::field_key_release_event (GdkEventKey *ev, Field field)
                break;
 
        case GDK_Tab:
+       case GDK_Return:
+       case GDK_KP_Enter:
                move_on = true;
                break;
 
        case GDK_Escape:
-       case GDK_Return:
-       case GDK_KP_Enter:
+               key_entry_state = 0;
                clock_base.grab_focus ();
+               ChangeAborted();  /*  EMIT SIGNAL  */
                return true;
 
        default:
@@ -855,11 +899,12 @@ AudioClock::field_key_release_event (GdkEventKey *ev, Field field)
                        case Bars:
                        case Beats:
                        case Ticks:
-                               // Bars or beats should never be 0
-                               if (atoi(bars_label.get_text()) == 0) {
+                               // Bars should never be, unless this clock is for a duration
+                               if (atoi(bars_label.get_text()) == 0 && !is_duration) {
                                        bars_label.set_text("001");
                                }
-                               if (atoi(beats_label.get_text()) == 0) {
+                               //  beats should never be 0, unless this clock is for a duration
+                               if (atoi(beats_label.get_text()) == 0 && !is_duration) {
                                        beats_label.set_text("01");
                                }
                                break;
@@ -925,6 +970,13 @@ AudioClock::field_key_release_event (GdkEventKey *ev, Field field)
 
        }
 
+       //if user hit Enter, lose focus
+       switch (ev->keyval) {
+       case GDK_Return:
+       case GDK_KP_Enter:
+               clock_base.grab_focus ();
+       }
+
        return true;
 }
 
@@ -1882,7 +1934,9 @@ AudioClock::build_ops_menu ()
        MenuList& ops_items = ops_menu->items();
        ops_menu->set_name ("ArdourContextMenu");
        
-       ops_items.push_back (MenuElem (_("Timecode"), bind (mem_fun(*this, &AudioClock::set_mode), SMPTE)));
+       if (!Profile->get_sae()) {
+               ops_items.push_back (MenuElem (_("Timecode"), bind (mem_fun(*this, &AudioClock::set_mode), SMPTE)));
+       }
        ops_items.push_back (MenuElem (_("Bars:Beats"), bind (mem_fun(*this, &AudioClock::set_mode), BBT)));
        ops_items.push_back (MenuElem (_("Minutes:Seconds"), bind (mem_fun(*this, &AudioClock::set_mode), MinSec)));
        ops_items.push_back (MenuElem (_("Samples"), bind (mem_fun(*this, &AudioClock::set_mode), Frames)));
@@ -1977,3 +2031,9 @@ AudioClock::set_size_requests ()
                
        }
 }
+
+void
+AudioClock::set_bbt_reference (nframes64_t pos)
+{
+       bbt_reference_time = pos;
+}