[Ming-cvs] ming/util blocktypes.c, 1.22, 1.23 outputdecl.h, 1.23, 1.24 outputtxt.c, 1.67, 1.68 parser.c, 1.62, 1.63 parserdecl.h, 1.21, 1.22 swftypes.h, 1.44, 1.45

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

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

Modified Files:
	blocktypes.c outputdecl.h outputtxt.c parser.c parserdecl.h 
	swftypes.h 
Log Message:
parse, output, define StartSound2


Index: outputtxt.c
===================================================================
RCS file: /cvsroot/ming/ming/util/outputtxt.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** outputtxt.c	26 Aug 2007 12:43:32 -0000	1.67
--- outputtxt.c	26 Aug 2007 13:02:17 -0000	1.68
***************
*** 108,111 ****
--- 108,112 ----
    {SWF_SOUNDSTREAMHEAD2, outputSWF_SOUNDSTREAMHEAD2},
    {SWF_STARTSOUND, outputSWF_STARTSOUND},
+   {SWF_STARTSOUND2, outputSWF_STARTSOUND2},
    {SWF_SYNCFRAME, outputSWF_SYNCFRAME},
    {SWF_INITACTION, outputSWF_INITACTION},
***************
*** 2001,2004 ****
--- 2002,2013 ----
  
  void
+ outputSWF_STARTSOUND2 (SWF_Parserstruct * pblock)
+ {
+   OUT_BEGIN (SWF_STARTSOUND2);
+   iprintf(" SoundClassName %s\n", sblock->SoundClassName);
+   outputSWF_SOUNDINFO(&sblock->SoundInfo);
+ }
+ 
+ void
  outputSWF_SYNCFRAME (SWF_Parserstruct * pblock)
  {

Index: outputdecl.h
===================================================================
RCS file: /cvsroot/ming/ming/util/outputdecl.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** outputdecl.h	13 Aug 2007 13:22:26 -0000	1.23
--- outputdecl.h	26 Aug 2007 13:02:16 -0000	1.24
***************
*** 96,99 ****
--- 96,100 ----
  extern OUTPUTRET outputSWF_SOUNDSTREAMHEAD2(SWF_Parserstruct *pblock);
  extern OUTPUTRET outputSWF_STARTSOUND(SWF_Parserstruct *pblock);
+ extern OUTPUTRET outputSWF_STARTSOUND2(SWF_Parserstruct *pblock);
  extern OUTPUTRET outputSWF_SYNCFRAME(SWF_Parserstruct *pblock);
  extern OUTPUTRET outputSWF_INITACTION(SWF_Parserstruct *pblock);

Index: parserdecl.h
===================================================================
RCS file: /cvsroot/ming/ming/util/parserdecl.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** parserdecl.h	13 Aug 2007 13:22:26 -0000	1.21
--- parserdecl.h	26 Aug 2007 13:02:18 -0000	1.22
***************
*** 102,105 ****
--- 102,106 ----
  extern SWF_Parserstruct *parseSWF_SOUNDSTREAMHEAD2(FILE *f, int length);
  extern SWF_Parserstruct *parseSWF_STARTSOUND(FILE *f, int length);
+ extern SWF_Parserstruct *parseSWF_STARTSOUND2(FILE *f, int length);
  extern SWF_Parserstruct *parseSWF_SYNCFRAME(FILE *f, int length);
  extern SWF_Parserstruct *parseSWF_VIDEOFRAME(FILE *f, int length);

Index: parser.c
===================================================================
RCS file: /cvsroot/ming/ming/util/parser.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** parser.c	26 Aug 2007 12:43:32 -0000	1.62
--- parser.c	26 Aug 2007 13:02:17 -0000	1.63
***************
*** 2773,2785 ****
  }
  
! SWF_Parserstruct *
! parseSWF_STARTSOUND (FILE * f, int length)
  {
-   SWF_SOUNDINFO *si;
    int i;
!   PAR_BEGIN (SWF_STARTSOUND);
!  
!   parserrec->SoundId = readUInt16 (f);
!   si=&(parserrec->SoundInfo);
    si->Reserved = readBits (f, 2);
    si->SyncStop = readBits (f, 1);
--- 2773,2780 ----
  }
  
! void parseSWF_SOUNDINFO(FILE *f, struct SWF_SOUNDINFO *si)
  {
    int i;
!   
    si->Reserved = readBits (f, 2);
    si->SyncStop = readBits (f, 1);
***************
*** 2805,2808 ****
--- 2800,2823 ----
      	}
      }
+ }
+ 
+ SWF_Parserstruct *
+ parseSWF_STARTSOUND (FILE * f, int length)
+ {
+   PAR_BEGIN (SWF_STARTSOUND);
+  
+   parserrec->SoundId = readUInt16 (f);
+   parseSWF_SOUNDINFO(f, &parserrec->SoundInfo);
+ 
+   PAR_END;
+ }
+ 
+ SWF_Parserstruct *
+ parseSWF_STARTSOUND2 (FILE * f, int length)
+ {
+   PAR_BEGIN (SWF_STARTSOUND2);
+  
+   parserrec->SoundClassName = readString (f);
+   parseSWF_SOUNDINFO(f, &parserrec->SoundInfo);
  
    PAR_END;

Index: swftypes.h
===================================================================
RCS file: /cvsroot/ming/ming/util/swftypes.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** swftypes.h	26 Aug 2007 12:43:32 -0000	1.44
--- swftypes.h	26 Aug 2007 13:02:18 -0000	1.45
***************
*** 1686,1689 ****
--- 1686,1696 ----
  };
  
+ struct SWF_STARTSOUND2
+ {
+   STRING SoundClassName;
+   SWF_SOUNDINFO	SoundInfo;
+ };
+ 
+ 
  // XXX: obsolete?
  struct SWF_SYNCFRAME
***************
*** 2090,2093 ****
--- 2097,2101 ----
    struct SWF_SOUNDSTREAMHEAD2 SWF_SOUNDSTREAMHEAD2;
    struct SWF_STARTSOUND SWF_STARTSOUND;
+   struct SWF_STARTSOUND2 SWF_STARTSOUND2;
    struct SWF_SYNCFRAME SWF_SYNCFRAME;
    struct SWF_INITACTION SWF_INITACTION;

Index: blocktypes.c
===================================================================
RCS file: /cvsroot/ming/ming/util/blocktypes.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** blocktypes.c	13 Aug 2007 13:22:25 -0000	1.22
--- blocktypes.c	26 Aug 2007 13:02:16 -0000	1.23
***************
*** 98,101 ****
--- 98,102 ----
    BlockType (SWF_SOUNDSTREAMHEAD2),
    BlockType (SWF_STARTSOUND),
+   BlockType (SWF_STARTSOUND2),
    BlockType (SWF_SYNCFRAME),
    BlockType (SWF_VIDEOFRAME),