[Arianne-commits] arilib/client/sound/src/net/sf/arianne/arilib/client/sound/impl/sound/manager SoundManagerNG.java, 1.14, 1.15 SoundFile.java, 1.13, 1.14 SoundManager.java, 1.29, 1.30

[Hendrik B. <nh...@us...>]

Update of /cvsroot/arianne/arilib/client/sound/src/net/sf/arianne/arilib/client/sound/impl/sound/manager
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv14480/client/sound/src/net/sf/arianne/arilib/client/sound/impl/sound/manager

Modified Files:
	SoundManagerNG.java SoundFile.java SoundManager.java 
Log Message:
renamed Type to SoundFormat

Index: SoundManagerNG.java
===================================================================
RCS file: /cvsroot/arianne/arilib/client/sound/src/net/sf/arianne/arilib/client/sound/impl/sound/manager/SoundManagerNG.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** SoundManagerNG.java	30 Mar 2010 21:21:48 -0000	1.14
--- SoundManagerNG.java	30 Mar 2010 21:24:28 -0000	1.15
***************
*** 198,202 ****
      }
  	
! 	public synchronized Sound openSound(Resource resource, SoundFile.Type fileType, int numSamplesPerChunk, boolean enableStreaming)
      {
  		Sound sound = null;
--- 198,202 ----
      }
  	
! 	public synchronized Sound openSound(Resource resource, SoundFile.SoundFormat fileType, int numSamplesPerChunk, boolean enableStreaming)
      {
  		Sound sound = null;

Index: SoundManager.java
===================================================================
RCS file: /cvsroot/arianne/arilib/client/sound/src/net/sf/arianne/arilib/client/sound/impl/sound/manager/SoundManager.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** SoundManager.java	30 Mar 2010 21:21:49 -0000	1.29
--- SoundManager.java	30 Mar 2010 21:24:28 -0000	1.30
***************
*** 181,190 ****
      }
  
! 	public Sound openSound(Resource resource, SoundFile.Type fileType)
      {
  		return openSound(resource, fileType, OUTPUT_NUM_SAMPLES, true);
      }
  
! 	public synchronized Sound openSound(Resource resource, SoundFile.Type fileType, int numSamplesPerChunk, boolean enableStreaming)
      {
  		Sound sound = null;
--- 181,190 ----
      }
  
! 	public Sound openSound(Resource resource, SoundFile.SoundFormat fileType)
      {
  		return openSound(resource, fileType, OUTPUT_NUM_SAMPLES, true);
      }
  
! 	public synchronized Sound openSound(Resource resource, SoundFile.SoundFormat fileType, int numSamplesPerChunk, boolean enableStreaming)
      {
  		Sound sound = null;

Index: SoundFile.java
===================================================================
RCS file: /cvsroot/arianne/arilib/client/sound/src/net/sf/arianne/arilib/client/sound/impl/sound/manager/SoundFile.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** SoundFile.java	30 Mar 2010 16:42:14 -0000	1.13
--- SoundFile.java	30 Mar 2010 21:24:28 -0000	1.14
***************
*** 21,25 ****
  public class SoundFile extends SignalProcessor implements Cloneable
  {
!     public static enum Type { OGG, WAV }
  
  	private int                   mNumChannels;
--- 21,25 ----
  public class SoundFile extends SignalProcessor implements Cloneable
  {
!     public static enum SoundFormat { OGG, WAV }
  
  	private int                   mNumChannels;
***************
*** 30,34 ****
  	private final boolean         mEnableStreaming;
      private final int             mOutputNumSamples;
!     private final Type            mFileType;
  	private final SignalProcessor mPropagator = new SignalProcessor()
  	{
--- 30,34 ----
  	private final boolean         mEnableStreaming;
      private final int             mOutputNumSamples;
!     private final SoundFormat     mFileType;
  	private final SignalProcessor mPropagator = new SignalProcessor()
  	{
***************
*** 47,51 ****
  
  	@SuppressWarnings("empty-statement")
!     public SoundFile(Resource resource, Type fileType, int outputNumSamplesPerChannel, boolean enableStreaming) throws IOException
      {
  		assert resource != null;
--- 47,51 ----
  
  	@SuppressWarnings("empty-statement")
!     public SoundFile(Resource resource, SoundFormat fileType, int outputNumSamplesPerChannel, boolean enableStreaming) throws IOException
      {
  		assert resource != null;
***************
*** 88,92 ****
      }
  
! 	private SoundFile(Recorder recorder, Resource resource, Type fileType, int outputNumSamplesPerChannel)
  	{
  		mResource         = resource;
--- 88,92 ----
      }
  
! 	private SoundFile(Recorder recorder, Resource resource, SoundFormat fileType, int outputNumSamplesPerChannel)
  	{
  		mResource         = resource;
***************
*** 178,182 ****
      }
  
! 	private SignalProcessor chooseDecoder(Resource resource, Type fileType, int outputNumSamplesPerChannel)
      {
          SignalProcessor decoder = null;
--- 178,182 ----
      }
  
! 	private SignalProcessor chooseDecoder(Resource resource, SoundFormat fileType, int outputNumSamplesPerChannel)
      {
          SignalProcessor decoder = null;