From f6da2b13f9b90eb94dee777986035ced73a53810 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 18 May 2006 21:16:39 +0000 Subject: [PATCH] fix egregious bug regarding setting native file header+data formats git-svn-id: svn://localhost/trunk/ardour2@512 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/ardour/types.h | 4 ++-- libs/ardour/globals.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h index 8dc4ce55e4..03695bcb9e 100644 --- a/libs/ardour/ardour/types.h +++ b/libs/ardour/ardour/types.h @@ -261,8 +261,8 @@ namespace ARDOUR { }; -std::istream& operator>>(std::istream& o, ARDOUR::SampleFormat sf); -std::istream& operator>>(std::istream& o, ARDOUR::HeaderFormat sf); +std::istream& operator>>(std::istream& o, ARDOUR::SampleFormat& sf); +std::istream& operator>>(std::istream& o, ARDOUR::HeaderFormat& sf); static inline jack_nframes_t session_frame_to_track_frame (jack_nframes_t session_frame, double speed) diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc index eb46943a43..4879e373d5 100644 --- a/libs/ardour/globals.cc +++ b/libs/ardour/globals.cc @@ -546,14 +546,14 @@ ARDOUR::coverage (jack_nframes_t sa, jack_nframes_t ea, /* not sure where to put these */ -std::istream& operator>>(std::istream& o, HeaderFormat hf) { +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) { +std::istream& operator>>(std::istream& o, SampleFormat& sf) { int val; o >> val; sf = (SampleFormat) val;