X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_dv%2Ftrgt_dv.cpp;h=d4b7440cf56767f2df614891f11b53469fca677a;hb=ed2585fc1c1e49082c3d43b3999ef2bd963f2e86;hp=e2ec32ab40d6ddd0252a66c36e28cac89d955def;hpb=675aca937d23c7f460edf42ac3ec0ffa06205a2c;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 e2ec32a..d4b7440 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,20 @@ #include #include "trgt_dv.h" #include +#include +#if HAVE_SYS_WAIT_H + #include +#endif +#if HAVE_IO_H + #include +#endif +#if HAVE_PROCESS_H + #include +#endif +#if HAVE_FCNTL_H + #include +#endif +#include #include #include #include @@ -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,22 +148,131 @@ 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) - command=strprintf("encodedv -w 1 - > \"%s\"\n",filename.c_str()); + pid = _spawnlp(_P_NOWAIT, "encodedv", "encodedv", "-w", "1", "-", (const char *)NULL); else - command=strprintf("encodedv - > \"%s\"\n",filename.c_str()); + pid = _spawnlp(_P_NOWAIT, "encodedv", "encodedv", "-", (const char *)NULL); - // Open the pipe to encodedv - file=popen(command.c_str(),"w"); + if( pid < 0) { + synfig::error(_("Unable to open pipe to encodedv")); + return false; + } - if(!file) - { + // 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]; + + 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; + } } +#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); @@ -151,7 +288,7 @@ dv_trgt::end_frame() } bool -dv_trgt::start_frame(synfig::ProgressCallback *callback) +dv_trgt::start_frame(synfig::ProgressCallback */*callback*/) { int w=desc.get_w(),h=desc.get_h(); @@ -172,7 +309,7 @@ dv_trgt::start_frame(synfig::ProgressCallback *callback) } Color * -dv_trgt::start_scanline(int scanline) +dv_trgt::start_scanline(int /*scanline*/) { return color_buffer; }