projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
-Wnon-virtual-dtor
[ardour.git]
/
gtk2_ardour
/
location_ui.h
diff --git
a/gtk2_ardour/location_ui.h
b/gtk2_ardour/location_ui.h
index c9e7b496254dcef5003c8ebf90b478bf2489f67b..3be45dc3291039d59e5a191bd8ab3a9f8a1a1bd5 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"
@@
-45,7
+47,7
@@
class ClockGroup;
class LocationEditRow : public Gtk::HBox, public ARDOUR::SessionHandlePtr
{
class LocationEditRow : public Gtk::HBox, public ARDOUR::SessionHandlePtr
{
-
public:
+public:
LocationEditRow (ARDOUR::Session *sess=0, ARDOUR::Location *loc=0, int32_t num=-1);
virtual ~LocationEditRow();
LocationEditRow (ARDOUR::Session *sess=0, ARDOUR::Location *loc=0, int32_t num=-1);
virtual ~LocationEditRow();
@@
-56,13
+58,13
@@
class LocationEditRow : public Gtk::HBox, public ARDOUR::SessionHandlePtr
void set_number (int);
void focus_name();
void set_number (int);
void focus_name();
-
void set_clock_group (ClockGroup&);
-
void unset_clock_group () { _clock_group = 0; }
+ void set_clock_group (ClockGroup&);
+ void unset_clock_group () { _clock_group = 0; }
sigc::signal<void,ARDOUR::Location*> remove_requested;
sigc::signal<void> redraw_ranges;
sigc::signal<void,ARDOUR::Location*> remove_requested;
sigc::signal<void> redraw_ranges;
-
protected:
+protected:
enum LocationPart {
LocStart,
enum LocationPart {
LocStart,
@@
-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;
@@
-102,12
+106,12
@@
class LocationEditRow : public Gtk::HBox, public ARDOUR::SessionHandlePtr
Gtk::Label performer_label;
Gtk::Entry performer_entry;
Gtk::Label composer_label;
Gtk::Label performer_label;
Gtk::Entry performer_entry;
Gtk::Label composer_label;
- Gtk::Entry composer_entry;
+ Gtk::Entry composer_entry;
Gtk::CheckButton scms_check_button;
Gtk::Label scms_label;
Gtk::CheckButton preemph_check_button;
Gtk::Label preemph_label;
Gtk::CheckButton scms_check_button;
Gtk::Label scms_label;
Gtk::CheckButton preemph_check_button;
Gtk::Label preemph_label;
-
ClockGroup* _clock_group;
+ ClockGroup* _clock_group;
guint32 i_am_the_modifier;
int number;
guint32 i_am_the_modifier;
int number;
@@
-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*);
@@
-147,12
+152,12
@@
class LocationEditRow : public Gtk::HBox, public ARDOUR::SessionHandlePtr
class LocationUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
{
class LocationUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
{
-
public:
- LocationUI ();
+public:
+ LocationUI (
std::string state_node_name = "LocationUI"
);
~LocationUI ();
void set_session (ARDOUR::Session *);
~LocationUI ();
void set_session (ARDOUR::Session *);
-
void set_clock_mode (AudioClock::Mode);
+ void set_clock_mode (AudioClock::Mode);
void add_new_location();
void add_new_range();
void add_new_location();
void add_new_range();
@@
-160,8
+165,9
@@
class LocationUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
void refresh_location_list ();
XMLNode & get_state () const;
void refresh_location_list ();
XMLNode & get_state () const;
+ int set_state (const XMLNode&);
-
private:
+private:
/** set to the location that has just been created with the LocationUI `add' button
(if Config->get_name_new_markers() is true); if it is non-0, the name entry of
the location is given the focus by location_added().
/** set to the location that has just been created with the LocationUI `add' button
(if Config->get_name_new_markers() is true); if it is non-0, the name entry of
the location is given the focus by location_added().
@@
-174,7
+180,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;
@@
-203,13
+209,18
@@
class LocationUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
void location_added (ARDOUR::Location *);
void map_locations (const ARDOUR::Locations::LocationList&);
void location_added (ARDOUR::Location *);
void map_locations (const ARDOUR::Locations::LocationList&);
- ClockGroup* _clock_group;
- AudioClock::Mode clock_mode_from_session_instant_xml () const;
+ ClockGroup* _clock_group;
+ AudioClock::Mode clock_mode_from_session_instant_xml ();
+
+ AudioClock::Mode _mode;
+ bool _mode_set;
+
+ std::string _state_node_name;
};
class LocationUIWindow : public ArdourWindow
{
};
class LocationUIWindow : public ArdourWindow
{
-
public:
+public:
LocationUIWindow ();
~LocationUIWindow ();
LocationUIWindow ();
~LocationUIWindow ();
@@
-218,7
+229,7
@@
class LocationUIWindow : public ArdourWindow
LocationUI& ui() { return _ui; }
LocationUI& ui() { return _ui; }
-
protected:
+protected:
LocationUI _ui;
bool on_delete_event (GdkEventAny*);
void session_going_away();
LocationUI _ui;
bool on_delete_event (GdkEventAny*);
void session_going_away();