diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/image_proxy.cc | 3 | ||||
| -rw-r--r-- | src/lib/server.cc | 2 | ||||
| -rw-r--r-- | src/wx/about_dialog.cc | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/image_proxy.cc b/src/lib/image_proxy.cc index 618cdbcf3..4e2f8a135 100644 --- a/src/lib/image_proxy.cc +++ b/src/lib/image_proxy.cc @@ -55,7 +55,7 @@ RawImageProxy::RawImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> soc xml->number_child<int> ("Width"), xml->number_child<int> ("Height") ); - _image.reset (new Image (PIX_FMT_RGB24, size, true)); + _image.reset (new Image (static_cast<AVPixelFormat> (xml->number_child<int> ("PixelFormat")), size, true)); _image->read_from_socket (socket); } @@ -71,6 +71,7 @@ RawImageProxy::add_metadata (xmlpp::Node* node) const node->add_child("Type")->add_child_text (N_("Raw")); node->add_child("Width")->add_child_text (libdcp::raw_convert<string> (_image->size().width)); node->add_child("Height")->add_child_text (libdcp::raw_convert<string> (_image->size().height)); + node->add_child("PixelFormat")->add_child_text (libdcp::raw_convert<string> (_image->pixel_format ())); } void diff --git a/src/lib/server.cc b/src/lib/server.cc index 6b4064cd7..ed7fb6145 100644 --- a/src/lib/server.cc +++ b/src/lib/server.cc @@ -104,6 +104,7 @@ Server::process (shared_ptr<Socket> socket, struct timeval& after_read, struct t try { encoded->send (socket); } catch (std::exception& e) { + cerr << "Send failed; frame " << dcp_video_frame.index() << "\n"; LOG_ERROR ("Send failed; frame %1", dcp_video_frame.index()); throw; } @@ -139,6 +140,7 @@ Server::worker_thread () frame = process (socket, after_read, after_encode); ip = socket->socket().remote_endpoint().address().to_string(); } catch (std::exception& e) { + cerr << "Error: " << e.what() << "\n"; LOG_ERROR ("Error: %1", e.what()); } diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc index e0296d60c..7ebc62a32 100644 --- a/src/wx/about_dialog.cc +++ b/src/wx/about_dialog.cc @@ -137,6 +137,7 @@ AboutDialog::AboutDialog (wxWindow* parent) supported_by.Add (wxT ("Lindsay Morris")); supported_by.Add (wxT ("Tim O'Brien")); supported_by.Add (wxT ("Ivan Pullman")); + supported_by.Add (wxT ("Mark Rolfe")); supported_by.Add (wxT ("Andrä Steiner")); supported_by.Add (wxT ("Jussi Siponen")); supported_by.Add (wxT ("Lasse Salling")); |