X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_clock.h;h=bd25a9afdaf9b26ed6c624abfa58c5f16a1aefb0;hb=9204b2837ebbaa771d318cadf5cb2ea4d35e9fef;hp=33b486a8f11d8ffef4665e901f1f12ec2f500454;hpb=20aeb5af0abd50dc01db503d65897c7dfebf6467;p=ardour.git

diff --git a/gtk2_ardour/audio_clock.h b/gtk2_ardour/audio_clock.h
index 33b486a8f1..bd25a9afda 100644
--- a/gtk2_ardour/audio_clock.h
+++ b/gtk2_ardour/audio_clock.h
@@ -60,7 +60,6 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr
 	void set_active_state (Gtkmm2ext::ActiveState s);
 	void set_editable (bool yn);
 	void set_corner_radius (double);
-	void set_fixed_width (bool);
 
 	void focus ();
 
@@ -76,6 +75,9 @@ 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); 
+
+	static void print_minsec (framepos_t, char* buf, size_t bufsize, float frame_rate);
 
 	sigc::signal<void> ValueChanged;
 	sigc::signal<void> mode_changed;
@@ -85,7 +87,10 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr
 	static std::vector<AudioClock*> clocks;
 
   protected:
-	void render (cairo_t*);
+	void render (cairo_t*, cairo_rectangle_t*);
+
+	virtual void build_ops_menu ();
+	Gtk::Menu  *ops_menu;
 
   private:
 	Mode             _mode;
@@ -96,12 +101,10 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr
 	/** true if this clock follows the playhead, meaning that certain operations are redundant */
 	bool             _follows_playhead;
 	bool             _off;
-	bool             _fixed_width;
-	int              layout_x_offset;
 	int              em_width;
 	bool             _edit_by_click_field;
-
-	Gtk::Menu  *ops_menu;
+        bool             _negative_allowed;
+        bool             edit_is_negative;
 
 	Glib::RefPtr<Pango::Layout> _layout;
 	Glib::RefPtr<Pango::Layout> _left_layout;
@@ -116,12 +119,14 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr
 
 	int first_height;
 	int first_width;
+        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;
 
 	static const double info_font_scale_factor;
 	static const double separator_height;
@@ -180,26 +185,28 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr
 	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_minsec (framepos_t, bool);
 	void set_frames (framepos_t, bool);
 
+        void set_clock_dimensions (Gtk::Requisition&);
+
 	framepos_t get_frame_step (Field, framepos_t pos = 0, int dir = 1);
 
 	bool timecode_validate_edit (const std::string&);
 	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;
 	framepos_t frames_from_audioframes_string (const std::string&) const;
 
-	void build_ops_menu ();
-
 	void session_configuration_changed (std::string);
+	void session_property_changed (const PBD::PropertyChange&);
 
 	Field index_to_field () const;