projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change the broadcast string so V2 only recognises V2 servers (and vice versa).
[dcpomatic.git]
/
src
/
lib
/
dcp_video.cc
diff --git
a/src/lib/dcp_video.cc
b/src/lib/dcp_video.cc
index 3879947eb027ba38912f5fa255f27fd0e879a7dc..7610e6c9f43a5e1dda8643c8ad5f850ec5e1c67b 100644
(file)
--- a/
src/lib/dcp_video.cc
+++ b/
src/lib/dcp_video.cc
@@
-59,6
+59,7
@@
#include <errno.h>
#define LOG_GENERAL(...) _log->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
#include <errno.h>
#define LOG_GENERAL(...) _log->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
+#define LOG_DEBUG_ENCODE(...) _log->log (String::compose (__VA_ARGS__), Log::TYPE_DEBUG_ENCODE);
#include "i18n.h"
#include "i18n.h"
@@
-223,13
+224,13
@@
DCPVideo::encode_locally (dcp::NoteHandler note)
switch (_frame->eyes()) {
case EYES_BOTH:
switch (_frame->eyes()) {
case EYES_BOTH:
- LOG_
GENERAL
(N_("Finished locally-encoded frame %1 for mono"), _index);
+ LOG_
DEBUG_ENCODE
(N_("Finished locally-encoded frame %1 for mono"), _index);
break;
case EYES_LEFT:
break;
case EYES_LEFT:
- LOG_
GENERAL
(N_("Finished locally-encoded frame %1 for L"), _index);
+ LOG_
DEBUG_ENCODE
(N_("Finished locally-encoded frame %1 for L"), _index);
break;
case EYES_RIGHT:
break;
case EYES_RIGHT:
- LOG_
GENERAL
(N_("Finished locally-encoded frame %1 for R"), _index);
+ LOG_
DEBUG_ENCODE
(N_("Finished locally-encoded frame %1 for R"), _index);
break;
default:
break;
break;
default:
break;
@@
-266,7
+267,7
@@
DCPVideo::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_
GENERAL
(N_("Sending frame %1 to remote"), _index);
+ LOG_
DEBUG_ENCODE
(N_("Sending frame %1 to remote"), _index);
/* Send XML metadata */
string xml = doc.write_to_string ("UTF-8");
/* Send XML metadata */
string xml = doc.write_to_string ("UTF-8");
@@
-282,7
+283,7
@@
DCPVideo::encode_remotely (ServerDescription serv)
Data e (socket->read_uint32 ());
socket->read (e.data().get(), e.size());
Data e (socket->read_uint32 ());
socket->read (e.data().get(), e.size());
- LOG_
GENERAL
(N_("Finished remotely-encoded frame %1"), _index);
+ LOG_
DEBUG_ENCODE
(N_("Finished remotely-encoded frame %1"), _index);
return e;
}
return e;
}