* libardour uses ARDOUR::nframes_t and ARDOUR::nframes64_t explicitly in headers

* use explicit operator<< and operator>> that in turn use PBD::EnumWriter when serializing and deserializing to/from rc files
* adds scrolling in mixer window (from 2.X)
* BBT math stuff - untested, but basically operational
* move LocaleGuard into its own file(s) in libs/pbd
* Tempo now uses nframes64_t everywhere (except for sample rate values)
* as in 2.X, use mkstemp and hack to avoid temp file nonsense, and remove erroneous free() from disk stats output


git-svn-id: svn://localhost/ardour2/branches/3.0@5961 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 6 insertions, 14 deletions

diff --git a/libs/ardour/ardour/ardour.h b/libs/ardour/ardour/ardour.h
index d7c67998c7..a1b3d06f62 100644
--- a/libs/ardour/ardour/ardour.h
+++ b/libs/ardour/ardour/ardour.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 1999 Paul Davis
+    Copyright (C) 1999-2009 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
@@ -28,10 +28,11 @@
 
 #include "pbd/error.h"
 #include "pbd/failed_constructor.h"
+#include "pbd/locale_guard.h"
 
 #include "ardour/types.h"
 
-// #include <jack/jack.h> need this to inline jack_get_microseconds
+#include <jack/jack.h> 
 
 namespace MIDI {
 	class MachineControl;
@@ -56,13 +57,10 @@ namespace ARDOUR {
 
 	const layer_t max_layer = UCHAR_MAX;
 
-	microseconds_t get_microseconds ();
-/*	{
-        JACK has exported this functionality for a long time now
-	but inlining this causes problems
-        return (microseconds_t) jack_get_time();
+	static inline microseconds_t get_microseconds () {
+		return (microseconds_t) jack_get_time();
 	}
-*/
+
 	Change new_change ();
 
 	extern Change StartChanged;
@@ -71,12 +69,6 @@ namespace ARDOUR {
 	extern Change NameChanged;
 	extern Change BoundsChanged;
 
-	struct LocaleGuard {
-		LocaleGuard (const char*);
-		~LocaleGuard ();
-		const char* old;
-	};
-
 	static const double SHUTTLE_FRACT_SPEED1=0.48412291827; /* derived from A1,A2 */
 
 	void setup_fpu ();