X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_clock.h;h=82b12b0ecaf431cefb21eff61d3ff09498ef0a9c;hb=5f30d87fd0127bb475894825c6e4acc01fcedb29;hp=b7cee0339e6445a690bfb1c09b899f8d6cc4b020;hpb=e025c45cda96a3c2bce5f4b4de42dc320af8f667;p=ardour.git

diff --git a/gtk2_ardour/audio_clock.h b/gtk2_ardour/audio_clock.h
index b7cee0339e..82b12b0eca 100644
--- a/gtk2_ardour/audio_clock.h
+++ b/gtk2_ardour/audio_clock.h
@@ -34,6 +34,7 @@
 #include "ardour/session_handle.h"
 
 #include "gtkmm2ext/cairo_widget.h"
+#include "ardour_button.h"
 
 namespace ARDOUR {
 	class Session;
@@ -41,7 +42,7 @@ namespace ARDOUR {
 
 class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr
 {
-  public:
+	public:
 	enum Mode {
 		Timecode,
 		BBT,
@@ -57,6 +58,7 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr
 	Mode mode() const { return _mode; }
 	void set_off (bool yn);
 	bool off() const { return _off; }
+	bool on() const { return !_off; }
 	void set_widget_name (const std::string& name);
 	void set_active_state (Gtkmm2ext::ActiveState s);
 	void set_editable (bool yn);
@@ -69,7 +71,7 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr
 	void locate ();
 	void set_mode (Mode, bool noemit = false);
 	void set_bbt_reference (framepos_t);
-        void set_is_duration (bool);
+	void set_is_duration (bool);
 
 	void copy_text_to_clipboard () const;
 
@@ -78,7 +80,10 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr
 	framepos_t current_time (framepos_t position = 0) const;
 	framepos_t current_duration (framepos_t position = 0) const;
 	void set_session (ARDOUR::Session *s);
-        void set_negative_allowed (bool yn);
+	void set_negative_allowed (bool yn);
+
+	ArdourButton* left_btn () { return &_left_btn; }
+	ArdourButton* right_btn () { return &_right_btn; }
 
 	/** Alter cairo scaling during rendering.
 	 *
@@ -97,8 +102,8 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr
 	static sigc::signal<void> ModeChanged;
 	static std::vector<AudioClock*> clocks;
 
-  protected:
-	void render (cairo_t*, cairo_rectangle_t*);
+	protected:
+	void render (Cairo::RefPtr<Cairo::Context> const&, cairo_rectangle_t*);
 	bool get_is_duration () const { return is_duration; } ;
 
 	virtual void build_ops_menu ();
@@ -106,16 +111,11 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr
 
 	bool on_button_press_event (GdkEventButton *ev);
 	bool on_button_release_event(GdkEventButton *ev);
-	bool is_lower_layout_click(int y) const {
-		return y > upper_height + separator_height;
-	}
-	bool is_right_layout_click(int x) const {
-		return x > x_leading_padding + get_left_rect_width() + separator_height;
-	}
-	double get_left_rect_width() const {
-	       return round (((get_width() - separator_height) * mode_based_info_ratio) + 0.5);
-	}
-  private:
+
+	ArdourButton _left_btn;
+	ArdourButton _right_btn;
+
+	private:
 	Mode             _mode;
 	std::string      _name;
 	bool              is_transient;
@@ -127,28 +127,26 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr
 	bool             _off;
 	int              em_width;
 	bool             _edit_by_click_field;
-        bool             _negative_allowed;
-        bool             edit_is_negative;
+	bool             _negative_allowed;
+	bool             edit_is_negative;
+
+	framepos_t       _limit_pos;
 
 	Glib::RefPtr<Pango::Layout> _layout;
-	Glib::RefPtr<Pango::Layout> _left_layout;
-	Glib::RefPtr<Pango::Layout> _right_layout;
+
+	bool         _with_info;
 
 	Pango::AttrColor*    editing_attr;
 	Pango::AttrColor*    foreground_attr;
 
 	Pango::AttrList normal_attributes;
 	Pango::AttrList editing_attributes;
-	Pango::AttrList info_attributes;
 
 	int first_height;
 	int first_width;
-        bool style_resets_first;
+	bool style_resets_first;
 	int layout_height;
 	int layout_width;
-	int info_height;
-	int upper_height;
-	double mode_based_info_ratio;
 	double corner_radius;
 	uint32_t font_size;
 
@@ -204,16 +202,16 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr
 	void on_style_changed (const Glib::RefPtr<Gtk::Style>&);
 	void on_size_request (Gtk::Requisition* req);
 	bool on_motion_notify_event (GdkEventMotion *ev);
-	void on_size_allocate (Gtk::Allocation&);
 	bool on_focus_out_event (GdkEventFocus*);
 
 	void set_slave_info ();
 	void set_timecode (framepos_t, bool);
-	void set_bbt (framepos_t, bool);
+	void set_bbt (framepos_t, ARDOUR::framecnt_t, bool);
 	void set_minsec (framepos_t, bool);
 	void set_frames (framepos_t, bool);
+	void set_out_of_bounds (bool negative);
 
-        void set_clock_dimensions (Gtk::Requisition&);
+	void set_clock_dimensions (Gtk::Requisition&);
 
 	framepos_t get_frame_step (Field, framepos_t pos = 0, int dir = 1);
 
@@ -221,7 +219,7 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr
 	bool bbt_validate_edit (const std::string&);
 	bool minsec_validate_edit (const std::string&);
 
-        framepos_t frames_from_timecode_string (const std::string&) const;
+	framepos_t frames_from_timecode_string (const std::string&) const;
 	framepos_t frames_from_bbt_string (framepos_t, const std::string&) const;
 	framepos_t frame_duration_from_bbt_string (framepos_t, const std::string&) const;
 	framepos_t frames_from_minsec_string (const std::string&) const;