X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_dv%2Ftrgt_dv.cpp;h=13fed5c844d4a9a79c5de67d745c4f753c0b9717;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=bc3c181b8c9d94f25113a7a0283dd75ac12b05c7;hpb=5c2565765480697771497772fe7f6da76dd6b1e2;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/mod_dv/trgt_dv.cpp b/synfig-core/trunk/src/modules/mod_dv/trgt_dv.cpp
index bc3c181..13fed5c 100644
--- a/synfig-core/trunk/src/modules/mod_dv/trgt_dv.cpp
+++ b/synfig-core/trunk/src/modules/mod_dv/trgt_dv.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
@@ -36,6 +37,20 @@
 #include <ETL/stringf>
 #include "trgt_dv.h"
 #include <stdio.h>
+#include <sys/types.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 <algorithm>
 #include <functional>
 #include <ETL/clock>
@@ -48,6 +63,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_TARGET_INIT(dv_trgt);
@@ -61,6 +82,7 @@ SYNFIG_TARGET_SET_CVS_ID(dv_trgt,"$Id$");
 
 dv_trgt::dv_trgt(const char *Filename)
 {
+	pid=-1;
 	file=NULL;
 	filename=Filename;
 	buffer=NULL;
@@ -72,8 +94,15 @@ dv_trgt::dv_trgt(const char *Filename)
 
 dv_trgt::~dv_trgt()
 {
-	if(file)
+	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
+	}
 	file=NULL;
 	delete [] buffer;
 	delete [] color_buffer;
@@ -120,30 +149,51 @@ dv_trgt::init()
 {
 	imagecount=desc.get_frame_start();
 
+#if defined(WIN32_PIPE_TO_PROCESSES)
+
 	string command;
 
+	if(wide_aspect)
+		command=strprintf("encodedv -w 1 - > \"%s\"\n",filename.c_str());
+	else
+		command=strprintf("encodedv - > \"%s\"\n",filename.c_str());
+
+	// Open the pipe to encodedv
+	file=popen(command.c_str(),POPEN_BINARY_WRITE_TYPE);
+
+	if(!file)
+	{
+		synfig::error(_("Unable to open pipe to encodedv"));
+		return false;
+	}
+
+#elif defined(UNIX_PIPE_TO_PROCESSES)
+
 	int p[2];
-  
+
 	if (pipe(p)) {
 		synfig::error(_("Unable to open pipe to encodedv"));
 		return false;
 	};
-  
+
 	pid_t pid = fork();
-  
+
 	if (pid == -1) {
 		synfig::error(_("Unable to open pipe to encodedv"));
 		return false;
 	}
-  
+
 	if (pid == 0){
 		// Child process
+		// Close pipeout, not needed
+		close(p[1]);
 		// Dup pipeout to stdin
 		if( dup2( p[0], STDIN_FILENO ) == -1 ){
 			synfig::error(_("Unable to open pipe to encodedv"));
 			return false;
 		}
-		
+		// Close the unneeded pipeout
+		close(p[0]);
 		// Open filename to stdout
 		FILE* outfile = fopen(filename.c_str(),"wb");
 		if( outfile == NULL ){
@@ -159,11 +209,11 @@ dv_trgt::init()
 			synfig::error(_("Unable to open pipe to encodedv"));
 			return false;
 		}
-		
+
 		if(wide_aspect)
-			execlp("encodedv", "encodedv", "-w", "1", "-");
+			execlp("encodedv", "encodedv", "-w", "1", "-", (const char *)NULL);
 		else
-			execlp("encodedv", "encodedv", "-");
+			execlp("encodedv", "encodedv", "-", (const char *)NULL);
 		// We should never reach here unless the exec failed
 		synfig::error(_("Unable to open pipe to encodedv"));
 		return false;
@@ -179,6 +229,11 @@ dv_trgt::init()
 		}
 	}
 
+#else
+	#error There are no known APIs for creating child processes
+#endif
+
+
 	// Sleep for a moment to let the pipe catch up
 	etl::clock().sleep(0.25f);