diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-08-23 22:50:40 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-08-23 22:50:40 +0100 |
| commit | 8c7a308c03e4b4196b4e2379a26d432b100ae2b1 (patch) | |
| tree | 605c8b62f56c5f9be2ff77161eb18ac372083a35 /src/lib/dcp_video.cc | |
| parent | 04acfa42cdffd5938358847ebee822399ef978e6 (diff) | |
| parent | a6d6a794b28c3b3e6679f01c1890f396453eb5ac (diff) | |
Merge master.
Diffstat (limited to 'src/lib/dcp_video.cc')
| -rw-r--r-- | src/lib/dcp_video.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc index 9b1c8c33e..d84986651 100644 --- a/src/lib/dcp_video.cc +++ b/src/lib/dcp_video.cc @@ -34,7 +34,6 @@ #include <stdexcept> #include <cstdio> #include <iomanip> -#include <sstream> #include <iostream> #include <fstream> #include <unistd.h> @@ -67,7 +66,6 @@ #include "i18n.h" using std::string; -using std::stringstream; using std::cout; using boost::shared_ptr; using boost::lexical_cast; @@ -282,10 +280,9 @@ DCPVideo::encode_remotely (ServerDescription serv) LOG_GENERAL (N_("Sending frame %1 to remote"), _index); /* Send XML metadata */ - stringstream xml; - doc.write_to_stream (xml, "UTF-8"); - socket->write (xml.str().length() + 1); - socket->write ((uint8_t *) xml.str().c_str(), xml.str().length() + 1); + string xml = doc.write_to_string ("UTF-8"); + socket->write (xml.length() + 1); + socket->write ((uint8_t *) xml.c_str(), xml.length() + 1); /* Send binary data */ _frame->send_binary (socket, _burn_subtitles); |