[tritonus-commits] CVS: tritonus/src/classes/org/tritonus/sampled/file/mpeg

Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/file/mpeg
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17531/src/classes/org/tritonus/sampled/file/mpeg

Modified Files:
	MpegAudioFileWriter.java 
Log Message:
also write MPEG2 and MPEG2.5 files

Direct links to online-CVS:

http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/sampled/file/mpeg/MpegAudioFileWriter.java

Index: MpegAudioFileWriter.java
===================================================================
RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/file/mpeg/MpegAudioFileWriter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** MpegAudioFileWriter.java	20 Jan 2005 19:56:28 -0000	1.1
--- MpegAudioFileWriter.java	3 Jun 2007 19:36:36 -0000	1.2
***************
*** 51,58 ****
  	    // workaround for the fixed extension problem in AudioFileFormat.Type
  	    // see org.tritonus.share.sampled.AudioFileTypes.java
! 	    new AudioFileFormat.Type("MP3", "mp3")
  	};
  
! 	public static AudioFormat.Encoding MPEG1L3=new AudioFormat.Encoding("MPEG1L3");
  
  	private static final AudioFormat[]	AUDIO_FORMATS = {
--- 51,61 ----
  	    // workaround for the fixed extension problem in AudioFileFormat.Type
  	    // see org.tritonus.share.sampled.AudioFileTypes.java
! 	    new AudioFileFormat.Type("MP3", "mp3"),
! 	    new AudioFileFormat.Type("MP2", "mp2"),
  	};
  
! 	public static final AudioFormat.Encoding MPEG1L3 = new AudioFormat.Encoding("MPEG1L3");
! 	public static final AudioFormat.Encoding MPEG2L3 = new AudioFormat.Encoding("MPEG2L3");
! 	public static final AudioFormat.Encoding MPEG2DOT5L3 = new AudioFormat.Encoding("MPEG2DOT5L3");
  
  	private static final AudioFormat[]	AUDIO_FORMATS = {
***************
*** 61,64 ****
--- 64,75 ----
  	    new AudioFormat(MPEG1L3, ALL, ALL, 2, ALL, ALL, false),
  	    new AudioFormat(MPEG1L3, ALL, ALL, 2, ALL, ALL, true),
+ 	    new AudioFormat(MPEG2L3, ALL, ALL, 1, ALL, ALL, false),
+ 	    new AudioFormat(MPEG2L3, ALL, ALL, 1, ALL, ALL, true),
+ 	    new AudioFormat(MPEG2L3, ALL, ALL, 2, ALL, ALL, false),
+ 	    new AudioFormat(MPEG2L3, ALL, ALL, 2, ALL, ALL, true),
+ 	    new AudioFormat(MPEG2DOT5L3, ALL, ALL, 1, ALL, ALL, false),
+ 	    new AudioFormat(MPEG2DOT5L3, ALL, ALL, 1, ALL, ALL, true),
+ 	    new AudioFormat(MPEG2DOT5L3, ALL, ALL, 2, ALL, ALL, false),
+ 	    new AudioFormat(MPEG2DOT5L3, ALL, ALL, 2, ALL, ALL, true),
  	};