diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-05-21 16:44:06 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-05-21 16:44:06 +0100 |
| commit | 71d8cf20889a3c419c9a3e485f461236e5317423 (patch) | |
| tree | fb2108412c8a172b423cfe48b15a5f31617eade3 /src/lib/dcp_video_frame.cc | |
| parent | d2fef4faff679d564a72543c858c4bfb62f85791 (diff) | |
Tidy up logging a bit. Make it configurable from the GUI.
Diffstat (limited to 'src/lib/dcp_video_frame.cc')
| -rw-r--r-- | src/lib/dcp_video_frame.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc index 5cd6a118e..265cbaae8 100644 --- a/src/lib/dcp_video_frame.cc +++ b/src/lib/dcp_video_frame.cc @@ -63,6 +63,8 @@ #include "cross.h" #include "player_video_frame.h" +#define LOG_GENERAL(...) _log->log (String::compose (__VA_ARGS__), Log::GENERAL); + #include "i18n.h" using std::string; @@ -250,13 +252,13 @@ DCPVideoFrame::encode_locally () switch (_frame->eyes()) { case EYES_BOTH: - _log->log (String::compose (N_("Finished locally-encoded frame %1 for mono"), _index)); + LOG_GENERAL (N_("Finished locally-encoded frame %1 for mono"), _index); break; case EYES_LEFT: - _log->log (String::compose (N_("Finished locally-encoded frame %1 for L"), _index)); + LOG_GENERAL (N_("Finished locally-encoded frame %1 for L"), _index); break; case EYES_RIGHT: - _log->log (String::compose (N_("Finished locally-encoded frame %1 for R"), _index)); + LOG_GENERAL (N_("Finished locally-encoded frame %1 for R"), _index); break; default: break; @@ -293,7 +295,7 @@ DCPVideoFrame::encode_remotely (ServerDescription serv) root->add_child("Version")->add_child_text (raw_convert<string> (SERVER_LINK_VERSION)); add_metadata (root); - _log->log (String::compose (N_("Sending frame %1 to remote"), _index)); + LOG_GENERAL (N_("Sending frame %1 to remote"), _index); /* Send XML metadata */ stringstream xml; @@ -310,7 +312,7 @@ DCPVideoFrame::encode_remotely (ServerDescription serv) shared_ptr<EncodedData> e (new RemotelyEncodedData (socket->read_uint32 ())); socket->read (e->data(), e->size()); - _log->log (String::compose (N_("Finished remotely-encoded frame %1"), _index)); + LOG_GENERAL (N_("Finished remotely-encoded frame %1"), _index); return e; } |