a) fix problems with multichannel tape tracks

 b) separate data format and header format for native audio files
 c) expose data/header selections in GUI
 d) fix error in file naming for multichannel tape tracks
 e) remove blocks on GTK rc files during startup


git-svn-id: svn://localhost/trunk/ardour2@423 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 15 insertions, 0 deletions

diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index 31de01916a..5cfe83e944 100644
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -501,3 +501,18 @@ ARDOUR::coverage (jack_nframes_t sa, jack_nframes_t ea,
 	return OverlapNone;
 }
 
+/* not sure where to put these */
+
+std::istream& operator>>(std::istream& o, HeaderFormat hf) {
+	int val;
+	o >> val;
+	hf = (HeaderFormat) val;
+	return o;
+}
+
+std::istream& operator>>(std::istream& o, SampleFormat sf) {
+	int val;
+	o >> val;
+	sf = (SampleFormat) val;
+	return o;
+}