add VU and IEC meter DSP (from jmeters)

[ardour.git] / gtk2_ardour / startup.h

diff --git a/gtk2_ardour/startup.h b/gtk2_ardour/startup.h
index a7f1517f417abee4616743af22fd2720140452f7..4af6ffbc2ac28d5a91594f0cb645439289f3c0ea 100644 (file)
--- a/gtk2_ardour/startup.h
+++ b/gtk2_ardour/startup.h
@@ -39,19 +39,16 @@
 #include <gtkmm/liststore.h>
 #include <gtkmm/combobox.h>
 
-#include "pbd/filesystem.h"
-
 #include "ardour/utils.h"
 
 class EngineControl;
 
 class ArdourStartup : public Gtk::Assistant {
   public:
-       ArdourStartup ();
+        ArdourStartup (bool require_new, const std::string& session_name, const std::string& session_path, const std::string& template_name);
        ~ArdourStartup ();
 
-       void set_new_only (bool);
-        void set_load_template( std::string load_template );
+        bool ready_without_display () const;
 
        std::string session_name (bool& should_be_new);
        std::string session_folder ();
@@ -85,9 +82,13 @@ class ArdourStartup : public Gtk::Assistant {
        gint _response;
        bool config_modified;
        bool new_user;
+        bool need_audio_setup;
+        bool need_session_info;
        bool new_only;
+        std::string _provided_session_name;
+        std::string _provided_session_path;
 
-       PBD::sys::path been_here_before_path () const;
+       std::string been_here_before_path () const;
 
        void on_apply ();
        void on_cancel ();
@@ -117,7 +118,7 @@ class ArdourStartup : public Gtk::Assistant {
        Gtk::VBox ic_vbox;
        Gtk::RadioButton ic_new_session_button;
        Gtk::RadioButton ic_existing_session_button;
-       bool initial_button_press(GdkEventButton *);
+        bool initial_button_clicked(GdkEventButton*);
        void initial_button_activated();
 
        /* monitoring choices */
@@ -155,9 +156,11 @@ class ArdourStartup : public Gtk::Assistant {
        struct RecentSessionModelColumns : public Gtk::TreeModel::ColumnRecord {
            RecentSessionModelColumns() {
                    add (visible_name);
+                   add (tip);
                    add (fullpath);
            }
            Gtk::TreeModelColumn<std::string> visible_name;
+           Gtk::TreeModelColumn<std::string> tip;
            Gtk::TreeModelColumn<std::string> fullpath;
        };
 
@@ -183,7 +186,6 @@ class ArdourStartup : public Gtk::Assistant {
        Gtk::Entry new_name_entry;
        Gtk::FileChooserButton new_folder_chooser;
        Gtk::FileChooserButton session_template_chooser;
-        void new_name_mapped ();
 
        struct SessionTemplateColumns : public Gtk::TreeModel::ColumnRecord {
                SessionTemplateColumns () {
@@ -292,7 +294,13 @@ class ArdourStartup : public Gtk::Assistant {
        void move_along_now ();
 
        bool _existing_session_chooser_used; ///< set to true when the existing session chooser has been used
-        void setup_alpha_page ();
+        void setup_prerelease_page ();
+
+       Gtk::Label info_scroller_label;
+        std::string::size_type info_scroller_count;
+        bool info_scroller_update();
+       sigc::connection info_scroller_connection;
+        void updates_button_clicked ();
 };
 
 #endif /* __gtk2_ardour_startup_h__ */