minor fixes/changes based on comparison with existing bindings

[ardour.git] / gtk2_ardour / audio_clock.h

diff --git a/gtk2_ardour/audio_clock.h b/gtk2_ardour/audio_clock.h
index d55a4b861006c3b96831e7c68667faeeac309a71..1d9c55005291bfaf97298b265b07e85cf9d2f870 100644 (file)
--- 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__
@@ -26,7 +25,7 @@
 #include <gtkmm/eventbox.h>
 #include <gtkmm/label.h>
 #include <gtkmm/frame.h>
-#include <ardour/ardour.h>
+#include "ardour/ardour.h"
 
 namespace ARDOUR {
        class Session;
@@ -43,23 +42,39 @@ 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 (nframes_t, bool force = false);
+
+       void focus ();
+
+       void set (nframes_t, bool force = false, nframes_t offset = 0, char which = 0);
        void set_mode (Mode);
+       void set_bbt_reference (nframes64_t);
+
+       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> mode_changed;
+       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 +90,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 +109,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,15 +141,26 @@ 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;
 
+       nframes64_t bbt_reference_time;
        nframes_t last_when;
+       bool last_pdelta;
+       bool last_sdelta;
 
        uint32_t last_hrs;
        uint32_t last_mins;
@@ -154,9 +183,11 @@ 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 (nframes_t, bool);
        void set_bbt (nframes_t, bool);
@@ -176,8 +207,11 @@ class AudioClock : public Gtk::HBox
        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__ */