Use labs() for long instead of abs()

[ardour.git] / gtk2_ardour / session_dialog.h

diff --git a/gtk2_ardour/session_dialog.h b/gtk2_ardour/session_dialog.h
index ff630c2cd5a50faa101ac0e02c84cb81418e53da..f7e86fb7dbc90d47f6f00da8d41c4bb0b866cc9b 100644 (file)
--- a/gtk2_ardour/session_dialog.h
+++ b/gtk2_ardour/session_dialog.h
@@ -1,21 +1,22 @@
 /*
-    Copyright (C) 2010 Paul Davis
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
+ * Copyright (C) 2013-2017 Paul Davis <paul@linuxaudiosystems.com>
+ * Copyright (C) 2014-2017 Robin Gareus <robin@gareus.org>
+ * Copyright (C) 2017 Ben Loftis <ben@harrisonconsoles.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #ifndef __gtk2_ardour_session_dialog_h__
 #define __gtk2_ardour_session_dialog_h__
@@ -54,8 +55,6 @@ public:
        SessionDialog ();
        ~SessionDialog ();
 
-       void clear_given ();
-
        std::string session_name (bool& should_be_new);
        std::string session_folder ();
 
@@ -64,15 +63,11 @@ public:
 
        uint32_t master_channel_count();
 
-       void set_provided_session(const std::string& session_name, const std::string& session_path) {
-               _provided_session_name = session_name;
-               _provided_session_path = session_path;
-       }
+       void set_provided_session (std::string const & name, std::string const & path);
+       void clear_name ();
 
 private:
        bool new_only;
-       std::string _provided_session_name;
-       std::string _provided_session_path;
 
        bool on_delete_event (GdkEventAny*);
 
@@ -113,6 +108,7 @@ private:
                        add (fullpath);
                        add (sample_rate);
                        add (disk_format);
+                       add (modified_with);
                        add (time_modified);
                        add (time_formatted);
                }
@@ -121,6 +117,7 @@ private:
                Gtk::TreeModelColumn<std::string> fullpath;
                Gtk::TreeModelColumn<std::string> sample_rate;
                Gtk::TreeModelColumn<std::string> disk_format;
+               Gtk::TreeModelColumn<std::string> modified_with;
                Gtk::TreeModelColumn<int64_t>     time_modified;
                Gtk::TreeModelColumn<std::string> time_formatted;
        };
@@ -153,21 +150,21 @@ private:
                        add (name);
                        add (path);
                        add (description);
-                       add (created_with_short);
-                       add (created_with_long);
+                       add (modified_with_short);
+                       add (modified_with_long);
                }
 
                Gtk::TreeModelColumn<std::string> name;
                Gtk::TreeModelColumn<std::string> path;
                Gtk::TreeModelColumn<std::string> description;
-               Gtk::TreeModelColumn<std::string> created_with_short;
-               Gtk::TreeModelColumn<std::string> created_with_long;
+               Gtk::TreeModelColumn<std::string> modified_with_short;
+               Gtk::TreeModelColumn<std::string> modified_with_long;
        };
 
        SessionTemplateColumns session_template_columns;
 
-    Glib::RefPtr<Gtk::TreeStore>  template_model;
-    Gtk::TreeView                 template_chooser;
+       Glib::RefPtr<Gtk::TreeStore>  template_model;
+       Gtk::TreeView                 template_chooser;
        Gtk::ScrolledWindow           template_scroller;
 
        void template_row_selected ();
@@ -188,7 +185,7 @@ private:
        void disable_plugins_clicked ();
 
        /* meta-template */
-       uint32_t meta_master_bus_profile (std::string script) const;
+       static uint32_t meta_master_bus_profile (std::string script);
 
        /* always there */