diff options
| author | David Robillard <d@drobilla.net> | 2008-02-02 17:22:04 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-02-02 17:22:04 +0000 |
| commit | 80c3677c837cc9eb432df3d65a34aba543fa7258 (patch) | |
| tree | ca23bb7e5bff6c35c151d73221002a9ce3abfe1a /gtk2_ardour/ardour_ui.h | |
| parent | 9f63ab9931e6478472853bdda58da47ea29ac125 (diff) | |
Merge with 2.0-ongoing R2988
git-svn-id: svn://localhost/ardour2/branches/3.0@2991 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour_ui.h')
| -rw-r--r-- | gtk2_ardour/ardour_ui.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index 247d4cf6b3..01e53c7d54 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -660,7 +660,9 @@ class ARDOUR_UI : public Gtkmm2ext::UI About* about; Splash* splash; + void pop_back_splash (); bool shown_flag; + /* cleanup */ Gtk::MenuItem *cleanup_item; @@ -682,6 +684,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI void disk_underrun_handler (); int pending_state_dialog (); + int sr_mismatch_dialog (nframes_t, nframes_t); void disconnect_from_jack (); void reconnect_to_jack (); |