[marf-cvs] marf/src/marf/Storage/Loaders WAVLoader.java,1.20,1.21

[Serguei A. M. <mo...@us...>]

Update of /cvsroot/marf/marf/src/marf/Storage/Loaders
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10206/marf/Storage/Loaders

Modified Files:
	WAVLoader.java 
Log Message:
Implement factories ClassificationFactory, PreprocessingFactory, and
SampleLoaderFactory a-la FeatureExtractionFactory. Make FeatureExtractionFactory's
constructor private for now as it is pointless to instantiate it. This
cleans up MARF's pipeline code and the set of imports and captures proper
exceptions and the functionality is more groupped where it belongs.
As a result, complete implementation of the plugin system for sample loaders.
Add a CUSTOM sound file type to be able to load plugins we don't know
the type about. Enhance InvalidSampleFormatException and PreprocessingException
with the standard constructor set they were lacking. Force WAVLoader to
throw InvalidSampleFormatException in its default constructor to be
in line with others, like SineLoader, as it is more sensical exception
than StorageException. Hopefully, this does not break many client apps.


Index: WAVLoader.java
===================================================================
RCS file: /cvsroot/marf/marf/src/marf/Storage/Loaders/WAVLoader.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** WAVLoader.java	16 Jun 2005 19:58:55 -0000	1.20
--- WAVLoader.java	28 Dec 2005 03:21:12 -0000	1.21
***************
*** 42,75 ****
  	/**
  	 * WAVLoader Constructor.
! 	 * @throws StorageException if the WAV file isn't really in WAV format
  	 * or any other error took place.
  	 */
  	public WAVLoader()
! 	throws StorageException
  	{
! 		try
! 		{
! 			this.oSample = new Sample(MARFAudioFileFormat.WAV);
! 			AudioFormat.Encoding oEncoding = AudioFormat.Encoding.PCM_SIGNED;
  
! 			float fRate = DEFAULT_FREQUENCY;
! 			int iBitSampleSize = DEFAULT_SAMPLE_BIT_SIZE;
! 			int iChannels = DEFAULT_CHANNELS;
  
! 			this.oAudioFormat = new AudioFormat
! 			(
! 				oEncoding,
! 				fRate,
! 				iBitSampleSize,
! 				iChannels,
! 				(iBitSampleSize / 8) * iChannels,
! 				fRate,
! 				false
! 			);
! 		}
! 		catch(Exception e)
! 		{
! 			throw new StorageException(e);
! 		}
  	}
  
--- 42,68 ----
  	/**
  	 * WAVLoader Constructor.
! 	 * @throws InvalidSampleFormatException if the WAV file isn't really in WAV format
  	 * or any other error took place.
  	 */
  	public WAVLoader()
! 	throws InvalidSampleFormatException
  	{
! 		this.oSample = new Sample(MARFAudioFileFormat.WAV);
! 		AudioFormat.Encoding oEncoding = AudioFormat.Encoding.PCM_SIGNED;
  
! 		float fRate = DEFAULT_FREQUENCY;
! 		int iBitSampleSize = DEFAULT_SAMPLE_BIT_SIZE;
! 		int iChannels = DEFAULT_CHANNELS;
  
! 		this.oAudioFormat = new AudioFormat
! 		(
! 			oEncoding,
! 			fRate,
! 			iBitSampleSize,
! 			iChannels,
! 			(iBitSampleSize / 8) * iChannels,
! 			fRate,
! 			false
! 		);
  	}