projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix incorrect restoration of pane positions on Apple.
[ardour.git]
/
gtk2_ardour
/
time_info_box.h
diff --git
a/gtk2_ardour/time_info_box.h
b/gtk2_ardour/time_info_box.h
index 734f9ebb95492492a922b74ba6a1ca7350ebc894..444d2e83b0402b21c8cc3bd3c26a62dcbf72707f 100644
(file)
--- a/
gtk2_ardour/time_info_box.h
+++ b/
gtk2_ardour/time_info_box.h
@@
-24,13
+24,14
@@
#include <gtkmm/box.h>
#include <gtkmm/label.h>
#include <gtkmm/box.h>
#include <gtkmm/label.h>
+#include <gtkmm/table.h>
+
+#include "gtkmm2ext/cairo_packer.h"
#include "ardour/ardour.h"
#include "ardour/session_handle.h"
#include "ardour/ardour.h"
#include "ardour/session_handle.h"
-class CairoEditableText;
-class CairoCell;
-class CairoTextCell;
+#include "ardour_button.h"
namespace ARDOUR {
class Session;
namespace ARDOUR {
class Session;
@@
-39,7
+40,7
@@
namespace ARDOUR {
class AudioClock;
class AudioClock;
-class TimeInfoBox : public
Gtk::Table
, public ARDOUR::SessionHandlePtr
+class TimeInfoBox : public
CairoHPacker
, public ARDOUR::SessionHandlePtr
{
public:
TimeInfoBox ();
{
public:
TimeInfoBox ();
@@
-47,14
+48,14
@@
class TimeInfoBox : public Gtk::Table, public ARDOUR::SessionHandlePtr
void set_session (ARDOUR::Session*);
void set_session (ARDOUR::Session*);
- protected:
- bool on_expose_event (GdkEventExpose*);
-
private:
private:
+ Gtk::Table left;
+ Gtk::Table right;
+
AudioClock* selection_start;
AudioClock* selection_end;
AudioClock* selection_length;
AudioClock* selection_start;
AudioClock* selection_end;
AudioClock* selection_length;
-
+
AudioClock* punch_start;
AudioClock* punch_end;
AudioClock* punch_start;
AudioClock* punch_end;
@@
-67,11
+68,20
@@
class TimeInfoBox : public Gtk::Table, public ARDOUR::SessionHandlePtr
void punch_location_changed (ARDOUR::Location*);
void watch_punch (ARDOUR::Location*);
PBD::ScopedConnectionList punch_connections;
void punch_location_changed (ARDOUR::Location*);
void watch_punch (ARDOUR::Location*);
PBD::ScopedConnectionList punch_connections;
+ PBD::ScopedConnectionList editor_connections;
+ PBD::ScopedConnectionList region_property_connections;
+
+ ArdourButton punch_in_button;
+ ArdourButton punch_out_button;
void selection_changed ();
void sync_selection_mode (AudioClock*);
void sync_punch_mode (AudioClock*);
void selection_changed ();
void sync_selection_mode (AudioClock*);
void sync_punch_mode (AudioClock*);
+
+ bool clock_button_release_event (GdkEventButton* ev, AudioClock* src);
+ void track_mouse_mode ();
+ void region_property_change (boost::shared_ptr<ARDOUR::Region> r, const PBD::PropertyChange& what_changed);
};
};