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 3a09cb8e8cd0cbce273bea7a66403178d34800a8..c426e796fba8d05819ac9d9133f03415dadba4db 100644 (file)
--- a/src/lib/image_proxy.cc
+++ b/src/lib/image_proxy.cc
@@ -18,32 +18,36 @@
 
 */
 
+
+#include "cross.h"
+#include "exceptions.h"
+#include "ffmpeg_image_proxy.h"
+#include "image.h"
 #include "image_proxy.h"
-#include "raw_image_proxy.h"
-#include "magick_image_proxy.h"
 #include "j2k_image_proxy.h"
-#include "image.h"
-#include "exceptions.h"
-#include "cross.h"
+#include "raw_image_proxy.h"
 #include <dcp/util.h>
 #include <libcxml/cxml.h>
 #include <iostream>
 
 #include "i18n.h"
 
+
 using std::cout;
+using std::make_shared;
+using std::shared_ptr;
 using std::string;
-using boost::shared_ptr;
+
 
 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));
-       } else if (xml->string_child("Type") == N_("Magick")) {
-               return shared_ptr<MagickImageProxy> (new MagickImageProxy (xml, socket));
+               return make_shared<RawImageProxy>(xml, socket);
+       } else if (xml->string_child("Type") == N_("FFmpeg")) {
+               return make_shared<FFmpegImageProxy>(socket);
        } 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"));