convert codebase to use Temporal for various time types

[ardour.git] / libs / surfaces / push2 / track_mix.cc

diff --git a/libs/surfaces/push2/track_mix.cc b/libs/surfaces/push2/track_mix.cc
index 85cbf4697c8cac47fbfa2e15019a99200f36e7d1..57124860486978a8eccaedf242e36f6b08d38487 100644 (file)
--- a/libs/surfaces/push2/track_mix.cc
+++ b/libs/surfaces/push2/track_mix.cc
@@ -29,8 +29,8 @@
 #include "pbd/enumwriter.h"
 
 #include "midi++/parser.h"
-#include "timecode/time.h"
-#include "timecode/bbt_time.h"
+#include "temporal/time.h"
+#include "temporal/bbt_time.h"
 
 #include "ardour/async_midi_port.h"
 #include "ardour/audioengine.h"
@@ -55,6 +55,7 @@
 #include "canvas/meter.h"
 #include "canvas/rectangle.h"
 #include "canvas/text.h"
+#include "canvas/types.h"
 
 #include "canvas.h"
 #include "knob.h"
@@ -64,6 +65,10 @@
 #include "track_mix.h"
 #include "utils.h"
 
+#ifdef __APPLE__
+#define Rect ArdourCanvas::Rect
+#endif
+
 using namespace ARDOUR;
 using namespace std;
 using namespace PBD;
@@ -76,7 +81,7 @@ TrackMixLayout::TrackMixLayout (Push2& p, Session & s, std::string const & name)
 {
        Pango::FontDescription fd ("Sans 10");
 
-       bg = new Rectangle (this);
+       bg = new ArdourCanvas::Rectangle (this);
        bg->set (Rect (0, 0, display_width(), display_height()));
        bg->set_fill_color (p2.get_color (Push2::DarkBackground));
 
@@ -155,8 +160,6 @@ TrackMixLayout::TrackMixLayout (Push2& p, Session & s, std::string const & name)
        minsec_text->set_font_description (fd2);
        minsec_text->set_color (p2.get_color (Push2::LightBackground));
        minsec_text->set_position (Duple (10 + (4 * Push2Canvas::inter_button_spacing()), 90));
-
-       ControlProtocol::StripableSelectionChanged.connect (selection_connection, invalidator (*this), boost::bind (&TrackMixLayout::selection_changed, this), &p2);
 }
 
 TrackMixLayout::~TrackMixLayout ()
@@ -166,16 +169,6 @@ TrackMixLayout::~TrackMixLayout ()
        }
 }
 
-void
-TrackMixLayout::selection_changed ()
-{
-       boost::shared_ptr<Stripable> s = ControlProtocol::first_selected_stripable();
-
-       if (s) {
-               set_stripable (s);
-       }
-}
-
 void
 TrackMixLayout::show ()
 {
@@ -201,7 +194,7 @@ TrackMixLayout::hide ()
 }
 
 void
-TrackMixLayout::render (ArdourCanvas::Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
+TrackMixLayout::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
 {
        Container::render (area, context);
 }
@@ -538,7 +531,7 @@ TrackMixLayout::color_changed ()
                return;
        }
 
-       Color rgba = stripable->presentation_info().color();
+       Gtkmm2ext::Color rgba = stripable->presentation_info().color();
        selection_color = p2.get_color_index (rgba);
 
        name_text->set_color (rgba);
@@ -577,9 +570,9 @@ TrackMixLayout::strip_vpot_touch (int n, bool touching)
        boost::shared_ptr<AutomationControl> ac = knobs[n]->controllable();
        if (ac) {
                if (touching) {
-                       ac->start_touch (session.audible_frame());
+                       ac->start_touch (session.audible_sample());
                } else {
-                       ac->stop_touch (true, session.audible_frame());
+                       ac->stop_touch (session.audible_sample());
                }
        }
 }
@@ -597,7 +590,7 @@ TrackMixLayout::update_meters ()
 void
 TrackMixLayout::update_clocks ()
 {
-       framepos_t pos = session.audible_frame();
+       samplepos_t pos = session.audible_sample();
        bool negative = false;
 
        if (pos < 0) {
@@ -606,7 +599,7 @@ TrackMixLayout::update_clocks ()
        }
 
        char buf[16];
-       Timecode::BBT_Time BBT = session.tempo_map().bbt_at_frame (pos);
+       Timecode::BBT_Time BBT = session.tempo_map().bbt_at_sample (pos);
 
 #define BBT_BAR_CHAR "|"
 
@@ -620,22 +613,22 @@ TrackMixLayout::update_clocks ()
 
        bbt_text->set (buf);
 
-       framecnt_t left;
+       samplecnt_t left;
        int hrs;
        int mins;
        int secs;
        int millisecs;
 
-       const double frame_rate = session.frame_rate ();
+       const double sample_rate = session.sample_rate ();
 
        left = pos;
-       hrs = (int) floor (left / (frame_rate * 60.0f * 60.0f));
-       left -= (framecnt_t) floor (hrs * frame_rate * 60.0f * 60.0f);
-       mins = (int) floor (left / (frame_rate * 60.0f));
-       left -= (framecnt_t) floor (mins * frame_rate * 60.0f);
-       secs = (int) floor (left / (float) frame_rate);
-       left -= (framecnt_t) floor ((double)(secs * frame_rate));
-       millisecs = floor (left * 1000.0 / (float) frame_rate);
+       hrs = (int) floor (left / (sample_rate * 60.0f * 60.0f));
+       left -= (samplecnt_t) floor (hrs * sample_rate * 60.0f * 60.0f);
+       mins = (int) floor (left / (sample_rate * 60.0f));
+       left -= (samplecnt_t) floor (mins * sample_rate * 60.0f);
+       secs = (int) floor (left / (float) sample_rate);
+       left -= (samplecnt_t) floor ((double)(secs * sample_rate));
+       millisecs = floor (left * 1000.0 / (float) sample_rate);
 
        if (negative) {
                snprintf (buf, sizeof (buf), "-%02" PRId32 ":%02" PRId32 ":%02" PRId32 ".%03" PRId32, hrs, mins, secs, millisecs);