diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2009-11-12 05:47:05 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-11-12 05:47:05 +0000 |
commit | 7857ec8b456d6fc233d1ee9b111744fc831dccca (patch) | |
tree | 3ed7547a518465b471b9bc835ce84389602edaf9 /gtk2_ardour/location_ui.h | |
parent | c4c25e19bc75354ffc69e258c9f167ad586a1cd9 (diff) |
comments for BBT math methods; remove chunks from GUI; split location UI into a widget and a window; add the widget part to the editor RHS notebook. this is unfinished - it looks absurd. but its the starting point for a reworking of the location UI in its rightful place
git-svn-id: svn://localhost/ardour2/branches/3.0@6071 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/location_ui.h')
-rw-r--r-- | gtk2_ardour/location_ui.h | 36 |
1 files changed, 25 insertions, 11 deletions
diff --git a/gtk2_ardour/location_ui.h b/gtk2_ardour/location_ui.h index 30bb7ec13b..56d6505434 100644 --- a/gtk2_ardour/location_ui.h +++ b/gtk2_ardour/location_ui.h @@ -26,10 +26,13 @@ #include <gtkmm/table.h> #include <gtkmm/entry.h> #include <gtkmm/label.h> +#include <gtkmm/paned.h> +#include <gtkmm/scrolledwindow.h> #include "ardour/location.h" #include "ardour_dialog.h" +#include "audio_clock.h" namespace ARDOUR { class LocationStack; @@ -137,25 +140,28 @@ class LocationEditRow : public Gtk::HBox }; - -class LocationUI : public ArdourDialog +class LocationUI : public Gtk::HBox { public: LocationUI (); ~LocationUI (); + + virtual void set_session (ARDOUR::Session *); - void set_session (ARDOUR::Session *); + void add_new_location(); + void add_new_range(); - void on_show(); + void refresh_location_list (); + void refresh_location_list_s (ARDOUR::Change); private: + ARDOUR::Session* session; ARDOUR::LocationStack* locations; ARDOUR::Location *newest_location; void session_gone(); Gtk::VBox location_vpacker; - Gtk::HBox location_hpacker; LocationEditRow loop_edit_row; LocationEditRow punch_edit_row; @@ -174,7 +180,6 @@ class LocationUI : public ArdourDialog Gtk::ScrolledWindow range_rows_scroller; Gtk::VBox range_rows; - /* When any location changes it start or end points, it sends a signal that is caught by one of these functions @@ -188,17 +193,26 @@ class LocationUI : public ArdourDialog guint32 i_am_the_modifier; - void add_new_location(); - void add_new_range(); - - void refresh_location_list (); - void refresh_location_list_s (ARDOUR::Change); void location_removed (ARDOUR::Location *); void location_added (ARDOUR::Location *); void map_locations (ARDOUR::Locations::LocationList&); +}; + +class LocationUIWindow : public ArdourDialog +{ + public: + LocationUIWindow (); + ~LocationUIWindow (); + + void on_show(); + void set_session (ARDOUR::Session *); + + LocationUI& ui() { return _ui; } protected: + LocationUI _ui; bool on_delete_event (GdkEventAny*); + void session_gone(); }; #endif // __ardour_location_ui_h__ |