new automation state model, sort of working, but not really

[ardour.git] / libs / ardour / globals.cc

diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index c9c244ca3c12bee53032f5dbf937a3fb5a5c813e..1d510cfef1d42f60f7fe226b4b62fefc0eb4ff57 100644 (file)
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -15,7 +15,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
+    $Id: globals.cc 935 2006-09-29 21:39:39Z paul $
 */
 
 #include <cstdio> // Needed so that libraptor (included in lrdf) won't complain
@@ -357,6 +357,12 @@ ARDOUR::new_change ()
        return c;
 }
 
+string
+ARDOUR::get_ardour_revision ()
+{
+       return "$Rev$";
+}
+
 string
 ARDOUR::get_user_ardour_path ()
 {
@@ -494,8 +500,8 @@ ARDOUR::LocaleGuard::~LocaleGuard ()
 }
 
 ARDOUR::OverlapType
-ARDOUR::coverage (jack_nframes_t sa, jack_nframes_t ea, 
-                 jack_nframes_t sb, jack_nframes_t eb)
+ARDOUR::coverage (nframes_t sa, nframes_t ea, 
+                 nframes_t sb, nframes_t eb)
 {
        /* OverlapType returned reflects how the second (B)
           range overlaps the first (A).
@@ -585,6 +591,7 @@ std::istream& int_to_type (std::istream& o, T& hf) {
 std::istream& operator>>(std::istream& o, HeaderFormat& var) { return int_to_type<HeaderFormat> (o, var); }
 std::istream& operator>>(std::istream& o, SampleFormat& var) { return int_to_type<SampleFormat> (o, var); }
 std::istream& operator>>(std::istream& o, AutoConnectOption& var) { return int_to_type<AutoConnectOption> (o, var); }
+std::istream& operator>>(std::istream& o, MonitorModel& var) { return int_to_type<MonitorModel> (o, var); }
 std::istream& operator>>(std::istream& o, EditMode& var) { return int_to_type<EditMode> (o, var); }
 std::istream& operator>>(std::istream& o, SoloModel& var) { return int_to_type<SoloModel> (o, var); }
 std::istream& operator>>(std::istream& o, LayerModel& var) { return int_to_type<LayerModel> (o, var); }