rfxswf cleanups: added prefixes and altered structure name conventions

[swftools.git] / lib / modules / swfobject.c

diff --git a/lib/modules/swfobject.c b/lib/modules/swfobject.c
index fe32e77..1b58108 100644 (file)
--- a/lib/modules/swfobject.c
+++ b/lib/modules/swfobject.c
@@ -19,41 +19,41 @@
 #define PF_NAME         0x20
 #define PF_CLIPACTION   0x40
 
-int ObjectPlace(TAG * t,U16 id,U16 depth,MATRIX * m,CXFORM * cx,U8 * name)
+int swf_ObjectPlace(TAG * t,U16 id,U16 depth,MATRIX * m,CXFORM * cx,U8 * name)
 { U8 flags;
   if (!t) return -1;
 
   flags = (id?PF_CHAR:0)|(m?PF_MATRIX:0)|(cx?PF_CXFORM:0)|(name?PF_NAME:0)|((m||cx)&&(!id)?PF_MOVE:0);
 
-  SetU8(t,flags);
-  SetU16(t,depth);
-  if (flags&PF_CHAR) SetU16(t,id);
-  if (flags&PF_MATRIX) SetMatrix(t,m);
-  if (flags&PF_CXFORM) SetCXForm(t,cx,(cx->a0!=256)||(cx->a1));
-  if (flags&PF_RATIO) SetU16(t,0);
-  if (flags&PF_NAME) SetString(t,name);
+  swf_SetU8(t,flags);
+  swf_SetU16(t,depth);
+  if (flags&PF_CHAR) swf_SetU16(t,id);
+  if (flags&PF_MATRIX) swf_SetMatrix(t,m);
+  if (flags&PF_CXFORM) swf_SetCXForm(t,cx,(cx->a0!=256)||(cx->a1));
+  if (flags&PF_RATIO) swf_SetU16(t,0);
+  if (flags&PF_NAME) swf_SetString(t,name);
   
   return 0; 
 }
 
-int PlaceObject(TAG * t,U16 id,U16 depth,MATRIX * m,CXFORM * cx,U8 * name, U16 clipaction)
+int swf_ObjectPlaceClip(TAG * t,U16 id,U16 depth,MATRIX * m,CXFORM * cx,U8 * name, U16 clipaction)
 { U8 flags;
   if (!t) return -1;
 
   flags = (id?PF_CHAR:0)|(m?PF_MATRIX:0)|(cx?PF_CXFORM:0)|(name?PF_NAME:0)|
           ((m||cx)&&(!id)?PF_MOVE:0)|(clipaction?PF_CLIPACTION:0);
 
-  SetU8(t,flags);
-  SetU16(t,depth);
-  if (flags&PF_CHAR) SetU16(t,id);
-  if (flags&PF_MATRIX) SetMatrix(t,m);
-  if (flags&PF_CXFORM) SetCXForm(t,cx,(cx->a0!=256)||(cx->a1));
-  if (flags&PF_RATIO) SetU16(t,0);
-  if (flags&PF_NAME) SetString(t,name);
-  if (flags&PF_CLIPACTION) SetU16(t, clipaction);
+  swf_SetU8(t,flags);
+  swf_SetU16(t,depth);
+  if (flags&PF_CHAR) swf_SetU16(t,id);
+  if (flags&PF_MATRIX) swf_SetMatrix(t,m);
+  if (flags&PF_CXFORM) swf_SetCXForm(t,cx,(cx->a0!=256)||(cx->a1));
+  if (flags&PF_RATIO) swf_SetU16(t,0);
+  if (flags&PF_NAME) swf_SetString(t,name);
+  if (flags&PF_CLIPACTION) swf_SetU16(t, clipaction);
   return 0; 
 }
 
-int ObjectMove(TAG * t,U16 depth,MATRIX * m,CXFORM * cx)
-{ return ObjectPlace(t,0,depth,m,cx,NULL);
+int swf_ObjectMove(TAG * t,U16 depth,MATRIX * m,CXFORM * cx)
+{ return swf_ObjectPlace(t,0,depth,m,cx,NULL);
 }