stream-based logging classes

[chaz/yoink] / src / Animation.cc

diff --git a/src/Animation.cc b/src/Animation.cc
index ab178df6f9850a27b0d94e36aad786fc40f3c439..593f44e1aff3df4a492ed2c277bfa91cd46704ff 100644 (file)
--- a/src/Animation.cc
+++ b/src/Animation.cc
@@ -78,7 +78,7 @@ class Animation::Impl
                         * frame map which is probably loaded within an animation file.
                         */
                
-                       Frame(Mf::Script& script, Mf::Script::Value table) :
+                       Frame(Mf::Script& script, Mf::Script::Slot table) :
                                mIndex(0),
                                mDuration(1.0)
                        {
@@ -114,7 +114,7 @@ class Animation::Impl
                         * constructor which loads each individual frame.
                         */
 
-                       Sequence(Mf::Script& script, Mf::Script::Value table) :
+                       Sequence(Mf::Script& script, Mf::Script::Slot table) :
                                mDelay(0.0),
                                mLoop(true)
                        {
@@ -133,10 +133,10 @@ class Animation::Impl
                                // TODO - sequence class/type not yet implemented
 
                                table.pushField("frames");
-                               Mf::Script::Value frameTable = script.getTop();
+                               Mf::Script::Slot frameTable = script.getTop();
                                if (frameTable.isTable())
                                {
-                                       Mf::Script::Value top = script[-1];
+                                       Mf::Script::Slot top = script[-1];
                                        int index = 1;
 
                                        for (;;)
@@ -174,14 +174,14 @@ class Animation::Impl
                        {
                                std::string str;
                                script[-1].get(str);
-                               Mf::logScript("%s", str.c_str());
+                               Mf::logWarning(str);
                        }
                }
 
                int defineSequence(Mf::Script& script)
                {
-                       Mf::Script::Value name = script[1].requireString();
-                       Mf::Script::Value table = script[2].requireTable();
+                       Mf::Script::Slot name = script[1].requireString();
+                       Mf::Script::Slot table = script[2].requireTable();
 
                        std::string nameStr;
                        name.get(nameStr);