X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_ffmpeg%2Fmptr_ffmpeg.h;h=3e53931aeb89e64515ad864290571cafe62f3c7f;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=45a6ec83e95a3cdcf8a00addf830152a89d2791a;hpb=16b3beced25134bef064705568ecb893a6be4e79;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.h b/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.h
index 45a6ec8..3e53931 100644
--- a/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.h
+++ b/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.h
@@ -1,18 +1,22 @@
-/*! ========================================================================
-** Sinfg
-** Template Header File
-** $Id: mptr_ffmpeg.h,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $
+/* === S Y N F I G ========================================================= */
+/*!	\file mptr_ffmpeg.h
+**	\brief Template Header
 **
-** Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**	$Id$
 **
-** This software and associated documentation
-** are CONFIDENTIAL and PROPRIETARY property of
-** the above-mentioned copyright holder.
+**	\legal
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-** You may not copy, print, publish, or in any
-** other way distribute this software without
-** a prior written agreement with
-** the copyright holder.
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
+**
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
+**	\endlegal
 **
 ** === N O T E S ===========================================================
 **
@@ -20,12 +24,13 @@
 
 /* === S T A R T =========================================================== */
 
-#ifndef __SINFG_MPTR_FFMPEG_H
-#define __SINFG_MPTR_FFMPEG_H
+#ifndef __SYNFIG_MPTR_FFMPEG_H
+#define __SYNFIG_MPTR_FFMPEG_H
 
 /* === H E A D E R S ======================================================= */
 
-#include <sinfg/importer.h>
+#include <synfig/importer.h>
+#include <sys/types.h>
 #include <stdio.h>
 #include "string.h"
 #ifdef HAVE_TERMIOS_H
@@ -33,22 +38,23 @@
 
 #endif
 
-#include <sinfg/surface.h>
+#include <synfig/surface.h>
 /* === M A C R O S ========================================================= */
 
 /* === T Y P E D E F S ===================================================== */
 
 /* === C L A S S E S & S T R U C T S ======================================= */
 
-class ffmpeg_mptr : public sinfg::Importer
+class ffmpeg_mptr : public synfig::Importer
 {
-	SINFG_IMPORTER_MODULE_EXT
+	SYNFIG_IMPORTER_MODULE_EXT
 public:
 private:
-	sinfg::String filename;
+	pid_t pid;
+	synfig::String filename;
 	FILE *file;
 	int cur_frame;
-	sinfg::Surface frame;
+	synfig::Surface frame;
 	float fps;
 #ifdef HAVE_TERMIOS_H
 	struct termios oldtty;
@@ -56,13 +62,14 @@ private:
 
 	bool seek_to(int frame);
 	bool grab_frame(void);
-	
+
 public:
 	ffmpeg_mptr(const char *filename);
 	~ffmpeg_mptr();
 
+	virtual bool is_animated();
 
-	virtual bool get_frame(sinfg::Surface &,sinfg::Time, sinfg::ProgressCallback *);
+	virtual bool get_frame(synfig::Surface &surface,synfig::Time time, synfig::ProgressCallback *callback);
 };
 
 /* === E N D =============================================================== */