diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-01-18 00:09:55 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-01-18 00:09:55 +0000 |
| commit | 574db5d874f3a9c7645c91d9ffe71c869880aa07 (patch) | |
| tree | a913d1f8465a7368f80b5012c2aba2177e428aea /gtk2_ardour/ardour_ui.h | |
| parent | 03d2616dbc03ecb18b78d28d3ab3dc302f77eaed (diff) | |
audun's waveview outline patch; some diskstream fixes; real splash screen; more reorganization of new session dialog use; about is not marked as a splashscreen anymore (help out KDE users)
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2935 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour_ui.h')
| -rw-r--r-- | gtk2_ardour/ardour_ui.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index eef0dea451..58832a2b10 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -73,6 +73,7 @@ class Mixer_UI; class ConnectionEditor; class RouteParams_UI; class About; +class Splash; class AddRouteDialog; class LocationUI; class ThemeManager; @@ -109,6 +110,9 @@ class ARDOUR_UI : public Gtkmm2ext::UI void show_splash (); void hide_splash (); + + void show_about (); + void hide_about (); int load_session (const Glib::ustring & path, const Glib::ustring& snapshot, Glib::ustring mix_template = Glib::ustring()); bool session_loaded; @@ -132,8 +136,11 @@ class ARDOUR_UI : public Gtkmm2ext::UI _will_create_new_session_automatically = yn; } - bool get_session_parameters (Glib::ustring path, bool have_engine = false, bool should_be_new = false); - gint cmdline_new_session (string path); + bool get_session_parameters (bool have_engine = false, bool should_be_new = false); + void parse_cmdline_path (const Glib::ustring& cmdline_path, Glib::ustring& session_name, Glib::ustring& session_path, bool& existing_session); + int load_cmdline_session (const Glib::ustring& session_name, const Glib::ustring& session_path, bool& existing_session); + int build_session_from_nsd (const Glib::ustring& session_name, const Glib::ustring& session_path); + bool ask_about_loading_existing_session (const Glib::ustring& session_path); int unload_session (bool hide_stuff = false); void close_session(); @@ -639,6 +646,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI void count_recenabled_streams (ARDOUR::Route&); About* about; + Splash* splash; bool shown_flag; /* cleanup */ |