X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Flocation_ui.h;h=3be45dc3291039d59e5a191bd8ab3a9f8a1a1bd5;hb=1f9c26136cc5ee6d9f0f05f94d0a9280214b879d;hp=c3f07cc84d980c6298bf414b22be420e7e920328;hpb=cac03dbeb6ebdcd406385dd14a746cb8c51dd5f8;p=ardour.git diff --git a/gtk2_ardour/location_ui.h b/gtk2_ardour/location_ui.h index c3f07cc84d..3be45dc329 100644 --- a/gtk2_ardour/location_ui.h +++ b/gtk2_ardour/location_ui.h @@ -26,7 +26,6 @@ #include #include #include -#include #include #include "pbd/signals.h" @@ -34,17 +33,21 @@ #include "ardour/location.h" #include "ardour/session_handle.h" -#include "ardour_dialog.h" +#include + +#include "ardour_button.h" +#include "ardour_window.h" #include "audio_clock.h" namespace ARDOUR { - class LocationStack; class Location; } +class ClockGroup; + 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(); @@ -55,11 +58,13 @@ class LocationEditRow : public Gtk::HBox, public ARDOUR::SessionHandlePtr void set_number (int); void focus_name(); + void set_clock_group (ClockGroup&); + void unset_clock_group () { _clock_group = 0; } sigc::signal remove_requested; sigc::signal redraw_ranges; - protected: +protected: enum LocationPart { LocStart, @@ -76,18 +81,22 @@ class LocationEditRow : public Gtk::HBox, public ARDOUR::SessionHandlePtr Gtk::Label number_label; Gtk::HBox start_hbox; - Gtk::Button start_go_button; AudioClock start_clock; + ArdourButton start_to_playhead_button; + ArdourButton locate_to_start_button; Gtk::HBox end_hbox; - Gtk::Button end_go_button; AudioClock end_clock; + ArdourButton end_to_playhead_button; + ArdourButton locate_to_end_button; AudioClock length_clock; Gtk::CheckButton cd_check_button; Gtk::CheckButton hide_check_button; + Gtk::CheckButton lock_check_button; + Gtk::CheckButton glue_check_button; - Gtk::Button remove_button; + ArdourButton remove_button; Gtk::HBox cd_track_details_hbox; Gtk::Entry isrc_entry; @@ -95,11 +104,14 @@ class LocationEditRow : public Gtk::HBox, public ARDOUR::SessionHandlePtr Gtk::Label performer_label; - Gtk::Entry performer_entry; + 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; + ClockGroup* _clock_group; guint32 i_am_the_modifier; int number; @@ -109,63 +121,72 @@ class LocationEditRow : public Gtk::HBox, public ARDOUR::SessionHandlePtr void performer_entry_changed (); void composer_entry_changed (); - void set_button_pressed (LocationPart part); - void go_button_pressed (LocationPart part); + void to_playhead_button_pressed (LocationPart part); + void locate_button_pressed (LocationPart part); void clock_changed (LocationPart part); - void change_aborted (LocationPart part); + bool locate_to_clock (GdkEventButton*, AudioClock*); void cd_toggled (); void hide_toggled (); + void lock_toggled (); + void glue_toggled (); void remove_button_pressed (); void scms_toggled (); void preemph_toggled (); - void end_changed (ARDOUR::Location *); - void start_changed (ARDOUR::Location *); - void name_changed (ARDOUR::Location *); - void location_changed (ARDOUR::Location *); - void flags_changed (ARDOUR::Location *, void *src); + void end_changed (); + void start_changed (); + void name_changed (); + void location_changed (); + void flags_changed (); + void lock_changed (); + void position_lock_style_changed (); + + void set_clock_editable_status (); + void show_cd_track_details (); PBD::ScopedConnectionList connections; }; class LocationUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr { - public: - LocationUI (); +public: + LocationUI (std::string state_node_name = "LocationUI"); ~LocationUI (); - + void set_session (ARDOUR::Session *); + void set_clock_mode (AudioClock::Mode); void add_new_location(); void add_new_range(); void refresh_location_list (); - private: - ARDOUR::LocationStack* locations; + XMLNode & get_state () const; + int set_state (const XMLNode&); + +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(). + */ ARDOUR::Location *newest_location; void session_going_away (); - Gtk::VBox location_vpacker; - LocationEditRow loop_edit_row; LocationEditRow punch_edit_row; Gtk::VBox loop_punch_box; - Gtk::ScrolledWindow loop_punch_scroller; - Gtk::VPaned loc_range_panes; + Gtkmm2ext::VPane loc_range_panes; - Gtk::Frame loc_frame; Gtk::VBox loc_frame_box; Gtk::Button add_location_button; Gtk::ScrolledWindow location_rows_scroller; Gtk::VBox location_rows; - Gtk::Frame range_frame; Gtk::VBox range_frame_box; Gtk::Button add_range_button; Gtk::ScrolledWindow range_rows_scroller; @@ -186,22 +207,29 @@ class LocationUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr void location_removed (ARDOUR::Location *); void location_added (ARDOUR::Location *); - void locations_changed (ARDOUR::Locations::Change); - void map_locations (ARDOUR::Locations::LocationList&); + void map_locations (const ARDOUR::Locations::LocationList&); + + 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 ArdourDialog +class LocationUIWindow : public ArdourWindow { - public: +public: LocationUIWindow (); ~LocationUIWindow (); - void on_show(); + void on_map (); void set_session (ARDOUR::Session *); LocationUI& ui() { return _ui; } - protected: +protected: LocationUI _ui; bool on_delete_event (GdkEventAny*); void session_going_away();