projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hacks.
[dcpomatic.git]
/
src
/
lib
/
sndfile_content.h
diff --git
a/src/lib/sndfile_content.h
b/src/lib/sndfile_content.h
index 30eb23a4ed38e89bea2883274306647e9568d9a5..876d66088c6f7a5a84f4b289de622d43256d1d97 100644
(file)
--- a/
src/lib/sndfile_content.h
+++ b/
src/lib/sndfile_content.h
@@
-49,7
+49,7
@@
public:
return _audio_channels;
}
return _audio_channels;
}
-
ContentAudio
Frame audio_length () const {
+
AudioContent::
Frame audio_length () const {
boost::mutex::scoped_lock lm (_mutex);
return _audio_length;
}
boost::mutex::scoped_lock lm (_mutex);
return _audio_length;
}
@@
-72,7
+72,7
@@
public:
private:
int _audio_channels;
private:
int _audio_channels;
-
ContentAudio
Frame _audio_length;
+
AudioContent::
Frame _audio_length;
int _audio_frame_rate;
AudioMapping _audio_mapping;
};
int _audio_frame_rate;
AudioMapping _audio_mapping;
};