projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a few warnings from Coverity; nothing dangerous, I don't think.
[dcpomatic.git]
/
src
/
lib
/
server.cc
diff --git
a/src/lib/server.cc
b/src/lib/server.cc
index d2c573c1b404c2e37f07269897511be56f327851..32e1e38b23f7148e0f7f1fa132fe2beaa4a8c0c4 100644
(file)
--- a/
src/lib/server.cc
+++ b/
src/lib/server.cc
@@
-22,15
+22,8
@@
* encoding work, and a class to implement such a server.
*/
* encoding work, and a class to implement such a server.
*/
-#include <string>
-#include <vector>
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include <boost/scoped_array.hpp>
-#include <libcxml/cxml.h>
-#include <dcp/raw_convert.h>
#include "server.h"
#include "server.h"
-#include "
util
.h"
+#include "
dcpomatic_socket
.h"
#include "scaler.h"
#include "image.h"
#include "dcp_video.h"
#include "scaler.h"
#include "image.h"
#include "dcp_video.h"
@@
-39,6
+32,13
@@
#include "player_video.h"
#include "encoded_data.h"
#include "safe_stringstream.h"
#include "player_video.h"
#include "encoded_data.h"
#include "safe_stringstream.h"
+#include <dcp/raw_convert.h>
+#include <libcxml/cxml.h>
+#include <boost/algorithm/string.hpp>
+#include <boost/scoped_array.hpp>
+#include <string>
+#include <vector>
+#include <iostream>
#include "i18n.h"
#include "i18n.h"
@@
-112,13
+112,13
@@
Server::process (shared_ptr<Socket> socket, struct timeval& after_read, struct t
return -1;
}
return -1;
}
- shared_ptr<PlayerVideo> pvf (new PlayerVideo (xml, socket
, _log
));
+ shared_ptr<PlayerVideo> pvf (new PlayerVideo (xml, socket));
DCPVideo dcp_video_frame (pvf, xml, _log);
gettimeofday (&after_read, 0);
DCPVideo dcp_video_frame (pvf, xml, _log);
gettimeofday (&after_read, 0);
- shared_ptr<EncodedData> encoded = dcp_video_frame.encode_locally ();
+ shared_ptr<EncodedData> encoded = dcp_video_frame.encode_locally (
boost::bind (&Log::dcp_log, _log.get(), _1, _2)
);
gettimeofday (&after_encode, 0);
gettimeofday (&after_encode, 0);
@@
-252,6
+252,9
@@
Server::broadcast_received ()
root->add_child("Threads")->add_child_text (raw_convert<string> (_worker_threads.size ()));
string xml = doc.write_to_string ("UTF-8");
root->add_child("Threads")->add_child_text (raw_convert<string> (_worker_threads.size ()));
string xml = doc.write_to_string ("UTF-8");
+ if (_verbose) {
+ cout << "Offering services to master " << _broadcast.send_endpoint.address().to_string () << "\n";
+ }
shared_ptr<Socket> socket (new Socket);
try {
socket->connect (boost::asio::ip::tcp::endpoint (_broadcast.send_endpoint.address(), Config::instance()->server_port_base() + 1));
shared_ptr<Socket> socket (new Socket);
try {
socket->connect (boost::asio::ip::tcp::endpoint (_broadcast.send_endpoint.address(), Config::instance()->server_port_base() + 1));