X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_proxy.cc;h=c426e796fba8d05819ac9d9133f03415dadba4db;hb=182b9d2e2feb6545592868606aaf0f0146095481;hp=b6b387b76081947a554290c0846cf81333acd42c;hpb=3b48d5494c3cae7743d283203f5c8021860ab81f;p=dcpomatic.git

diff --git a/src/lib/image_proxy.cc b/src/lib/image_proxy.cc
index b6b387b76..c426e796f 100644
--- a/src/lib/image_proxy.cc
+++ b/src/lib/image_proxy.cc
@@ -1,56 +1,53 @@
 /*
     Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include <dcp/util.h>
-#include <dcp/raw_convert.h>
+
+#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 "log.h"
+#include "raw_image_proxy.h"
+#include <dcp/util.h>
+#include <libcxml/cxml.h>
+#include <iostream>
 
 #include "i18n.h"
 
-#define LOG_TIMING(...) _log->microsecond_log (String::compose (__VA_ARGS__), Log::TYPE_TIMING);
 
 using std::cout;
+using std::make_shared;
+using std::shared_ptr;
 using std::string;
-using boost::shared_ptr;
 
-ImageProxy::ImageProxy (shared_ptr<Log> log)
-	: _log (log)
-{
-
-}
 
 shared_ptr<ImageProxy>
-image_proxy_factory (shared_ptr<cxml::Node> xml, shared_ptr<Socket> socket, shared_ptr<Log> log)
+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, log));
-	} else if (xml->string_child("Type") == N_("Magick")) {
-		return shared_ptr<MagickImageProxy> (new MagickImageProxy (xml, socket, log));
+		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, log));
+		return make_shared<J2KImageProxy>(xml, socket);
 	}
 
 	throw NetworkError (_("Unexpected image type received by server"));