foundational changes; tying up some loose ends

[chaz/yoink] / src / Animation.cc

diff --git a/src/Animation.cc b/src/Animation.cc
index aa754cebd7decf94f7d27d628859a363c20457a5..ab178df6f9850a27b0d94e36aad786fc40f3c439 100644 (file)
--- a/src/Animation.cc
+++ b/src/Animation.cc
@@ -29,8 +29,8 @@
 #include <map>
 #include <vector>
 
+#include <Moof/Library.hh>
 #include <Moof/Log.hh>
-#include <Moof/Mippleton.hh>
 #include <Moof/Script.hh>
 
 #include "Animation.hh"
@@ -55,10 +55,10 @@ class Animation::Impl
         * which wants to use these loaded sequences.
         */
 
-       class Data : public Mf::Mippleton<Data>
+       class Data : public Mf::Library<Data>
        {
                friend class Impl;
-               friend class Mf::Mippleton<Data>;
+               friend class Mf::Library<Data>;
 
                /**
                 * A frame of an animation sequence.  A frame is merely an index which
@@ -166,8 +166,8 @@ class Animation::Impl
                        Mf::Script script;
                        std::string filePath = Animation::getPath(getName());
 
-                       script.importStandardLibraries();
-                       importLogScript(script);
+                       script.importBaseLibrary();
+                       importLogPrintFunction(script);
                        importAnimationBindings(script);
 
                        if (script.doFile(filePath) != Mf::Script::SUCCESS)
@@ -214,7 +214,7 @@ class Animation::Impl
                 */
 
                explicit Data(const std::string& name) :
-                       Mf::Mippleton<Data>(name)
+                       Mf::Library<Data>(name)
                {
                        loadFromFile();
                }