summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-03-24 09:49:25 +0000
committerCarl Hetherington <cth@carlh.net>2014-03-24 09:49:25 +0000
commit70cc5012d775536be079fcb75d0c03655ca0e0f2 (patch)
treea041fdcaec25c6c23740f43360b1ee4dc387c48e /src
parentf77c5378a5f991fd080746e8a3c9c23136816067 (diff)
Tinker with logging.
Diffstat (limited to 'src')
-rw-r--r--src/lib/dcp_video_frame.cc9
-rw-r--r--src/lib/encoder.cc1
2 files changed, 3 insertions, 7 deletions
diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc
index 78d73ad00..54531a0f9 100644
--- a/src/lib/dcp_video_frame.cc
+++ b/src/lib/dcp_video_frame.cc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
Taken from code Copyright (C) 2010-2011 Terrence Meiczinger
This program is free software; you can redistribute it and/or modify
@@ -294,12 +294,7 @@ DCPVideoFrame::encode_remotely (ServerDescription serv)
stringstream xml;
doc.write_to_stream (xml, "UTF-8");
- _log->log (String::compose (
- N_("Sending to remote; pixel format %1, components %2, lines (%3,%4,%5), line sizes (%6,%7,%8)"),
- _image->pixel_format(), _image->components(),
- _image->lines(0), _image->lines(1), _image->lines(2),
- _image->line_size()[0], _image->line_size()[1], _image->line_size()[2]
- ));
+ _log->log (String::compose (N_("Sending frame %1 to remote"), _frame));
socket->write (xml.str().length() + 1);
socket->write ((uint8_t *) xml.str().c_str(), xml.str().length() + 1);
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 73af11c55..8e8da6229 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -77,6 +77,7 @@ Encoder::~Encoder ()
void
Encoder::add_worker_threads (ServerDescription d)
{
+ _film->log()->log (String::compose (N_("Adding %1 worker threads for remote %2"), d.host_name ()));
for (int i = 0; i < d.threads(); ++i) {
_threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, d)));
}