X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_ffmpeg%2Fmptr_ffmpeg.cpp;h=d1eb7aa20e1fc109ef120d5c9f92465b563162b4;hb=45d32acc437f1ea60269d51bbbb97845cee2dfc9;hp=f05b2d463589564f19b03714d36d3905781d14c3;hpb=83224f8cf1f9b7b15918a130759717a5a375be91;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.cpp b/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.cpp
index f05b2d4..d1eb7aa 100644
--- a/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.cpp
+++ b/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.cpp
@@ -6,6 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 Chris Moore
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -35,7 +36,18 @@
 #include "mptr_ffmpeg.h"
 #include <stdio.h>
 #include <sys/types.h>
-#include <sys/wait.h>
+#if HAVE_SYS_WAIT_H
+ #include <sys/wait.h>
+#endif
+#if HAVE_IO_H
+ #include <io.h>
+#endif
+#if HAVE_PROCESS_H
+ #include <process.h>
+#endif
+#if HAVE_FCNTL_H
+ #include <fcntl.h>
+#endif
 #include <unistd.h>
 #include <iostream>
 #include <algorithm>
@@ -49,6 +61,12 @@ using namespace synfig;
 using namespace std;
 using namespace etl;
 
+#if defined(HAVE_FORK) && defined(HAVE_PIPE) && defined(HAVE_WAITPID)
+ #define UNIX_PIPE_TO_PROCESSES
+#else
+ #define WIN32_PIPE_TO_PROCESSES
+#endif
+
 /* === G L O B A L S ======================================================= */
 
 SYNFIG_IMPORTER_INIT(ffmpeg_mptr);
@@ -66,11 +84,25 @@ ffmpeg_mptr::seek_to(int frame)
 	{
 		if(file)
 		{
+#if defined(WIN32_PIPE_TO_PROCESSES)
+			pclose(file);
+#elif defined(UNIX_PIPE_TO_PROCESSES)
 			fclose(file);
 			int status;
 			waitpid(pid,&status,0);
+#endif
 		}
 
+#if defined(WIN32_PIPE_TO_PROCESSES)
+
+		string command;
+		
+		command=strprintf("ffmpeg -i \"%s\" -an -f image2pipe -vcodec ppm -\n",filename.c_str());
+		
+		file=popen(command.c_str(),POPEN_BINARY_READ_TYPE);
+
+#elif defined(UNIX_PIPE_TO_PROCESSES)
+
 		int p[2];
 	  
 		if (pipe(p)) {
@@ -104,10 +136,14 @@ ffmpeg_mptr::seek_to(int frame)
 			// Parent process
 			// Close pipeout, not needed
 			close(p[1]);
-			// Save pipeout to file handle, will write to it later
-			file = fdopen(p[0], "wb");
+			// Save pipein to file handle, will read from it later
+			file = fdopen(p[0], "rb");
 		}
 
+#else
+	#error There are no known APIs for creating child processes
+#endif
+
 		if(!file)
 		{
 			cerr<<"Unable to open pipe to ffmpeg"<<endl;
@@ -198,9 +234,13 @@ ffmpeg_mptr::~ffmpeg_mptr()
 {
 	if(file)
 	{
+#if defined(WIN32_PIPE_TO_PROCESSES)
+		pclose(file);
+#elif defined(UNIX_PIPE_TO_PROCESSES)
 		fclose(file);
 		int status;
 		waitpid(pid,&status,0);
+#endif
 	}
 #ifdef HAVE_TERMIOS_H
 	tcsetattr(0,TCSANOW,&oldtty);
@@ -215,7 +255,7 @@ ffmpeg_mptr::get_frame(synfig::Surface &surface,Time time, synfig::ProgressCallb
 	{
 		if(!seek_to(i))
 			return false;
-		if(!grab_frame());
+		if(!grab_frame())
 			return false;
 	}