[Ming-cvs] ming/src ming.h.in,1.38,1.39 movie.c,1.62,1.63

[Klaus R. <kre...@us...>]

Update of /cvsroot/ming/ming/src
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23601/src

Modified Files:
	ming.h.in movie.c 
Log Message:
rename hidden functions to _internal
use SWFMovieBlockType also for SWFMovie_replace()


Index: ming.h.in
===================================================================
RCS file: /cvsroot/ming/ming/src/ming.h.in,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** ming.h.in	28 Jun 2007 18:31:29 -0000	1.38
--- ming.h.in	28 Jun 2007 18:59:09 -0000	1.39
***************
*** 87,90 ****
--- 87,122 ----
  typedef struct SWFButtonRecord_s* SWFButtonRecord;
  
+ union SWFMovieBlockType_u {
+ 	SWFBlock 		block;
+ 	SWFCharacter 		character;
+ 	SWFDBLBitmap 		dblbmp;
+ 	SWFDBLBitmapData 	dblbmp_data;
+ 	SWFJpegBitmap 		jpegbmp;
+ 	SWFJpegWithAlpha        jpegbmp_alpha;
+ 	SWFShape 		shape;
+ 	SWFMorph		morph;
+ 	SWFText			text;
+ 	SWFTextField		textfield;
+ 	SWFSound		sound;
+ 	SWFSoundInstance	sound_instance;
+ 	SWFAction		action;
+ 	SWFButton		button;
+ 	SWFSprite		sprite;
+ 	SWFMovieClip		mc;
+ 	SWFVideoStream		stream;
+ 	SWFPrebuiltClip		prebuild;
+ };
+ 
+ typedef union SWFMovieBlockType_u SWFMovieBlockType;
+ 
+ #if __GNUC__ > 3 ||  \
+ 	(__GNUC__ == 3 && (__GNUC_MINOR__ > 3 || \
+                  (__GNUC_MINOR__ == 3 && __GNUC_PATCHLEVEL__ > 0)))
+ #define __to_movie_block(x) (union SWFMovieBlockType_u)x
+ #else
+ #define __to_movie_block(x) (union SWFMovieBlockType_u) { x }
+ #endif
+ 
+ 
  /***** General Ming functions *****/
  
***************
*** 964,1004 ****
  void SWFMovie_stopSound(SWFMovie movie, SWFSound sound);
  
- union SWFMovieBlockType_u {
- 	SWFBlock 		block;
- 	SWFCharacter 		character;
- 	SWFDBLBitmap 		dblbmp;
- 	SWFDBLBitmapData 	dblbmp_data;
- 	SWFJpegBitmap 		jpegbmp;
- 	SWFJpegWithAlpha        jpegbmp_alpha;
- 	SWFShape 		shape;
- 	SWFMorph		morph;
- 	SWFText			text;
- 	SWFTextField		textfield;
- 	SWFSound		sound;
- 	SWFSoundInstance	sound_instance;
- 	SWFAction		action;
- 	SWFButton		button;
- 	SWFSprite		sprite;
- 	SWFMovieClip		mc;
- 	SWFVideoStream		stream;
- 	SWFPrebuiltClip		prebuild;
- };
- 
- typedef union SWFMovieBlockType_u SWFMovieBlockType;
- 
- #if __GNUC__ > 3 ||  \
- 	(__GNUC__ == 3 && (__GNUC_MINOR__ > 3 || \
-                  (__GNUC_MINOR__ == 3 && __GNUC_PATCHLEVEL__ > 0)))
- #define __to_union(x) (union SWFMovieBlockType_u)x
- #else
- #define __to_union(x)  (union SWFMovieBlockType_u) { x }
- #endif
- 
- SWFDisplayItem SWFMovie__add(SWFMovie movie, SWFMovieBlockType ublock);
  
  #define SWFMovie_add(__movie, __block) \
! 	SWFMovie__add((__movie), __to_union((__block)))
  
- int SWFMovie_replace(SWFMovie movie, SWFDisplayItem item, SWFBlock block);
  void SWFMovie_remove(SWFMovie movie, SWFDisplayItem item);
  
--- 996,1008 ----
  void SWFMovie_stopSound(SWFMovie movie, SWFSound sound);
  
  
+ SWFDisplayItem SWFMovie_add_internal(SWFMovie movie, SWFMovieBlockType ublock);
  #define SWFMovie_add(__movie, __block) \
! 	SWFMovie_add_internal((__movie), __to_movie_block((__block)))
! 
! int SWFMovie_replace_internal(SWFMovie movie, SWFDisplayItem item, SWFMovieBlockType block);
! #define SWFMovie_replace(__movie, __item, __block) \
! 	SWFMovie_replace_internal((__movie), (__item), __to_movie_block((__block)))
  
  void SWFMovie_remove(SWFMovie movie, SWFDisplayItem item);
  

Index: movie.c
===================================================================
RCS file: /cvsroot/ming/ming/src/movie.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** movie.c	27 Jun 2007 21:48:49 -0000	1.62
--- movie.c	28 Jun 2007 18:59:09 -0000	1.63
***************
*** 448,457 ****
  
  /* 
!  * this function replaces a displayable character with a new one
   * returns 0 on success 
   */
  int
! SWFMovie_replace(SWFMovie movie, SWFDisplayItem item, SWFBlock block)
  {
  	if(block == NULL || item == NULL)
  		return -1;
--- 448,459 ----
  
  /* 
!  * This function replaces a displayable character with a new one.
!  * Do not use this function. Use SWFMovie_replace instead!
   * returns 0 on success 
   */
  int
! SWFMovie_replace_internal(SWFMovie movie, SWFDisplayItem item, SWFMovieBlockType ublock)
  {
+ 	SWFBlock block = ublock.block;
  	if(block == NULL || item == NULL)
  		return -1;
***************
*** 494,503 ****
  
  /*
!  * add a block to a movie.
!  * This function adds a block or character to a movie. 
   */
  SWFDisplayItem
! SWFMovie__add(SWFMovie movie /* movie to which the block will be added */,
! 		SWFMovieBlockType ublock /* block to add to the movie */)
  {
  	SWFBlock block = ublock.block;
--- 496,507 ----
  
  /*
!  * Adds a block to a movie.
!  * This function adds a block or character to a movie.
!  * Do not use this function. Use SWFMovie_add instead
!  * returns a SWFDisplayItem 
   */
  SWFDisplayItem
! SWFMovie_add_internal(SWFMovie movie /* movie to which the block will be added */,
!                       SWFMovieBlockType ublock /* block to add to the movie */)
  {
  	SWFBlock block = ublock.block;