merge from 2.0-ongoing @ 3581

git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2008-09-10 15:03:30 +00:00
parent e4372df05b
commit 68e943265e
283 changed files with 8269 additions and 3942 deletions

View file

@ -50,6 +50,7 @@ class LocationEditRow : public Gtk::HBox
void set_session (ARDOUR::Session *);
void set_number (int);
void focus_name();
sigc::signal<void,ARDOUR::Location*> remove_requested;
sigc::signal<void> redraw_ranges;
@ -114,6 +115,7 @@ class LocationEditRow : public Gtk::HBox
void go_button_pressed (LocationPart part);
void clock_changed (LocationPart part);
void change_aborted (LocationPart part);
void cd_toggled ();
void hide_toggled ();
@ -149,6 +151,7 @@ class LocationUI : public ArdourDialog
private:
ARDOUR::LocationStack* locations;
ARDOUR::Location *newest_location;
void session_gone();