X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_clock.h;h=ce500149c49ea16c9d85f054307a0119369c4dc2;hb=39a4068e36f632f2ff8abf99881d40e26d7e5183;hp=9ff5f45ddfca2bb9e7907143220beaa405f98306;hpb=433d9a5fc3538aa170d3ad1cb11929c0e5e94567;p=ardour.git

diff --git a/gtk2_ardour/audio_clock.h b/gtk2_ardour/audio_clock.h
index 9ff5f45ddf..ce500149c4 100644
--- a/gtk2_ardour/audio_clock.h
+++ b/gtk2_ardour/audio_clock.h
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __audio_clock_h__
@@ -43,23 +42,38 @@ class AudioClock : public Gtk::HBox
 		Off
 	};
 	
-	AudioClock (const string& name, bool editable, bool is_duration = false, bool with_tempo_meter = false);
+	AudioClock (std::string clock_name, bool transient, std::string widget_name, bool editable, bool is_duration = false, bool with_info = false);
 
 	Mode mode() const { return _mode; }
-	
-	void set (jack_nframes_t, bool force = false);
+
+	void focus ();
+
+	void set (nframes_t, bool force = false, nframes_t offset = 0, int which = 0);
 	void set_mode (Mode);
+	void set_bbt_reference (nframes64_t);
 
-	jack_nframes_t current_time (jack_nframes_t position = 0) const;
-	jack_nframes_t current_duration (jack_nframes_t position = 0) const;
+	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;
 	void set_session (ARDOUR::Session *s);
 
 	sigc::signal<void> ValueChanged;
+	sigc::signal<void> ChangeAborted;
+
+	static sigc::signal<void> ModeChanged;
+	static std::vector<AudioClock*> clocks;
+
+	static bool has_focus() { return _has_focus; }
 
   private:
 	ARDOUR::Session  *session;
 	Mode             _mode;
-	uint32_t      key_entry_state;
+	uint32_t          key_entry_state;
+	std::string      _name;
+	bool              is_transient;
 	bool              is_duration;
 	bool              editable;
 
@@ -75,6 +89,7 @@ class AudioClock : public Gtk::HBox
 	Gtk::HBox   bbt_packer;
 
 	Gtk::HBox   frames_packer_hbox;
+	Gtk::HBox   frames_packer;
        
 	enum Field {
 		SMPTE_Hours,
@@ -93,6 +108,8 @@ class AudioClock : public Gtk::HBox
 	Gtk::EventBox  audio_frames_ebox;
 	Gtk::Label     audio_frames_label;
 
+	Gtk::HBox      off_hbox;
+
 	Gtk::EventBox  hours_ebox;
 	Gtk::EventBox  minutes_ebox;
 	Gtk::EventBox  seconds_ebox;
@@ -123,20 +140,31 @@ class AudioClock : public Gtk::HBox
 	Gtk::Label  b1;
 	Gtk::Label  b2;
 
-	Gtk::Label*  tempo_label;
-	Gtk::Label*  meter_label;
+	Gtk::Label*  frames_upper_info_label;
+	Gtk::Label*  frames_lower_info_label;
 
-	Gtk::VBox   tempo_meter_box;
+	Gtk::Label*  smpte_upper_info_label;
+	Gtk::Label*  smpte_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   bbt_info_box;
 
 	Gtk::EventBox  clock_base;
 	Gtk::Frame     clock_frame;
 
-	jack_nframes_t last_when;
+	nframes64_t bbt_reference_time;
+	nframes_t last_when;
+	bool last_pdelta;
+	bool last_sdelta;
 
-	long last_hrs;
-	long last_mins;
-	long last_secs;
-	long last_frames;
+	uint32_t last_hrs;
+	uint32_t last_mins;
+	uint32_t last_secs;
+	uint32_t last_frames;
 	bool last_negative;
 
 	long  ms_last_hrs;
@@ -154,30 +182,35 @@ class AudioClock : public Gtk::HBox
 	bool field_button_press_event (GdkEventButton *ev, Field);
 	bool field_button_release_event (GdkEventButton *ev, Field);
 	bool field_button_scroll_event (GdkEventScroll *ev, Field);
+	bool field_key_press_event (GdkEventKey *, Field);
 	bool field_key_release_event (GdkEventKey *, Field);
 	bool field_focus_in_event (GdkEventFocus *, Field);
 	bool field_focus_out_event (GdkEventFocus *, Field);
+	bool drop_focus_handler (GdkEventFocus*);
 
-	void set_smpte (jack_nframes_t, bool);
-	void set_bbt (jack_nframes_t, bool);
-	void set_minsec (jack_nframes_t, bool);
-	void set_frames (jack_nframes_t, bool);
+	void set_smpte (nframes_t, bool);
+	void set_bbt (nframes_t, bool);
+	void set_minsec (nframes_t, bool);
+	void set_frames (nframes_t, bool);
 
-	jack_nframes_t get_frames (Field,jack_nframes_t pos = 0,int dir=1);
+	nframes_t get_frames (Field,nframes_t pos = 0,int dir=1);
 	
 	void smpte_sanitize_display();
-	jack_nframes_t smpte_frame_from_display () const;
-	jack_nframes_t bbt_frame_from_display (jack_nframes_t) const;
-	jack_nframes_t bbt_frame_duration_from_display (jack_nframes_t) const;
-	jack_nframes_t minsec_frame_from_display () const;
-	jack_nframes_t audio_frame_from_display () const;
+	nframes_t smpte_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;
 
 	void build_ops_menu ();
 	void setup_events ();
 
 	void smpte_offset_changed ();
+	void set_size_requests ();
 
 	static const uint32_t field_length[(int)AudioFrames+1];
+	static bool _has_focus;
+	
 };
 
 #endif /* __audio_clock_h__ */