projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Put Time types in dcpomatic namespace.
[dcpomatic.git]
/
src
/
lib
/
audio_merger.cc
diff --git
a/src/lib/audio_merger.cc
b/src/lib/audio_merger.cc
index a16c378c67309dac758c90abd27fc275ef7db769..1cc5ff0a19de156bdee0e7e6a6dd3da56e47dc49 100644
(file)
--- a/
src/lib/audio_merger.cc
+++ b/
src/lib/audio_merger.cc
@@
-33,6
+33,7
@@
using std::cout;
using std::make_pair;
using boost::shared_ptr;
using boost::optional;
+using namespace dcpomatic;
AudioMerger::AudioMerger (int frame_rate)
: _frame_rate (frame_rate)