Various work on server discovery; works on localhost.

[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 477bdae14f86723e849f53d6c1dc6e9929042acf..25abd6f0df57ee7f9f0304e9713b919052639c00 100644 (file)
--- a/src/lib/dcp_video_frame.cc
+++ b/src/lib/dcp_video_frame.cc
@@ -256,7 +256,7 @@ DCPVideoFrame::encode_remotely (ServerDescription serv)
 {
        boost::asio::io_service io_service;
        boost::asio::ip::tcp::resolver resolver (io_service);
-       boost::asio::ip::tcp::resolver::query query (serv.host_name(), boost::lexical_cast<string> (Config::instance()->server_port ()));
+       boost::asio::ip::tcp::resolver::query query (serv.host_name(), boost::lexical_cast<string> (Config::instance()->server_port_base ()));
        boost::asio::ip::tcp::resolver::iterator endpoint_iterator = resolver.resolve (query);
 
        shared_ptr<Socket> socket (new Socket);
@@ -331,7 +331,7 @@ EncodedData::EncodedData (boost::filesystem::path file)
        _size = boost::filesystem::file_size (file);
        _data = new uint8_t[_size];
 
-       FILE* f = fopen (file.c_str(), N_("rb"));
+       FILE* f = fopen (file.string().c_str(), N_("rb"));
        if (!f) {
                throw FileError (_("could not open file for reading"), file);
        }
@@ -360,7 +360,7 @@ EncodedData::write (shared_ptr<const Film> film, int frame, Eyes eyes) const
 {
        boost::filesystem::path const tmp_j2c = film->j2c_path (frame, eyes, true);
 
-       FILE* f = fopen (tmp_j2c.c_str (), N_("wb"));
+       FILE* f = fopen (tmp_j2c.string().c_str (), N_("wb"));
        
        if (!f) {
                throw WriteFileError (tmp_j2c, errno);
@@ -379,7 +379,7 @@ void
 EncodedData::write_info (shared_ptr<const Film> film, int frame, Eyes eyes, libdcp::FrameInfo fin) const
 {
        boost::filesystem::path const info = film->info_path (frame, eyes);
-       ofstream h (info.c_str());
+       ofstream h (info.string().c_str());
        fin.write (h);
 }