Merge branch 'master' into cairocanvas

[ardour.git] / gtk2_ardour / audio_clock.h

diff --git a/gtk2_ardour/audio_clock.h b/gtk2_ardour/audio_clock.h
index 07770df0f62d5b63aeb99fb60f747d0ffe74b8ba..96cde6ea81699ed72cc7c0ebf1863e770d86d008 100644 (file)
--- a/gtk2_ardour/audio_clock.h
+++ b/gtk2_ardour/audio_clock.h
@@ -33,7 +33,7 @@
 #include "ardour/ardour.h"
 #include "ardour/session_handle.h"
 
-#include "cairo_widget.h"
+#include "gtkmm2ext/cairo_widget.h"
 
 namespace ARDOUR {
        class Session;
@@ -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,7 @@ 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); 
 
        sigc::signal<void> ValueChanged;
        sigc::signal<void> mode_changed;
@@ -87,6 +87,9 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr
   protected:
        void render (cairo_t*);
 
+       virtual void build_ops_menu ();
+       Gtk::Menu  *ops_menu;
+
   private:
        Mode             _mode;
        std::string      _name;
@@ -96,11 +99,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;
-
-       Gtk::Menu  *ops_menu;
+       bool             _edit_by_click_field;
+        bool             _negative_allowed;
+        bool             edit_is_negative;
 
        Glib::RefPtr<Pango::Layout> _layout;
        Glib::RefPtr<Pango::Layout> _left_layout;
@@ -115,19 +117,21 @@ 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;
        static const double x_leading_padding;
 
        enum Field {
-               Timecode_Hours,
+               Timecode_Hours = 1,
                Timecode_Minutes,
                Timecode_Seconds,
                Timecode_Frames,
@@ -179,30 +183,32 @@ 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;
 
-       void start_edit ();
+       void start_edit (Field f = Field (0));
        void end_edit (bool);
        void end_edit_relative (bool);
        void edit_next_field ();
@@ -216,6 +222,8 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr
        void set_font ();
        void set_colors ();
        void show_edit_status (int length);
+       int  merge_input_and_edit_string ();
+       std::string get_field (Field);
 
        void drop_focus ();
        void dpi_reset ();