X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_dv%2Ftrgt_dv.cpp;h=a820c3317d1dd56e422799ce2102ef711c8d53e5;hb=9bb17dbd43d0988caab3a1fa420aa52a32e4fdc5;hp=720736c7c35d9e4f204a8f0ef241fb75abaafcea;hpb=aaa0275b0e9c8a981a01dad6d841c40e7d8d77c2;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 720736c..a820c33 100644
--- a/synfig-core/trunk/src/modules/mod_dv/trgt_dv.cpp
+++ b/synfig-core/trunk/src/modules/mod_dv/trgt_dv.cpp
@@ -36,6 +36,9 @@
 #include <ETL/stringf>
 #include "trgt_dv.h"
 #include <stdio.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <unistd.h>
 #include <algorithm>
 #include <functional>
 #include <ETL/clock>
@@ -61,6 +64,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 +76,11 @@ dv_trgt::dv_trgt(const char *Filename)
 
 dv_trgt::~dv_trgt()
 {
-	if(file)
-		pclose(file);
+	if(file){
+		fclose(file);
+		int status;
+		waitpid(pid,&status,0);
+	}
 	file=NULL;
 	delete [] buffer;
 	delete [] color_buffer;
@@ -120,20 +127,64 @@ dv_trgt::init()
 {
 	imagecount=desc.get_frame_start();
 
-	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(),"wb");
-
-	if(!file)
-	{
+	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 ){
+			synfig::error(_("Unable to open pipe to encodedv"));
+			return false;
+		}
+		int outfilefd = fileno(outfile);
+		if( outfilefd == -1 ){
+			synfig::error(_("Unable to open pipe to encodedv"));
+			return false;
+		}
+		if( dup2( outfilefd, STDOUT_FILENO ) == -1 ){
+			synfig::error(_("Unable to open pipe to encodedv"));
+			return false;
+		}
+		
+		if(wide_aspect)
+			execlp("encodedv", "encodedv", "-w", "1", "-", (const char *)NULL);
+		else
+			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;
+	} else {
+		// Parent process
+		// Close pipein, not needed
+		close(p[0]);
+		// Save pipeout to file handle, will write to it later
+		file = fdopen(p[1], "wb");
+		if (file == NULL) {
+			synfig::error(_("Unable to open pipe to encodedv"));
+			return false;
+		}
 	}
 
 	// Sleep for a moment to let the pipe catch up