stereo and mono panner tweaks to use cairomm and rounded rectangles and more

[ardour.git] / gtk2_ardour / startup.h

diff --git a/gtk2_ardour/startup.h b/gtk2_ardour/startup.h
index 397b7314e65c446d87f6200dccca06837705a9c8..06642c1d80a215d2bb4d969bced476300fbfa162 100644 (file)
--- a/gtk2_ardour/startup.h
+++ b/gtk2_ardour/startup.h
@@ -51,11 +51,11 @@ class ArdourStartup : public Gtk::Assistant {
        void set_new_only (bool);
         void set_load_template( std::string load_template );
 
-       Glib::ustring session_name (bool& should_be_new);
-       Glib::ustring session_folder ();
+       std::string session_name (bool& should_be_new);
+       std::string session_folder ();
 
        bool use_session_template();
-       Glib::ustring session_template_name();
+       std::string session_template_name();
 
        EngineControl* engine_control() { return engine_dialog; }
 
@@ -141,8 +141,6 @@ class ArdourStartup : public Gtk::Assistant {
        /* recent sessions */
 
        void setup_existing_session_page ();
-       /** true when setup_existing_session_page () has already been called at least once */
-       bool _have_setup_existing_session_page;
 
        struct RecentSessionsSorter {
            bool operator() (std::pair<std::string,std::string> a, std::pair<std::string,std::string> b) const {
@@ -155,8 +153,8 @@ class ArdourStartup : public Gtk::Assistant {
                    add (visible_name);
                    add (fullpath);
            }
-           Gtk::TreeModelColumn<Glib::ustring> visible_name;
-           Gtk::TreeModelColumn<Glib::ustring> fullpath;
+           Gtk::TreeModelColumn<std::string> visible_name;
+           Gtk::TreeModelColumn<std::string> fullpath;
        };
 
        RecentSessionModelColumns    recent_session_columns;
@@ -198,6 +196,7 @@ class ArdourStartup : public Gtk::Assistant {
        Gtk::ComboBox template_chooser;
 
        Gtk::VBox session_new_vbox;
+       Gtk::VBox session_existing_vbox;
        Gtk::CheckButton more_new_session_options_button;
        Gtk::RadioButtonGroup session_template_group;
        Gtk::RadioButton use_session_as_template_button;