projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Re-work idle handling from previous commit.
[dcpomatic.git]
/
src
/
lib
/
audio_decoder.cc
diff --git
a/src/lib/audio_decoder.cc
b/src/lib/audio_decoder.cc
index 95b3a130db0287819cfe623656adbc7eb08a8a8c..e0fb20b7eec172dbff61ff1e68bae2f8196d4310 100644
(file)
--- a/
src/lib/audio_decoder.cc
+++ b/
src/lib/audio_decoder.cc
@@
-21,6
+21,7
@@
#include "audio_decoder.h"
#include "audio_buffers.h"
#include "audio_content.h"
#include "audio_decoder.h"
#include "audio_buffers.h"
#include "audio_content.h"
+#include "dcpomatic_log.h"
#include "log.h"
#include "resampler.h"
#include "compose.hpp"
#include "log.h"
#include "resampler.h"
#include "compose.hpp"
@@
-29,13
+30,12
@@
#include "i18n.h"
#include "i18n.h"
-#define LOG_GENERAL(...) dcpomatic_log->log (String::compose(__VA_ARGS__), LogEntry::TYPE_GENERAL);
-
using std::cout;
using std::map;
using std::pair;
using boost::shared_ptr;
using boost::optional;
using std::cout;
using std::map;
using std::pair;
using boost::shared_ptr;
using boost::optional;
+using namespace dcpomatic;
AudioDecoder::AudioDecoder (Decoder* parent, shared_ptr<const AudioContent> content, bool fast)
: DecoderPart (parent)
AudioDecoder::AudioDecoder (Decoder* parent, shared_ptr<const AudioContent> content, bool fast)
: DecoderPart (parent)