Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas

[ardour.git] / gtk2_ardour / session_dialog.h

diff --git a/gtk2_ardour/session_dialog.h b/gtk2_ardour/session_dialog.h
index ac4c1a7925b853729b2b5ec8f4f40c44c435b727..2178cfbe7364393778291a80ba83011f07b1d3a4 100644 (file)
--- a/gtk2_ardour/session_dialog.h
+++ b/gtk2_ardour/session_dialog.h
@@ -47,12 +47,15 @@ class EngineControl;
 
 class SessionDialog : public ArdourDialog {
   public:
-        SessionDialog (bool require_new, const std::string& session_name, const std::string& session_path, const std::string& template_name);
+        SessionDialog (bool require_new, const std::string& session_name, const std::string& session_path, 
+                      const std::string& template_name, bool cancel_not_quit);
        ~SessionDialog ();
 
+        void clear_given ();
+
        std::string session_name (bool& should_be_new);
        std::string session_folder ();
-
+    
        bool use_session_template();
        std::string session_template_name();
 
@@ -86,6 +89,8 @@ class SessionDialog : public ArdourDialog {
 
         bool back_button_pressed (GdkEventButton*);
 
+        Gtk::Frame info_frame;
+
        /* initial choice page */
 
        void setup_initial_choice_box ();
@@ -108,10 +113,14 @@ class SessionDialog : public ArdourDialog {
                    add (visible_name);
                    add (tip);
                    add (fullpath);
+                   add (sample_rate);
+                   add (disk_format);
            }
            Gtk::TreeModelColumn<std::string> visible_name;
            Gtk::TreeModelColumn<std::string> tip;
            Gtk::TreeModelColumn<std::string> fullpath;
+           Gtk::TreeModelColumn<std::string> sample_rate;
+           Gtk::TreeModelColumn<std::string> disk_format;
        };
 
        RecentSessionModelColumns    recent_session_columns;