projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
C++11 and whitespace cleanups.
[dcpomatic.git]
/
src
/
lib
/
image_proxy.cc
diff --git
a/src/lib/image_proxy.cc
b/src/lib/image_proxy.cc
index f6f6350d8f53a258caa4814fb5aea2c4a77f6947..c426e796fba8d05819ac9d9133f03415dadba4db 100644
(file)
--- a/
src/lib/image_proxy.cc
+++ b/
src/lib/image_proxy.cc
@@
-18,32
+18,36
@@
*/
*/
-#include "image_proxy.h"
-#include "raw_image_proxy.h"
+
+#include "cross.h"
+#include "exceptions.h"
#include "ffmpeg_image_proxy.h"
#include "ffmpeg_image_proxy.h"
-#include "j2k_image_proxy.h"
#include "image.h"
#include "image.h"
-#include "exceptions.h"
-#include "cross.h"
+#include "image_proxy.h"
+#include "j2k_image_proxy.h"
+#include "raw_image_proxy.h"
#include <dcp/util.h>
#include <libcxml/cxml.h>
#include <iostream>
#include "i18n.h"
#include <dcp/util.h>
#include <libcxml/cxml.h>
#include <iostream>
#include "i18n.h"
+
using std::cout;
using std::cout;
-using std::
string
;
+using std::
make_shared
;
using std::shared_ptr;
using std::shared_ptr;
+using std::string;
+
shared_ptr<ImageProxy>
image_proxy_factory (shared_ptr<cxml::Node> xml, shared_ptr<Socket> socket)
{
if (xml->string_child("Type") == N_("Raw")) {
shared_ptr<ImageProxy>
image_proxy_factory (shared_ptr<cxml::Node> xml, shared_ptr<Socket> socket)
{
if (xml->string_child("Type") == N_("Raw")) {
- return
shared_ptr<ImageProxy> (new RawImageProxy (xml, socket)
);
+ return
make_shared<RawImageProxy>(xml, socket
);
} else if (xml->string_child("Type") == N_("FFmpeg")) {
} else if (xml->string_child("Type") == N_("FFmpeg")) {
- return
shared_ptr<FFmpegImageProxy> (new FFmpegImageProxy(xml, socket)
);
+ return
make_shared<FFmpegImageProxy>(socket
);
} else if (xml->string_child("Type") == N_("J2K")) {
} else if (xml->string_child("Type") == N_("J2K")) {
- return
shared_ptr<J2KImageProxy> (new J2KImageProxy (xml, socket)
);
+ return
make_shared<J2KImageProxy>(xml, socket
);
}
throw NetworkError (_("Unexpected image type received by server"));
}
throw NetworkError (_("Unexpected image type received by server"));