Fix bugs in previous commit that caused FTBFS in synfig and ETL FTBFS with older...

[synfig.git] / synfig-core / tags / stable / src / modules / mptr_mplayer / mptr_mplayer.h

diff --git a/synfig-core/tags/stable/src/modules/mptr_mplayer/mptr_mplayer.h b/synfig-core/tags/stable/src/modules/mptr_mplayer/mptr_mplayer.h
index 2b2094b..e72dc6d 100644 (file)
--- a/synfig-core/tags/stable/src/modules/mptr_mplayer/mptr_mplayer.h
+++ b/synfig-core/tags/stable/src/modules/mptr_mplayer/mptr_mplayer.h
@@ -1,18 +1,22 @@
-/*! ========================================================================
-** Sinfg
-** Template Header File
-** $Id: mptr_mplayer.h,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $
+/* === S Y N F I G ========================================================= */
+/*!    \file mptr_mplayer.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,12 @@
 
 /* === S T A R T =========================================================== */
 
-#ifndef __SINFG_MPTR_MPLAYER_H
-#define __SINFG_MPTR_MPLAYER_H
+#ifndef __SYNFIG_MPTR_MPLAYER_H
+#define __SYNFIG_MPTR_MPLAYER_H
 
 /* === H E A D E R S ======================================================= */
 
-#include <sinfg/sinfg.h>
+#include <synfig/synfig.h>
 #include <stdio.h>
 #include "string.h"
 
@@ -35,12 +39,12 @@
 
 /* === C L A S S E S & S T R U C T S ======================================= */
 
-class mplayer_mptr : public sinfg::Importer
+class mplayer_mptr : public synfig::Importer
 {
 public:
 private:
        String filename;
-       
+
 public:
        mplayer_mptr(const char *filename);
        ~mplayer_mptr();
@@ -49,9 +53,9 @@ public:
        static const char Name[];
        static const char Ext[];
 
-       virtual bool GetFrame(sinfg::Time time, sinfg::Surface &, sinfg::ProgressCallback *);
+       virtual bool GetFrame(synfig::Time time, synfig::Surface &, synfig::ProgressCallback *);
 
-       static sinfg::Importer *New(const char *filename);
+       static synfig::Importer *New(const char *filename);
 };
 
 /* === E N D =============================================================== */