fix egregious bug regarding setting native file header+data formats

git-svn-id: svn://localhost/trunk/ardour2@512 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2006-05-18 21:16:39 +00:00
parent 70ab1cce42
commit f6da2b13f9
2 changed files with 4 additions and 4 deletions

View file

@ -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)

View file

@ -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;