add sampo's synthesize_sources perl script to tools; add scroll-playhead-{forward...

[ardour.git] / gtk2_ardour / audio_clock.h

diff --git a/gtk2_ardour/audio_clock.h b/gtk2_ardour/audio_clock.h
index 14dc6ba67385057658fde5740001cfbeb5f571f5..662cb949e64deeb5880176ee32fcc147c8e01b93 100644 (file)
--- a/gtk2_ardour/audio_clock.h
+++ b/gtk2_ardour/audio_clock.h
@@ -30,7 +30,7 @@
 
 namespace ARDOUR {
        class Session;
-};
+}
 
 class AudioClock : public Gtk::HBox
 {
@@ -40,26 +40,35 @@ class AudioClock : public Gtk::HBox
                BBT,
                MinSec,
                Frames,
-               Off,
+               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 set (nframes_t, bool force = false);
        void set_mode (Mode);
+       
+       void set_widget_name (std::string);
+
+       std::string name() const { return _name; }
 
-       jack_nframes_t current_time (jack_nframes_t position = 0) const;
-       jack_nframes_t current_duration (jack_nframes_t position = 0) const;
+       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;
 
+       static sigc::signal<void> ModeChanged;
+       static std::vector<AudioClock*> clocks;
+
   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 +84,7 @@ class AudioClock : public Gtk::HBox
        Gtk::HBox   bbt_packer;
 
        Gtk::HBox   frames_packer_hbox;
+       Gtk::HBox   frames_packer;
        
        enum Field {
                SMPTE_Hours,
@@ -87,7 +97,7 @@ class AudioClock : public Gtk::HBox
                Bars,
                Beats, 
                Ticks,
-               AudioFrames,
+               AudioFrames
        };
 
        Gtk::EventBox  audio_frames_ebox;
@@ -123,20 +133,28 @@ 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::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   tempo_meter_box;
+       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;
+       nframes_t last_when;
 
-       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;
@@ -158,24 +176,25 @@ class AudioClock : public Gtk::HBox
        bool field_focus_in_event (GdkEventFocus *, Field);
        bool field_focus_out_event (GdkEventFocus *, Field);
 
-       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];
 };