Merging from trunk

[ardour.git] / gtk2_ardour / audio_clock.h

diff --git a/gtk2_ardour/audio_clock.h b/gtk2_ardour/audio_clock.h
index 3d92d7ba2606920d2934bcd01954efd4a9fd0372..14dc6ba67385057658fde5740001cfbeb5f571f5 100644 (file)
--- a/gtk2_ardour/audio_clock.h
+++ b/gtk2_ardour/audio_clock.h
@@ -21,7 +21,11 @@
 #ifndef __audio_clock_h__
 #define __audio_clock_h__
 
-#include <gtkmm.h>
+#include <gtkmm/box.h>
+#include <gtkmm/menu.h>
+#include <gtkmm/eventbox.h>
+#include <gtkmm/label.h>
+#include <gtkmm/frame.h>
 #include <ardour/ardour.h>
 
 namespace ARDOUR {
@@ -146,12 +150,13 @@ class AudioClock : public Gtk::HBox
 
        void on_realize ();
        
-       gint field_motion_notify_event (GdkEventMotion *ev, Field);
-       gint field_button_press_event (GdkEventButton *ev, Field);
-       gint field_button_release_event (GdkEventButton *ev, Field);
-       gint field_key_release_event (GdkEventKey *, Field);
-       gint field_focus_in_event (GdkEventFocus *, Field);
-       gint field_focus_out_event (GdkEventFocus *, Field);
+       bool field_motion_notify_event (GdkEventMotion *ev, Field);
+       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_release_event (GdkEventKey *, Field);
+       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);
@@ -170,6 +175,8 @@ class AudioClock : public Gtk::HBox
        void build_ops_menu ();
        void setup_events ();
 
+       void smpte_offset_changed ();
+
        static const uint32_t field_length[(int)AudioFrames+1];
 };