projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Oops. Fix XML stuff in GUI as well.
[ardour.git]
/
gtk2_ardour
/
audio_clock.h
diff --git
a/gtk2_ardour/audio_clock.h
b/gtk2_ardour/audio_clock.h
index 9ff5f45ddfca2bb9e7907143220beaa405f98306..7c1b6d386bcab422cd34740dc0ca8ede19c93c35 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.
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__
*/
#ifndef __audio_clock_h__
@@
-43,23
+42,39
@@
class AudioClock : public Gtk::HBox
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; }
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, char which = 0);
void set_mode (Mode);
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;
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;
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;
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 bbt_packer;
Gtk::HBox frames_packer_hbox;
+ Gtk::HBox frames_packer;
enum Field {
SMPTE_Hours,
enum Field {
SMPTE_Hours,
@@
-93,6
+109,8
@@
class AudioClock : public Gtk::HBox
Gtk::EventBox audio_frames_ebox;
Gtk::Label audio_frames_label;
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;
Gtk::EventBox hours_ebox;
Gtk::EventBox minutes_ebox;
Gtk::EventBox seconds_ebox;
@@
-123,20
+141,31
@@
class AudioClock : public Gtk::HBox
Gtk::Label b1;
Gtk::Label b2;
Gtk::Label b1;
Gtk::Label b2;
- Gtk::Label*
temp
o_label;
- Gtk::Label*
meter
_label;
+ Gtk::Label*
frames_upper_inf
o_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;
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;
bool last_negative;
long ms_last_hrs;
@@
-154,30
+183,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_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 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();
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 build_ops_menu ();
void setup_events ();
void smpte_offset_changed ();
+ void set_size_requests ();
static const uint32_t field_length[(int)AudioFrames+1];
static const uint32_t field_length[(int)AudioFrames+1];
+ static bool _has_focus;
+
};
#endif /* __audio_clock_h__ */
};
#endif /* __audio_clock_h__ */