X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_clock.h;h=25eab1a3ba000e8cc7cbcb5646b456c2b6525a4f;hb=b78d036aa056af0ef4f5821c45dae5f70bc69231;hp=c51c321ba46415af262ea5aabecba52c93c0103f;hpb=ec047d89810677cdf4ae3363834919a77b459047;p=ardour.git

diff --git a/gtk2_ardour/audio_clock.h b/gtk2_ardour/audio_clock.h
index c51c321ba4..25eab1a3ba 100644
--- a/gtk2_ardour/audio_clock.h
+++ b/gtk2_ardour/audio_clock.h
@@ -50,18 +50,19 @@ class AudioClock : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 
 	void focus ();
 
-	void set (nframes_t, bool force = false, nframes_t offset = 0, char which = 0);
+	void set (framepos_t, bool force = false, ARDOUR::framecnt_t offset = 0, char which = 0);
 	void set_from_playhead ();
 	void locate ();
 	void set_mode (Mode);
-	void set_bbt_reference (nframes64_t);
+	void set_bbt_reference (framepos_t);
+        void set_is_duration (bool);
 
 	void set_widget_name (std::string);
 
 	std::string name() const { return _name; }
 
-	nframes_t current_time (nframes_t position = 0) const;
-	nframes_t current_duration (nframes_t position = 0) const;
+	framepos_t current_time (framepos_t position = 0) const;
+	framepos_t current_duration (framepos_t position = 0) const;
 	void set_session (ARDOUR::Session *s);
 
 	sigc::signal<void> ValueChanged;
@@ -162,8 +163,8 @@ class AudioClock : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 	Gtk::EventBox  clock_base;
 	Gtk::Frame     clock_frame;
 
-	nframes64_t bbt_reference_time;
-	nframes_t last_when;
+	framepos_t bbt_reference_time;
+	framepos_t last_when;
 	bool last_pdelta;
 	bool last_sdelta;
 
@@ -182,6 +183,13 @@ class AudioClock : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 	double drag_y;
 	double drag_accum;
 
+	/** true if the time of this clock is the one displayed in its widgets.
+	 *  if false, the time in the widgets is an approximation of _canonical_time,
+	 *  and _canonical_time should be returned as the `current' time of the clock.
+	 */
+	bool _canonical_time_is_displayed;
+	framepos_t _canonical_time;
+
 	void on_realize ();
 
 	bool field_motion_notify_event (GdkEventMotion *ev, Field);
@@ -194,24 +202,24 @@ class AudioClock : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 	bool field_focus_out_event (GdkEventFocus *, Field);
 	bool drop_focus_handler (GdkEventFocus*);
 
-	void set_timecode (nframes_t, bool);
-	void set_bbt (nframes_t, bool);
-	void set_minsec (nframes_t, bool);
-	void set_frames (nframes_t, bool);
+	void set_timecode (framepos_t, bool);
+	void set_bbt (framepos_t, bool);
+	void set_minsec (framepos_t, bool);
+	void set_frames (framepos_t, bool);
 
-	nframes_t get_frames (Field,nframes_t pos = 0,int dir=1);
+	framepos_t get_frames (Field, framepos_t pos = 0, int dir = 1);
 
 	void timecode_sanitize_display();
-	nframes_t timecode_frame_from_display () const;
-	nframes_t bbt_frame_from_display (nframes_t) const;
-	nframes_t bbt_frame_duration_from_display (nframes_t) const;
-	nframes_t minsec_frame_from_display () const;
-	nframes_t audio_frame_from_display () const;
+	framepos_t timecode_frame_from_display () const;
+	framepos_t bbt_frame_from_display (framepos_t) const;
+	framepos_t bbt_frame_duration_from_display (framepos_t) const;
+	framepos_t minsec_frame_from_display () const;
+	framepos_t audio_frame_from_display () const;
 
 	void build_ops_menu ();
 	void setup_events ();
 
-	void timecode_offset_changed ();
+	void session_configuration_changed (std::string);
 	void set_size_requests ();
 
 	static const uint32_t field_length[(int)AudioFrames+1];