made rfxswf actionscript routines threadsafe. ;)

[swftools.git] / lib / example / buttontest.c

diff --git a/lib/example/buttontest.c b/lib/example/buttontest.c
index daf0a2c..a596404 100644 (file)
--- a/lib/example/buttontest.c
+++ b/lib/example/buttontest.c
@@ -69,24 +69,18 @@ int main (int argc,char ** argv)
       swf_ShapeFree(s);                   // clean shape structure (which isn't needed anymore after writing the tag)
   }
 
-  a1 = swf_ActionStart(t);
-    action_SetTarget("movie");
-    action_NextFrame();
-    action_SetTarget("");
-    action_End();
-  swf_ActionEnd();
+  a1 = action_SetTarget(0, "movie");
+  a1 = action_NextFrame(a1);
+  a1 = action_SetTarget(a1, "");
+  a1 = action_End(a1);
  
-  a2 = swf_ActionStart(t);
-    //action_GetUrl("test.swf","_level0"); // load a swf
-    //action_GetUrl("index.html","_this"); // load html in new window
-    action_GetUrl("http://www.quiss.org/swftools/index.html","_parent"); // load html in this window
-    action_End();
-  swf_ActionEnd();
-
-  a3 = swf_ActionStart(t);
-    action_GotoFrame(33);
-    action_End();
-  swf_ActionEnd();
+    //a2 = action_GetUrl(a2, "test.swf","_level0"); // load a swf
+    //a2 = action_GetUrl(a2, "index.html","_this"); // load html in new window
+    a2 = action_GetUrl(0, "http://www.quiss.org/swftools/index.html","_parent"); // load html in this window
+    a2 = action_End(a2);
+
+    a3 = action_GotoFrame(0,33);
+    a3 = action_End(a3);
 
   actiontoset = a2;  
 
@@ -99,7 +93,7 @@ int main (int argc,char ** argv)
       swf_ButtonSetRecord(t,BS_DOWN,36,1,NULL,NULL);
       swf_SetU8(t,0); // end of button records
       
-      swf_SetActions(t,actiontoset);
+      swf_ActionSet(t,actiontoset);
   }
   else
   {
@@ -112,12 +106,14 @@ int main (int argc,char ** argv)
       swf_SetU8(t,0); // end of button records
 
       swf_ButtonSetCondition(t, BC_OVERDOWN_OVERUP);
-       swf_SetActions(t,actiontoset);
+       swf_ActionSet(t,actiontoset);
        
       swf_ButtonPostProcess(t, 1); // don't forget!
   }
 
-  // FIXME: Free Action Tag lists
+  swf_ActionFree(a1);
+  swf_ActionFree(a2);
+  swf_ActionFree(a3);
 
   t = swf_InsertTag(t,ST_PLACEOBJECT2);
   swf_ObjectPlace(t, ID_BUTTON, 2,0,0,0);