X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_clock.h;h=c51c321ba46415af262ea5aabecba52c93c0103f;hb=064c6287cd22e9874fe897604201a4e08769471e;hp=2de4cee3eb42b0ca01339b05bd2ca5e1af1bb669;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git

diff --git a/gtk2_ardour/audio_clock.h b/gtk2_ardour/audio_clock.h
index 2de4cee3eb..c51c321ba4 100644
--- a/gtk2_ardour/audio_clock.h
+++ b/gtk2_ardour/audio_clock.h
@@ -26,29 +26,33 @@
 #include <gtkmm/label.h>
 #include <gtkmm/frame.h>
 #include "ardour/ardour.h"
+#include "ardour/session_handle.h"
 
 namespace ARDOUR {
 	class Session;
 }
 
-class AudioClock : public Gtk::HBox
+class AudioClock : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 {
   public:
 	enum Mode {
-		SMPTE,
+		Timecode,
 		BBT,
 		MinSec,
 		Frames,
 		Off
 	};
 
-	AudioClock (std::string clock_name, bool transient, std::string widget_name, bool editable, bool is_duration = false, bool with_info = false);
+	AudioClock (const std::string& clock_name, bool is_transient, const std::string& widget_name, 
+                    bool editable, bool follows_playhead, bool duration = false, bool with_info = false);
 
 	Mode mode() const { return _mode; }
 
 	void focus ();
 
 	void set (nframes_t, bool force = false, nframes_t offset = 0, char which = 0);
+	void set_from_playhead ();
+	void locate ();
 	void set_mode (Mode);
 	void set_bbt_reference (nframes64_t);
 
@@ -70,18 +74,19 @@ class AudioClock : public Gtk::HBox
 	static bool has_focus() { return _has_focus; }
 
   private:
-	ARDOUR::Session  *session;
 	Mode             _mode;
 	uint32_t          key_entry_state;
 	std::string      _name;
 	bool              is_transient;
 	bool              is_duration;
 	bool              editable;
+	/** true if this clock follows the playhead, meaning that certain operations are redundant */
+	bool             _follows_playhead;
 
 	Gtk::Menu  *ops_menu;
 
-	Gtk::HBox   smpte_packer_hbox;
-	Gtk::HBox   smpte_packer;
+	Gtk::HBox   timecode_packer_hbox;
+	Gtk::HBox   timecode_packer;
 
 	Gtk::HBox   minsec_packer_hbox;
 	Gtk::HBox   minsec_packer;
@@ -93,10 +98,10 @@ class AudioClock : public Gtk::HBox
 	Gtk::HBox   frames_packer;
 
 	enum Field {
-		SMPTE_Hours,
-		SMPTE_Minutes,
-		SMPTE_Seconds,
-		SMPTE_Frames,
+		Timecode_Hours,
+		Timecode_Minutes,
+		Timecode_Seconds,
+		Timecode_Frames,
 		MS_Hours,
 		MS_Minutes,
 		MS_Seconds,
@@ -144,14 +149,14 @@ class AudioClock : public Gtk::HBox
 	Gtk::Label*  frames_upper_info_label;
 	Gtk::Label*  frames_lower_info_label;
 
-	Gtk::Label*  smpte_upper_info_label;
-	Gtk::Label*  smpte_lower_info_label;
+	Gtk::Label*  timecode_upper_info_label;
+	Gtk::Label*  timecode_lower_info_label;
 
 	Gtk::Label*  bbt_upper_info_label;
 	Gtk::Label*  bbt_lower_info_label;
 
 	Gtk::VBox   frames_info_box;
-	Gtk::VBox   smpte_info_box;
+	Gtk::VBox   timecode_info_box;
 	Gtk::VBox   bbt_info_box;
 
 	Gtk::EventBox  clock_base;
@@ -189,15 +194,15 @@ class AudioClock : public Gtk::HBox
 	bool field_focus_out_event (GdkEventFocus *, Field);
 	bool drop_focus_handler (GdkEventFocus*);
 
-	void set_smpte (nframes_t, bool);
+	void set_timecode (nframes_t, bool);
 	void set_bbt (nframes_t, bool);
 	void set_minsec (nframes_t, bool);
 	void set_frames (nframes_t, bool);
 
 	nframes_t get_frames (Field,nframes_t pos = 0,int dir=1);
 
-	void smpte_sanitize_display();
-	nframes_t smpte_frame_from_display () const;
+	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;
@@ -206,12 +211,13 @@ class AudioClock : public Gtk::HBox
 	void build_ops_menu ();
 	void setup_events ();
 
-	void smpte_offset_changed ();
+	void timecode_offset_changed ();
 	void set_size_requests ();
 
 	static const uint32_t field_length[(int)AudioFrames+1];
 	static bool _has_focus;
 
+	void on_style_changed (const Glib::RefPtr<Gtk::Style>&);
 };
 
 #endif /* __audio_clock_h__ */