projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Further fixes to non-cxx11 enabled builds
[ardour.git]
/
gtk2_ardour
/
location_ui.h
diff --git
a/gtk2_ardour/location_ui.h
b/gtk2_ardour/location_ui.h
index c9e7b496254dcef5003c8ebf90b478bf2489f67b..cdbc952e6c11821cbf6bacb727d0a112b3367363 100644
(file)
--- a/
gtk2_ardour/location_ui.h
+++ b/
gtk2_ardour/location_ui.h
@@
-26,7
+26,6
@@
#include <gtkmm/table.h>
#include <gtkmm/entry.h>
#include <gtkmm/label.h>
#include <gtkmm/table.h>
#include <gtkmm/entry.h>
#include <gtkmm/label.h>
-#include <gtkmm/paned.h>
#include <gtkmm/scrolledwindow.h>
#include "pbd/signals.h"
#include <gtkmm/scrolledwindow.h>
#include "pbd/signals.h"
@@
-34,6
+33,9
@@
#include "ardour/location.h"
#include "ardour/session_handle.h"
#include "ardour/location.h"
#include "ardour/session_handle.h"
+#include <gtkmm2ext/pane.h>
+
+#include "ardour_button.h"
#include "ardour_window.h"
#include "audio_clock.h"
#include "ardour_window.h"
#include "audio_clock.h"
@@
-80,11
+82,13
@@
class LocationEditRow : public Gtk::HBox, public ARDOUR::SessionHandlePtr
Gtk::HBox start_hbox;
AudioClock start_clock;
Gtk::HBox start_hbox;
AudioClock start_clock;
- Gtk::Button start_to_playhead_button;
+ ArdourButton start_to_playhead_button;
+ ArdourButton locate_to_start_button;
Gtk::HBox end_hbox;
AudioClock end_clock;
Gtk::HBox end_hbox;
AudioClock end_clock;
- Gtk::Button end_to_playhead_button;
+ ArdourButton end_to_playhead_button;
+ ArdourButton locate_to_end_button;
AudioClock length_clock;
Gtk::CheckButton cd_check_button;
AudioClock length_clock;
Gtk::CheckButton cd_check_button;
@@
-92,7
+96,7
@@
class LocationEditRow : public Gtk::HBox, public ARDOUR::SessionHandlePtr
Gtk::CheckButton lock_check_button;
Gtk::CheckButton glue_check_button;
Gtk::CheckButton lock_check_button;
Gtk::CheckButton glue_check_button;
-
Gtk::
Button remove_button;
+
Ardour
Button remove_button;
Gtk::HBox cd_track_details_hbox;
Gtk::Entry isrc_entry;
Gtk::HBox cd_track_details_hbox;
Gtk::Entry isrc_entry;
@@
-118,6
+122,7
@@
class LocationEditRow : public Gtk::HBox, public ARDOUR::SessionHandlePtr
void composer_entry_changed ();
void to_playhead_button_pressed (LocationPart part);
void composer_entry_changed ();
void to_playhead_button_pressed (LocationPart part);
+ void locate_button_pressed (LocationPart part);
void clock_changed (LocationPart part);
bool locate_to_clock (GdkEventButton*, AudioClock*);
void clock_changed (LocationPart part);
bool locate_to_clock (GdkEventButton*, AudioClock*);
@@
-174,7
+179,7
@@
class LocationUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
LocationEditRow punch_edit_row;
Gtk::VBox loop_punch_box;
LocationEditRow punch_edit_row;
Gtk::VBox loop_punch_box;
- Gtk
::VPaned
loc_range_panes;
+ Gtk
mm2ext::VPane
loc_range_panes;
Gtk::VBox loc_frame_box;
Gtk::Button add_location_button;
Gtk::VBox loc_frame_box;
Gtk::Button add_location_button;