summaryrefslogtreecommitdiff
path: root/gtk2_ardour/audio_region_editor.h
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2009-10-20 01:05:33 +0000
committerCarl Hetherington <carl@carlh.net>2009-10-20 01:05:33 +0000
commit9155aca8c2b39daa98ff12cbb748809a99af67a3 (patch)
treea5a0bd85635774eb8b950f09d42f66bc6041c180 /gtk2_ardour/audio_region_editor.h
parent089d75e8a85dbad6b35a5d5662a3d71950ec8634 (diff)
Tidy up the popup region editor and fix a few bugs with it; should close mantis 2601 and 2602.
git-svn-id: svn://localhost/ardour2/branches/3.0@5813 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/audio_region_editor.h')
-rw-r--r--gtk2_ardour/audio_region_editor.h14
1 files changed, 6 insertions, 8 deletions
diff --git a/gtk2_ardour/audio_region_editor.h b/gtk2_ardour/audio_region_editor.h
index 00e77e430e..1f23427167 100644
--- a/gtk2_ardour/audio_region_editor.h
+++ b/gtk2_ardour/audio_region_editor.h
@@ -30,7 +30,6 @@
#include <gtkmm/arrow.h>
#include <gtkmm/frame.h>
#include <gtkmm/table.h>
-#include <gtkmm/alignment.h>
#include <gtkmm/adjustment.h>
#include <gtkmm/separator.h>
#include <gtkmm/spinbutton.h>
@@ -77,18 +76,15 @@ class AudioRegionEditor : public RegionEditor
Gtk::Label position_label;
Gtk::Label end_label;
Gtk::Label length_label;
- Gtk::Label sync_label;
+ Gtk::Label sync_relative_label;
+ Gtk::Label sync_absolute_label;
Gtk::Label start_label;
- Gtk::Alignment position_alignment;
- Gtk::Alignment end_alignment;
- Gtk::Alignment length_alignment;
- Gtk::Alignment sync_alignment;
- Gtk::Alignment start_alignment;
AudioClock position_clock;
AudioClock end_clock;
AudioClock length_clock;
- AudioClock sync_offset_clock;
+ AudioClock sync_offset_relative_clock; ///< sync offset relative to the start of the region
+ AudioClock sync_offset_absolute_clock; ///< sync offset relative to the start of the timeline
AudioClock start_clock;
Gtk::HSeparator sep3;
@@ -107,6 +103,8 @@ class AudioRegionEditor : public RegionEditor
void position_clock_changed ();
void end_clock_changed ();
void length_clock_changed ();
+ void sync_offset_absolute_clock_changed ();
+ void sync_offset_relative_clock_changed ();
void audition_button_toggled ();