Avoid warnings from g++ 4.3.

[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 67bbf95..d4b7440 100644 (file)
--- 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,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 +62,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
+#elif defined(HAVE__SPAWNLP) && defined(HAVE__PIPE) && defined(HAVE_CWAIT)
+ #define WIN32_PIPE_TO_PROCESSES
+#endif
+
 /* === G L O B A L S ======================================================= */
 
 SYNFIG_TARGET_INIT(dv_trgt);
@@ -61,6 +81,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 +93,15 @@ dv_trgt::dv_trgt(const char *Filename)
 
 dv_trgt::~dv_trgt()
 {
-       if(file)
-               pclose(file);
+       if(file){
+               fclose(file);
+               int status;
+#if defined(WIN32_PIPE_TO_PROCESSES)
+               cwait(&status,pid,0);
+#elif defined(UNIX_PIPE_TO_PROCESSES)
+               waitpid(pid,&status,0);
+#endif
+       }
        file=NULL;
        delete [] buffer;
        delete [] color_buffer;
@@ -120,7 +148,65 @@ dv_trgt::init()
 {
        imagecount=desc.get_frame_start();
 
-       string command;
+#if defined(WIN32_PIPE_TO_PROCESSES)
+
+       int p[2];
+       int stdin_fileno, stdout_fileno;
+
+       if(_pipe(p, 512, O_BINARY | O_NOINHERIT) < 0) {
+               synfig::error(_("Unable to open pipe to encodedv"));
+               return false;
+       }
+
+       // Save stdin/stdout so we can restore them later
+       stdin_fileno  = _dup(_fileno(stdin));
+       stdout_fileno = _dup(_fileno(stdout));
+
+       // encodedv should read from the pipe
+       if(_dup2(p[0], _fileno(stdin)) != 0) {
+               synfig::error(_("Unable to open pipe to encodedv"));
+               return false;
+       }
+
+       FILE* outfile = fopen(filename.c_str(),"wb");
+       if( outfile == NULL ){
+               synfig::error(_("Unable to open pipe to encodedv"));
+               return false;
+       }
+       if(_dup2(_fileno(outfile), _fileno(stdout)) != 0) {
+               synfig::error(_("Unable to open pipe to encodedv"));
+               return false;
+       }
+
+       if(wide_aspect)
+               pid = _spawnlp(_P_NOWAIT, "encodedv", "encodedv", "-w", "1", "-", (const char *)NULL);
+       else
+               pid = _spawnlp(_P_NOWAIT, "encodedv", "encodedv", "-", (const char *)NULL);
+
+       if( pid < 0) {
+               synfig::error(_("Unable to open pipe to encodedv"));
+               return false;
+       }
+
+       // Restore stdin/stdout
+       if(_dup2(stdin_fileno, _fileno(stdin)) != 0) {
+               synfig::error(_("Unable to open pipe to encodedv"));
+               return false;
+       }
+       if(_dup2(stdout_fileno, _fileno(stdout)) != 0) {
+               synfig::error(_("Unable to open pipe to encodedv"));
+               return false;
+       }
+       close(stdin_fileno);
+       close(stdout_fileno);
+
+       // Close the pipe read end - encodedv uses it
+       close(p[0]);
+       
+       // We write data to the write end of the pipe
+       file = fdopen(p[1], "wb");
+
+#elif defined(UNIX_PIPE_TO_PROCESSES)
 
        int p[2];
   
@@ -138,12 +224,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 ){
@@ -179,6 +268,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);