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

[synfig.git] / synfig-core / trunk / src / modules / mod_ffmpeg / mptr_ffmpeg.cpp

diff --git a/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.cpp b/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.cpp
index 827a527..d1eb7aa 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.cpp
+++ b/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.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
@@ -62,7 +63,7 @@ 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)
+#else
  #define WIN32_PIPE_TO_PROCESSES
 #endif
 
@@ -83,66 +84,22 @@ ffmpeg_mptr::seek_to(int frame)
        {
                if(file)
                {
-                       fclose(file);
-                       int status;
 #if defined(WIN32_PIPE_TO_PROCESSES)
-               cwait(&status,pid,0);
+                       pclose(file);
 #elif defined(UNIX_PIPE_TO_PROCESSES)
-               waitpid(pid,&status,0);
+                       fclose(file);
+                       int status;
+                       waitpid(pid,&status,0);
 #endif
                }
 
 #if defined(WIN32_PIPE_TO_PROCESSES)
 
-       int p[2];
-       int stdin_fileno, stdout_fileno;
-
-       if(_pipe(p, 512, O_BINARY | O_NOINHERIT) < 0) {
-               cerr<<"Unable to open pipe to ffmpeg"<<endl;
-               return false;
-       }
-
-       // Save stdin/stdout so we can restore them later
-       stdin_fileno  = _dup(_fileno(stdin));
-       stdout_fileno = _dup(_fileno(stdout));
-
-       // ffmpeg should write to the pipe
-       if(_dup2(p[1], _fileno(stdout)) != 0) {
-               cerr<<"Unable to open pipe to ffmpeg"<<endl;
-               return false;
-       }
-
-       /*
-       ffmpeg accepts the input filename on the command-line
-       if(_dup2(_fileno(input), _fileno(stdin)) != 0) {
-               synfig::error(_("Unable to open pipe to ffmpeg"));
-               return false;
-       }
-       */
-
-       pid = _spawnlp(_P_NOWAIT, "ffmpeg", "ffmpeg", "-i", filename.c_str(), "-an", "-f", "image2pipe", "-vcodec", "ppm", "-", (const char *)NULL);
-       if( pid < 0) {
-               cerr<<"Unable to open pipe to ffmpeg"<<endl;
-               return false;
-       }
-
-       // Restore stdin/stdout
-       if(_dup2(stdin_fileno, _fileno(stdin)) != 0) {
-               cerr<<"Unable to open pipe to ffmpeg"<<endl;
-               return false;
-       }
-       if(_dup2(stdout_fileno, _fileno(stdout)) != 0) {
-               cerr<<"Unable to open pipe to ffmpeg"<<endl;
-               return false;
-       }
-       close(stdin_fileno);
-       close(stdout_fileno);
-
-       // Close the pipe write end - ffmpeg uses it
-       close(p[1]);
-       
-       // We read data from the read end of the pipe
-       file = fdopen(p[0], "rb");
+               string command;
+               
+               command=strprintf("ffmpeg -i \"%s\" -an -f image2pipe -vcodec ppm -\n",filename.c_str());
+               
+               file=popen(command.c_str(),POPEN_BINARY_READ_TYPE);
 
 #elif defined(UNIX_PIPE_TO_PROCESSES)
 
@@ -277,11 +234,11 @@ ffmpeg_mptr::~ffmpeg_mptr()
 {
        if(file)
        {
-               fclose(file);
-               int status;
 #if defined(WIN32_PIPE_TO_PROCESSES)
-               cwait(&status,pid,0);
+               pclose(file);
 #elif defined(UNIX_PIPE_TO_PROCESSES)
+               fclose(file);
+               int status;
                waitpid(pid,&status,0);
 #endif
        }
@@ -298,7 +255,7 @@ ffmpeg_mptr::get_frame(synfig::Surface &surface,Time time, synfig::ProgressCallb
        {
                if(!seek_to(i))
                        return false;
-               if(!grab_frame());
+               if(!grab_frame())
                        return false;
        }