foo-cvs

[Martin R. <ru...@us...>]

Update of /cvsroot/foo/foo/elkfoo/src
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11866

Modified Files:
	snd.m 
Log Message:
fix for snd-region/snd-extract nesting

Index: snd.m
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/src/snd.m,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** snd.m	4 Apr 2007 14:36:04 -0000	1.9
--- snd.m	9 Apr 2009 09:58:27 -0000	1.10
***************
*** 476,480 ****
    GC_Link(snd);
    region = A_Make_Snd([FOORegion class]);
!   [IdOf(region) initWithSubstrate:p offset:o size:l rev:NO];
    SND_T(region)->name       = SND_T(snd)->name;
    SND_T(region)->filetype   = SND_T(snd)->filetype;
--- 476,480 ----
    GC_Link(snd);
    region = A_Make_Snd([FOORegion class]);
!   [IdOf(region) initWithSubstrate: p offset: o size: l rev: NO];
    SND_T(region)->name       = SND_T(snd)->name;
    SND_T(region)->filetype   = SND_T(snd)->filetype;
***************
*** 506,510 ****
    GC_Link(snd);
    region = A_Make_Snd([FOORegion class]);
!   [IdOf(region) initWithSubstrate:p offset:0. size:l rev:YES];
    SND_T(region)->name       = SND_T(snd)->name;
    SND_T(region)->filetype   = SND_T(snd)->filetype;
--- 506,510 ----
    GC_Link(snd);
    region = A_Make_Snd([FOORegion class]);
!   [IdOf(region) initWithSubstrate: p offset: 0. size: l rev: YES];
    SND_T(region)->name       = SND_T(snd)->name;
    SND_T(region)->filetype   = SND_T(snd)->filetype;
***************
*** 543,547 ****
    GC_Link(snd);
    region = A_Make_Snd([FOOSoundStream class]);
!   [IdOf(region) initWithSubstrate:p channel:c];
    SND_T(region)->name       = SND_T(snd)->name;
    SND_T(region)->filetype   = SND_T(snd)->filetype;
--- 543,547 ----
    GC_Link(snd);
    region = A_Make_Snd([FOOSoundStream class]);
!   [IdOf(region) initWithSubstrate: p channel: c - 1];
    SND_T(region)->name       = SND_T(snd)->name;
    SND_T(region)->filetype   = SND_T(snd)->filetype;