diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-09-18 02:07:59 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-09-18 02:07:59 +0100 |
| commit | 3c1b239453936128d1711ffa063ad4e1617b3e40 (patch) | |
| tree | 060213367c651ca0ddccf1d9470b35886a687f6e /src/lib/server.cc | |
| parent | 48794870183ac5c0dd2b4acc1f9c2e5d7349f284 (diff) | |
Sort of working log window.
Diffstat (limited to 'src/lib/server.cc')
| -rw-r--r-- | src/lib/server.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/server.cc b/src/lib/server.cc index f4aaa25e1..9e43601c4 100644 --- a/src/lib/server.cc +++ b/src/lib/server.cc @@ -62,8 +62,8 @@ ServerDescription::as_metadata () const return s.str (); } -Server::Server () - : _log ("servomatic.log") +Server::Server (Log* log) + : _log (log) { } @@ -129,7 +129,7 @@ Server::process (shared_ptr<asio::ip::tcp::socket> socket) image->hash ("Image for encoding (as received by server)"); #endif - DCPVideoFrame dcp_video_frame (image, out_size, padding, scaler, frame, frames_per_second, post_process, colour_lut_index, j2k_bandwidth, &_log); + DCPVideoFrame dcp_video_frame (image, out_size, padding, scaler, frame, frames_per_second, post_process, colour_lut_index, j2k_bandwidth, _log); shared_ptr<EncodedData> encoded = dcp_video_frame.encode_locally (); encoded->send (socket); |