Added my "Copyright (c) 2007" notices, for files I edited in 2007.

[synfig.git] / synfig-core / trunk / src / modules / mod_dv / trgt_dv.cpp

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 8c8c4c5..ac565a1 100644 (file)
--- 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
@@ -37,6 +38,18 @@
 #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>
@@ -50,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);
@@ -63,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;
@@ -74,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;
@@ -122,7 +149,25 @@ 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];
   
@@ -140,12 +185,15 @@ dv_trgt::init()
   
        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 ){
@@ -181,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);