projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
dcp_video_frame.cc
diff --git
a/src/lib/dcp_video_frame.cc
b/src/lib/dcp_video_frame.cc
index d154ba96b074298824da3713de768e892e6e5ed2..1aae64ac7aafd98fa40e59316dcb73872fc421b0 100644
(file)
--- a/
src/lib/dcp_video_frame.cc
+++ b/
src/lib/dcp_video_frame.cc
@@
-62,6
+62,8
@@
#include "cross.h"
#include "player_video_frame.h"
#include "cross.h"
#include "player_video_frame.h"
+#define LOG_GENERAL(...) _log->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
+
#include "i18n.h"
using std::string;
#include "i18n.h"
using std::string;
@@
-247,13
+249,13
@@
DCPVideoFrame::encode_locally ()
switch (_frame->eyes()) {
case EYES_BOTH:
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:
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:
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;
break;
default:
break;
@@
-290,7
+292,7
@@
DCPVideoFrame::encode_remotely (ServerDescription serv)
root->add_child("Version")->add_child_text (raw_convert<string> (SERVER_LINK_VERSION));
add_metadata (root);
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;
/* Send XML metadata */
stringstream xml;
@@
-307,7
+309,7
@@
DCPVideoFrame::encode_remotely (ServerDescription serv)
shared_ptr<EncodedData> e (new RemotelyEncodedData (socket->read_uint32 ()));
socket->read (e->data(), e->size());
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;
}
return e;
}