diff --git a/.classpath b/.classpath deleted file mode 100644 index 2cd5a64..0000000 --- a/.classpath +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/.project b/.project deleted file mode 100644 index 392a6e5..0000000 --- a/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - JustFLAC - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/README.md b/README.md index e47cbc0..e69de29 100644 --- a/README.md +++ b/README.md @@ -1,19 +0,0 @@ -Welcome to JustFLAC -=================== - -What the heck? --------------- - -It isn't a fish, it's just a fork of the popular jFLAC decoder. - -Why fork jFLAC? ---------------- - -jFLAC hasn't been updated in a long time and does not support certain formats like 24-bit/192kHz. The decoder also has a few minor bugs. So this project adds support for a new format extension and fixes some bugs. - -JustFLAC is already used in MediaChest and Music-Barrel (Java programs) giving life to audiophile quality formats previously supported only by Foobar and DeaDBeeF (C programs). - -Where to find the FLAC standard? --------------------------------- - -Follow the [link](https://www.xiph.org/flac/format.html). \ No newline at end of file diff --git a/bee.xml b/bee.xml deleted file mode 100644 index 037a6d0..0000000 --- a/bee.xml +++ /dev/null @@ -1,285 +0,0 @@ - - - - - - - - - - - - ]> - - - - &env; - - - - - /bin/javac - - - - - - - /bin/javadoc - - - - - - ******** &project; Build Process ******** -* Available targets: * -* doc - build JavaDoc * -* compile - do Java compilation * -* jar - build &build_file; file * -* run - run application &main_class; * -*************************************************** - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - &source_directory; - - - - - - - - - - - - - - - /.java - - - - - - - - - - - - - - - - - - /&build_directory; - - - - - - - - - Compiling... - - - - - - - - - - > - - - - 0 - - - Error(s) at compilation - - - - - - - - - Exception at compilation - - - - - - - - - - - &manifestf; - - - - - true - - - - -d - - -sourcepath - - -subpackages - &domain; - -classpath - - &domain; - - - - - Jarring... - - - - - - - - - - - - - - - - - - - - - - - - - - -cf - - - - -cmf - - - - - - - - - - - - - Exception at jarring - - - - - - - - - - - - - y - - - - - - - - - Cleaning... - - - - - - - - - - - /&build_directory;/&build_file; - - - - - - - Running... - - - - - - - - - Running... - - - - - - - - diff --git a/env.xml b/env.xml deleted file mode 100644 index b712871..0000000 --- a/env.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - . - - - - - - - / - - - - - - - - - /jre - - - - - - - - - - 1.6 - - - - \\jre - - - - - E:\Projects\tjws\webapps - - - - - - diff --git a/pom.xml b/pom.xml index d4b3619..844fa98 100644 --- a/pom.xml +++ b/pom.xml @@ -1,23 +1,20 @@ 4.0.0 - drogatkin + mb.jflac JustFLAC - 0.0.1-SNAPSHOT + 0.0.2-SNAPSHOT + jar + - src/java - - - src/resources - - maven-compiler-plugin - 1.6 - 1.6 + 1.8 + 1.8 + \ No newline at end of file diff --git a/src/java/org/kc7bfi/jflac/ChannelData.java b/src/main/java/mb/jflac/ChannelData.java similarity index 51% rename from src/java/org/kc7bfi/jflac/ChannelData.java rename to src/main/java/mb/jflac/ChannelData.java index 8b37b91..a799b6e 100644 --- a/src/java/org/kc7bfi/jflac/ChannelData.java +++ b/src/main/java/mb/jflac/ChannelData.java @@ -1,26 +1,6 @@ -package org.kc7bfi.jflac; +package mb.jflac; -/** - * libFLAC - Free Lossless Audio Codec library - * Copyright (C) 2001,2002,2003 Josh Coalson - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -import org.kc7bfi.jflac.frame.EntropyPartitionedRiceContents; +import mb.jflac.frame.EntropyPartitionedRiceContents; /** * FLAC channel data. diff --git a/src/java/org/kc7bfi/jflac/Constants.java b/src/main/java/mb/jflac/Constants.java similarity index 96% rename from src/java/org/kc7bfi/jflac/Constants.java rename to src/main/java/mb/jflac/Constants.java index 6a9f915..ca7ad62 100644 --- a/src/java/org/kc7bfi/jflac/Constants.java +++ b/src/main/java/mb/jflac/Constants.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac; +package mb.jflac; /** * libFLAC - Free Lossless Audio Codec library diff --git a/src/java/org/kc7bfi/jflac/FLACDecoder.java b/src/main/java/mb/jflac/FLACDecoder.java similarity index 95% rename from src/java/org/kc7bfi/jflac/FLACDecoder.java rename to src/main/java/mb/jflac/FLACDecoder.java index a5e6777..bcf5c4b 100644 --- a/src/java/org/kc7bfi/jflac/FLACDecoder.java +++ b/src/main/java/mb/jflac/FLACDecoder.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac; +package mb.jflac; /** * libFLAC - Free Lossless Audio Codec library @@ -26,27 +26,27 @@ import java.util.Arrays; import java.util.Vector; -import org.kc7bfi.jflac.frame.BadHeaderException; -import org.kc7bfi.jflac.frame.ChannelConstant; -import org.kc7bfi.jflac.frame.ChannelFixed; -import org.kc7bfi.jflac.frame.ChannelLPC; -import org.kc7bfi.jflac.frame.ChannelVerbatim; -import org.kc7bfi.jflac.frame.Frame; -import org.kc7bfi.jflac.frame.Header; -import org.kc7bfi.jflac.io.BitInputStream; -import org.kc7bfi.jflac.io.RandomFileInputStream; -import org.kc7bfi.jflac.metadata.Application; -import org.kc7bfi.jflac.metadata.CueSheet; -import org.kc7bfi.jflac.metadata.Metadata; -import org.kc7bfi.jflac.metadata.Padding; -import org.kc7bfi.jflac.metadata.Picture; -import org.kc7bfi.jflac.metadata.SeekPoint; -import org.kc7bfi.jflac.metadata.SeekTable; -import org.kc7bfi.jflac.metadata.StreamInfo; -import org.kc7bfi.jflac.metadata.Unknown; -import org.kc7bfi.jflac.metadata.VorbisComment; -import org.kc7bfi.jflac.util.ByteData; -import org.kc7bfi.jflac.util.CRC16; +import mb.jflac.frame.BadHeaderException; +import mb.jflac.frame.ChannelConstant; +import mb.jflac.frame.ChannelFixed; +import mb.jflac.frame.ChannelLPC; +import mb.jflac.frame.ChannelVerbatim; +import mb.jflac.frame.Frame; +import mb.jflac.frame.Header; +import mb.jflac.io.BitInputStream; +import mb.jflac.io.RandomFileInputStream; +import mb.jflac.metadata.Application; +import mb.jflac.metadata.CueSheet; +import mb.jflac.metadata.Metadata; +import mb.jflac.metadata.Padding; +import mb.jflac.metadata.Picture; +import mb.jflac.metadata.SeekPoint; +import mb.jflac.metadata.SeekTable; +import mb.jflac.metadata.StreamInfo; +import mb.jflac.metadata.Unknown; +import mb.jflac.metadata.VorbisComment; +import mb.jflac.util.ByteData; +import mb.jflac.util.CRC16; /** * A Java FLAC decoder. diff --git a/src/java/org/kc7bfi/jflac/FLACEncoder.java b/src/main/java/mb/jflac/FLACEncoder.java similarity index 97% rename from src/java/org/kc7bfi/jflac/FLACEncoder.java rename to src/main/java/mb/jflac/FLACEncoder.java index df36809..16481f3 100644 --- a/src/java/org/kc7bfi/jflac/FLACEncoder.java +++ b/src/main/java/mb/jflac/FLACEncoder.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac; +package mb.jflac; /** * libFLAC - Free Lossless Audio Codec library @@ -22,8 +22,8 @@ import java.io.File; -import org.kc7bfi.jflac.frame.EntropyPartitionedRiceContents; -import org.kc7bfi.jflac.io.BitOutputStream; +import mb.jflac.frame.EntropyPartitionedRiceContents; +import mb.jflac.io.BitOutputStream; public class FLACEncoder { diff --git a/src/java/org/kc7bfi/jflac/FixedPredictor.java b/src/main/java/mb/jflac/FixedPredictor.java similarity index 97% rename from src/java/org/kc7bfi/jflac/FixedPredictor.java rename to src/main/java/mb/jflac/FixedPredictor.java index acc51d9..2a84c7d 100644 --- a/src/java/org/kc7bfi/jflac/FixedPredictor.java +++ b/src/main/java/mb/jflac/FixedPredictor.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac; +package mb.jflac; /** * libFLAC - Free Lossless Audio Codec library diff --git a/src/java/org/kc7bfi/jflac/FrameDecodeException.java b/src/main/java/mb/jflac/FrameDecodeException.java similarity index 92% rename from src/java/org/kc7bfi/jflac/FrameDecodeException.java rename to src/main/java/mb/jflac/FrameDecodeException.java index f0ce38e..89ff092 100644 --- a/src/java/org/kc7bfi/jflac/FrameDecodeException.java +++ b/src/main/java/mb/jflac/FrameDecodeException.java @@ -4,7 +4,7 @@ * To change the template for this generated file go to * Window - Preferences - Java - Code Generation - Code and Comments */ -package org.kc7bfi.jflac; +package mb.jflac; /** diff --git a/src/java/org/kc7bfi/jflac/FrameListener.java b/src/main/java/mb/jflac/FrameListener.java similarity index 84% rename from src/java/org/kc7bfi/jflac/FrameListener.java rename to src/main/java/mb/jflac/FrameListener.java index 4d6f81c..004c460 100644 --- a/src/java/org/kc7bfi/jflac/FrameListener.java +++ b/src/main/java/mb/jflac/FrameListener.java @@ -4,10 +4,10 @@ * To change the template for this generated file go to * Window - Preferences - Java - Code Generation - Code and Comments */ -package org.kc7bfi.jflac; +package mb.jflac; -import org.kc7bfi.jflac.frame.Frame; -import org.kc7bfi.jflac.metadata.Metadata; +import mb.jflac.frame.Frame; +import mb.jflac.metadata.Metadata; /** * FrameListener interface. diff --git a/src/java/org/kc7bfi/jflac/FrameListeners.java b/src/main/java/mb/jflac/FrameListeners.java similarity index 82% rename from src/java/org/kc7bfi/jflac/FrameListeners.java rename to src/main/java/mb/jflac/FrameListeners.java index 589ec40..8284141 100644 --- a/src/java/org/kc7bfi/jflac/FrameListeners.java +++ b/src/main/java/mb/jflac/FrameListeners.java @@ -4,13 +4,13 @@ * To change the template for this generated file go to * Window - Preferences - Java - Code Generation - Code and Comments */ -package org.kc7bfi.jflac; +package mb.jflac; import java.util.HashSet; import java.util.Iterator; -import org.kc7bfi.jflac.frame.Frame; -import org.kc7bfi.jflac.metadata.Metadata; +import mb.jflac.frame.Frame; +import mb.jflac.metadata.Metadata; /** @@ -43,7 +43,7 @@ public void removeFrameListener(FrameListener listener) { /** * Process metadata records. * @param metadata the metadata block - * @see org.kc7bfi.jflac.FrameListener#processMetadata(org.kc7bfi.jflac.metadata.MetadataBase) + * @see mb.jflac.FrameListener#processMetadata(org.kc7bfi.jflac.metadata.MetadataBase) */ public void processMetadata(Metadata metadata) { synchronized (frameListeners) { @@ -58,7 +58,7 @@ public void processMetadata(Metadata metadata) { /** * Process data frames. * @param frame the data frame - * @see org.kc7bfi.jflac.FrameListener#processFrame(org.kc7bfi.jflac.frame.Frame) + * @see mb.jflac.FrameListener#processFrame(mb.jflac.frame.Frame) */ public void processFrame(Frame frame) { synchronized (frameListeners) { @@ -73,7 +73,7 @@ public void processFrame(Frame frame) { /** * Called for each frame error detected. * @param msg The error message - * @see org.kc7bfi.jflac.FrameListener#processError(java.lang.String) + * @see mb.jflac.FrameListener#processError(java.lang.String) */ public void processError(String msg) { synchronized (frameListeners) { diff --git a/src/java/org/kc7bfi/jflac/LPCPredictor.java b/src/main/java/mb/jflac/LPCPredictor.java similarity index 97% rename from src/java/org/kc7bfi/jflac/LPCPredictor.java rename to src/main/java/mb/jflac/LPCPredictor.java index 4c2dc0e..fc9bdc3 100644 --- a/src/java/org/kc7bfi/jflac/LPCPredictor.java +++ b/src/main/java/mb/jflac/LPCPredictor.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac; +package mb.jflac; /** * libFLAC - Free Lossless Audio Codec library diff --git a/src/java/org/kc7bfi/jflac/PCMProcessor.java b/src/main/java/mb/jflac/PCMProcessor.java similarity index 84% rename from src/java/org/kc7bfi/jflac/PCMProcessor.java rename to src/main/java/mb/jflac/PCMProcessor.java index 6bc7e7f..da7fef3 100644 --- a/src/java/org/kc7bfi/jflac/PCMProcessor.java +++ b/src/main/java/mb/jflac/PCMProcessor.java @@ -4,10 +4,10 @@ * To change the template for this generated file go to * Window - Preferences - Java - Code Generation - Code and Comments */ -package org.kc7bfi.jflac; +package mb.jflac; -import org.kc7bfi.jflac.metadata.StreamInfo; -import org.kc7bfi.jflac.util.ByteData; +import mb.jflac.metadata.StreamInfo; +import mb.jflac.util.ByteData; /** * PCMProcessor interface. diff --git a/src/java/org/kc7bfi/jflac/PCMProcessors.java b/src/main/java/mb/jflac/PCMProcessors.java similarity index 83% rename from src/java/org/kc7bfi/jflac/PCMProcessors.java rename to src/main/java/mb/jflac/PCMProcessors.java index 015f991..57f8af1 100644 --- a/src/java/org/kc7bfi/jflac/PCMProcessors.java +++ b/src/main/java/mb/jflac/PCMProcessors.java @@ -4,13 +4,13 @@ * To change the template for this generated file go to * Window - Preferences - Java - Code Generation - Code and Comments */ -package org.kc7bfi.jflac; +package mb.jflac; import java.util.HashSet; import java.util.Iterator; -import org.kc7bfi.jflac.metadata.StreamInfo; -import org.kc7bfi.jflac.util.ByteData; +import mb.jflac.metadata.StreamInfo; +import mb.jflac.util.ByteData; /** @@ -43,7 +43,7 @@ public void removePCMProcessor(PCMProcessor processor) { /** * Process the StreamInfo block. * @param info the StreamInfo block - * @see org.kc7bfi.jflac.PCMProcessor#processStreamInfo(org.kc7bfi.jflac.metadata.StreamInfo) + * @see mb.jflac.PCMProcessor#processStreamInfo(mb.jflac.metadata.StreamInfo) */ public void processStreamInfo(StreamInfo info) { synchronized (pcmProcessors) { @@ -58,7 +58,7 @@ public void processStreamInfo(StreamInfo info) { /** * Process the decoded PCM bytes. * @param pcm The decoded PCM data - * @see org.kc7bfi.jflac.PCMProcessor#processPCM(org.kc7bfi.jflac.util.ByteSpace) + * @see mb.jflac.PCMProcessor#processPCM(org.kc7bfi.jflac.util.ByteSpace) */ public void processPCM(ByteData pcm) { synchronized (pcmProcessors) { diff --git a/src/java/org/kc7bfi/jflac/apps/Analyser.java b/src/main/java/mb/jflac/apps/Analyser.java similarity index 83% rename from src/java/org/kc7bfi/jflac/apps/Analyser.java rename to src/main/java/mb/jflac/apps/Analyser.java index 7cd7a81..ad9c225 100644 --- a/src/java/org/kc7bfi/jflac/apps/Analyser.java +++ b/src/main/java/mb/jflac/apps/Analyser.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.apps; +package mb.jflac.apps; /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000,2001,2002,2003 Josh Coalson @@ -23,10 +23,10 @@ import java.io.FileNotFoundException; import java.io.IOException; -import org.kc7bfi.jflac.FrameListener; -import org.kc7bfi.jflac.FLACDecoder; -import org.kc7bfi.jflac.frame.Frame; -import org.kc7bfi.jflac.metadata.Metadata; +import mb.jflac.FLACDecoder; +import mb.jflac.FrameListener; +import mb.jflac.frame.Frame; +import mb.jflac.metadata.Metadata; /** * Analyser reads all metadata and frame blocks in a FLAC file and outputs a text @@ -52,7 +52,7 @@ public void analyse(String inFileName) throws IOException { /** * Process metadata records. * @param metadata the metadata block - * @see org.kc7bfi.jflac.FrameListener#processMetadata(org.kc7bfi.jflac.metadata.MetadataBase) + * @see mb.jflac.FrameListener#processMetadata(org.kc7bfi.jflac.metadata.MetadataBase) */ public void processMetadata(Metadata metadata) { System.out.println(metadata.toString()); @@ -61,7 +61,7 @@ public void processMetadata(Metadata metadata) { /** * Process data frames. * @param frame the data frame - * @see org.kc7bfi.jflac.FrameListener#processFrame(org.kc7bfi.jflac.frame.Frame) + * @see mb.jflac.FrameListener#processFrame(mb.jflac.frame.Frame) */ public void processFrame(Frame frame) { frameNum++; @@ -71,7 +71,7 @@ public void processFrame(Frame frame) { /** * Called for each frame error detected. * @param msg The error message - * @see org.kc7bfi.jflac.FrameListener#processError(java.lang.String) + * @see mb.jflac.FrameListener#processError(java.lang.String) */ public void processError(String msg) { System.out.println("Frame Error: " + msg); diff --git a/src/java/org/kc7bfi/jflac/apps/Decoder.java b/src/main/java/mb/jflac/apps/Decoder.java similarity index 85% rename from src/java/org/kc7bfi/jflac/apps/Decoder.java rename to src/main/java/mb/jflac/apps/Decoder.java index 8211380..85cb87e 100644 --- a/src/java/org/kc7bfi/jflac/apps/Decoder.java +++ b/src/main/java/mb/jflac/apps/Decoder.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.apps; +package mb.jflac.apps; /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000,2001,2002,2003 Josh Coalson @@ -24,11 +24,11 @@ import java.io.FileOutputStream; import java.io.IOException; -import org.kc7bfi.jflac.PCMProcessor; -import org.kc7bfi.jflac.FLACDecoder; -import org.kc7bfi.jflac.metadata.StreamInfo; -import org.kc7bfi.jflac.util.ByteData; -import org.kc7bfi.jflac.util.WavWriter; +import mb.jflac.FLACDecoder; +import mb.jflac.PCMProcessor; +import mb.jflac.metadata.StreamInfo; +import mb.jflac.util.ByteData; +import mb.jflac.util.WavWriter; /** * Decode FLAC file to WAV file application. @@ -56,7 +56,7 @@ public void decode(String inFileName, String outFileName) throws IOException { /** * Process the StreamInfo block. * @param info the StreamInfo block - * @see org.kc7bfi.jflac.PCMProcessor#processStreamInfo(org.kc7bfi.jflac.metadata.StreamInfo) + * @see mb.jflac.PCMProcessor#processStreamInfo(mb.jflac.metadata.StreamInfo) */ public void processStreamInfo(StreamInfo info) { try { @@ -70,7 +70,7 @@ public void processStreamInfo(StreamInfo info) { /** * Process the decoded PCM bytes. * @param pcm The decoded PCM data - * @see org.kc7bfi.jflac.PCMProcessor#processPCM(org.kc7bfi.jflac.util.ByteSpace) + * @see mb.jflac.PCMProcessor#processPCM(org.kc7bfi.jflac.util.ByteSpace) */ public void processPCM(ByteData pcm) { try { diff --git a/src/java/org/kc7bfi/jflac/apps/ExtensionFileFilter.java b/src/main/java/mb/jflac/apps/ExtensionFileFilter.java similarity index 96% rename from src/java/org/kc7bfi/jflac/apps/ExtensionFileFilter.java rename to src/main/java/mb/jflac/apps/ExtensionFileFilter.java index 4a01def..88c5eee 100644 --- a/src/java/org/kc7bfi/jflac/apps/ExtensionFileFilter.java +++ b/src/main/java/mb/jflac/apps/ExtensionFileFilter.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.apps; +package mb.jflac.apps; /** * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved. diff --git a/src/java/org/kc7bfi/jflac/apps/FlacPacker.java b/src/main/java/mb/jflac/apps/FlacPacker.java similarity index 94% rename from src/java/org/kc7bfi/jflac/apps/FlacPacker.java rename to src/main/java/mb/jflac/apps/FlacPacker.java index 1f75ead..dd6d639 100644 --- a/src/java/org/kc7bfi/jflac/apps/FlacPacker.java +++ b/src/main/java/mb/jflac/apps/FlacPacker.java @@ -4,7 +4,7 @@ * To change the template for this generated file go to * Window - Preferences - Java - Code Generation - Code and Comments */ -package org.kc7bfi.jflac.apps; +package mb.jflac.apps; import java.awt.BorderLayout; import java.awt.FlowLayout; @@ -25,13 +25,13 @@ import javax.swing.JFrame; import javax.swing.JTextArea; -import org.kc7bfi.jflac.Constants; -import org.kc7bfi.jflac.FLACDecoder; -import org.kc7bfi.jflac.io.BitOutputStream; -import org.kc7bfi.jflac.metadata.Metadata; -import org.kc7bfi.jflac.metadata.SeekPoint; -import org.kc7bfi.jflac.metadata.SeekTable; -import org.kc7bfi.jflac.metadata.StreamInfo; +import mb.jflac.Constants; +import mb.jflac.FLACDecoder; +import mb.jflac.io.BitOutputStream; +import mb.jflac.metadata.Metadata; +import mb.jflac.metadata.SeekPoint; +import mb.jflac.metadata.SeekTable; +import mb.jflac.metadata.StreamInfo; /** diff --git a/src/java/org/kc7bfi/jflac/apps/Player.java b/src/main/java/mb/jflac/apps/Player.java similarity index 89% rename from src/java/org/kc7bfi/jflac/apps/Player.java rename to src/main/java/mb/jflac/apps/Player.java index 5048fa9..ef05550 100644 --- a/src/java/org/kc7bfi/jflac/apps/Player.java +++ b/src/main/java/mb/jflac/apps/Player.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.apps; +package mb.jflac.apps; /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000,2001,2002,2003 Josh Coalson @@ -33,10 +33,10 @@ import javax.sound.sampled.LineUnavailableException; import javax.sound.sampled.SourceDataLine; -import org.kc7bfi.jflac.PCMProcessor; -import org.kc7bfi.jflac.FLACDecoder; -import org.kc7bfi.jflac.metadata.StreamInfo; -import org.kc7bfi.jflac.util.ByteData; +import mb.jflac.FLACDecoder; +import mb.jflac.PCMProcessor; +import mb.jflac.metadata.StreamInfo; +import mb.jflac.util.ByteData; /** @@ -83,7 +83,7 @@ public void decode(String inFileName) throws IOException, LineUnavailableExcepti /** * Process the StreamInfo block. * @param streamInfo the StreamInfo block - * @see org.kc7bfi.jflac.PCMProcessor#processStreamInfo(org.kc7bfi.jflac.metadata.StreamInfo) + * @see mb.jflac.PCMProcessor#processStreamInfo(mb.jflac.metadata.StreamInfo) */ public void processStreamInfo(StreamInfo streamInfo) { try { @@ -107,7 +107,7 @@ public void processStreamInfo(StreamInfo streamInfo) { /** * Process the decoded PCM bytes. * @param pcm The decoded PCM data - * @see org.kc7bfi.jflac.PCMProcessor#processPCM(org.kc7bfi.jflac.util.ByteSpace) + * @see mb.jflac.PCMProcessor#processPCM(org.kc7bfi.jflac.util.ByteSpace) */ public void processPCM(ByteData pcm) { line.write(pcm.getData(), 0, pcm.getLen()); diff --git a/src/java/org/kc7bfi/jflac/apps/SeekTablePlayer.java b/src/main/java/mb/jflac/apps/SeekTablePlayer.java similarity index 84% rename from src/java/org/kc7bfi/jflac/apps/SeekTablePlayer.java rename to src/main/java/mb/jflac/apps/SeekTablePlayer.java index 3ae048d..6581b91 100644 --- a/src/java/org/kc7bfi/jflac/apps/SeekTablePlayer.java +++ b/src/main/java/mb/jflac/apps/SeekTablePlayer.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.apps; +package mb.jflac.apps; /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000,2001,2002,2003 Josh Coalson @@ -29,16 +29,16 @@ import javax.sound.sampled.LineUnavailableException; import javax.sound.sampled.SourceDataLine; -import org.kc7bfi.jflac.FrameListener; -import org.kc7bfi.jflac.PCMProcessor; -import org.kc7bfi.jflac.FLACDecoder; -import org.kc7bfi.jflac.frame.Frame; -import org.kc7bfi.jflac.io.RandomFileInputStream; -import org.kc7bfi.jflac.metadata.Metadata; -import org.kc7bfi.jflac.metadata.SeekPoint; -import org.kc7bfi.jflac.metadata.SeekTable; -import org.kc7bfi.jflac.metadata.StreamInfo; -import org.kc7bfi.jflac.util.ByteData; +import mb.jflac.FLACDecoder; +import mb.jflac.FrameListener; +import mb.jflac.PCMProcessor; +import mb.jflac.frame.Frame; +import mb.jflac.io.RandomFileInputStream; +import mb.jflac.metadata.Metadata; +import mb.jflac.metadata.SeekPoint; +import mb.jflac.metadata.SeekTable; +import mb.jflac.metadata.StreamInfo; +import mb.jflac.util.ByteData; /** @@ -89,7 +89,7 @@ public void play(String inFileName, int fromSeekPoint, int toSeekPoint) throws I /** * Process the StreamInfo block. * @param streamInfo the StreamInfo block - * @see org.kc7bfi.jflac.PCMProcessor#processStreamInfo(org.kc7bfi.jflac.metadata.StreamInfo) + * @see mb.jflac.PCMProcessor#processStreamInfo(mb.jflac.metadata.StreamInfo) */ public void processStreamInfo(StreamInfo streamInfo) { try { @@ -106,7 +106,7 @@ public void processStreamInfo(StreamInfo streamInfo) { /** * Process the decoded PCM bytes. * @param pcm The decoded PCM data - * @see org.kc7bfi.jflac.PCMProcessor#processPCM(org.kc7bfi.jflac.util.ByteSpace) + * @see mb.jflac.PCMProcessor#processPCM(org.kc7bfi.jflac.util.ByteSpace) */ public void processPCM(ByteData pcm) { line.write(pcm.getData(), 0, pcm.getLen()); @@ -130,7 +130,7 @@ public void processFrame(Frame frame) { /** * Process a decoder error. * @param msg The error message - * @see org.kc7bfi.jflac.FrameListener#processError(java.lang.String) + * @see mb.jflac.FrameListener#processError(java.lang.String) */ public void processError(String msg) { System.out.println("FLAC Error: " + msg); diff --git a/src/java/org/kc7bfi/jflac/apps/SndPlayer.java b/src/main/java/mb/jflac/apps/SndPlayer.java similarity index 97% rename from src/java/org/kc7bfi/jflac/apps/SndPlayer.java rename to src/main/java/mb/jflac/apps/SndPlayer.java index 22ce8cb..4d32834 100644 --- a/src/java/org/kc7bfi/jflac/apps/SndPlayer.java +++ b/src/main/java/mb/jflac/apps/SndPlayer.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.apps; +package mb.jflac.apps; /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000,2001,2002,2003 Josh Coalson diff --git a/src/java/org/kc7bfi/jflac/apps/Tester.java b/src/main/java/mb/jflac/apps/Tester.java similarity index 82% rename from src/java/org/kc7bfi/jflac/apps/Tester.java rename to src/main/java/mb/jflac/apps/Tester.java index 7760ebf..18f7920 100644 --- a/src/java/org/kc7bfi/jflac/apps/Tester.java +++ b/src/main/java/mb/jflac/apps/Tester.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.apps; +package mb.jflac.apps; /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000,2001,2002,2003 Josh Coalson @@ -22,13 +22,13 @@ import java.io.FileInputStream; import java.io.IOException; -import org.kc7bfi.jflac.FLACDecoder; -import org.kc7bfi.jflac.FrameListener; -import org.kc7bfi.jflac.frame.Frame; -import org.kc7bfi.jflac.io.RandomFileInputStream; -import org.kc7bfi.jflac.metadata.Metadata; -import org.kc7bfi.jflac.metadata.SeekPoint; -import org.kc7bfi.jflac.metadata.StreamInfo; +import mb.jflac.FLACDecoder; +import mb.jflac.FrameListener; +import mb.jflac.frame.Frame; +import mb.jflac.io.RandomFileInputStream; +import mb.jflac.metadata.Metadata; +import mb.jflac.metadata.SeekPoint; +import mb.jflac.metadata.StreamInfo; /** * Test FLAC file application. @@ -75,7 +75,7 @@ public void test2(String inFileName, long time) throws IOException { /** * Process metadata records. * @param metadata the metadata block - * @see org.kc7bfi.jflac.FrameListener#processMetadata(org.kc7bfi.jflac.metadata.MetadataBase) + * @see mb.jflac.FrameListener#processMetadata(org.kc7bfi.jflac.metadata.MetadataBase) */ public void processMetadata(Metadata metadata) { } @@ -83,7 +83,7 @@ public void processMetadata(Metadata metadata) { /** * Process data frames. * @param frame the data frame - * @see org.kc7bfi.jflac.FrameListener#processFrame(org.kc7bfi.jflac.frame.Frame) + * @see mb.jflac.FrameListener#processFrame(mb.jflac.frame.Frame) */ public void processFrame(Frame frame) { } @@ -91,7 +91,7 @@ public void processFrame(Frame frame) { /** * Called for each frame error detected. * @param msg The error message - * @see org.kc7bfi.jflac.FrameListener#processError(java.lang.String) + * @see mb.jflac.FrameListener#processError(java.lang.String) */ public void processError(String msg) { errors++; diff --git a/src/java/org/kc7bfi/jflac/frame/BadHeaderException.java b/src/main/java/mb/jflac/frame/BadHeaderException.java similarity index 94% rename from src/java/org/kc7bfi/jflac/frame/BadHeaderException.java rename to src/main/java/mb/jflac/frame/BadHeaderException.java index 73230f5..39bf4c1 100644 --- a/src/java/org/kc7bfi/jflac/frame/BadHeaderException.java +++ b/src/main/java/mb/jflac/frame/BadHeaderException.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.frame; +package mb.jflac.frame; /** * libFLAC - Free Lossless Audio Codec library diff --git a/src/java/org/kc7bfi/jflac/frame/Channel.java b/src/main/java/mb/jflac/frame/Channel.java similarity index 95% rename from src/java/org/kc7bfi/jflac/frame/Channel.java rename to src/main/java/mb/jflac/frame/Channel.java index 457c733..06946cd 100644 --- a/src/java/org/kc7bfi/jflac/frame/Channel.java +++ b/src/main/java/mb/jflac/frame/Channel.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.frame; +package mb.jflac.frame; /** * libFLAC - Free Lossless Audio Codec library diff --git a/src/java/org/kc7bfi/jflac/frame/ChannelConstant.java b/src/main/java/mb/jflac/frame/ChannelConstant.java similarity index 92% rename from src/java/org/kc7bfi/jflac/frame/ChannelConstant.java rename to src/main/java/mb/jflac/frame/ChannelConstant.java index 8906261..28d2083 100644 --- a/src/java/org/kc7bfi/jflac/frame/ChannelConstant.java +++ b/src/main/java/mb/jflac/frame/ChannelConstant.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.frame; +package mb.jflac.frame; /** * libFLAC - Free Lossless Audio Codec library @@ -22,8 +22,8 @@ import java.io.IOException; -import org.kc7bfi.jflac.ChannelData; -import org.kc7bfi.jflac.io.BitInputStream; +import mb.jflac.ChannelData; +import mb.jflac.io.BitInputStream; /** * FLAC Constant Subframe (Channel) data. diff --git a/src/java/org/kc7bfi/jflac/frame/ChannelFixed.java b/src/main/java/mb/jflac/frame/ChannelFixed.java similarity index 92% rename from src/java/org/kc7bfi/jflac/frame/ChannelFixed.java rename to src/main/java/mb/jflac/frame/ChannelFixed.java index 56420a5..07f58dd 100644 --- a/src/java/org/kc7bfi/jflac/frame/ChannelFixed.java +++ b/src/main/java/mb/jflac/frame/ChannelFixed.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.frame; +package mb.jflac.frame; /** * libFLAC - Free Lossless Audio Codec library @@ -22,10 +22,10 @@ import java.io.IOException; -import org.kc7bfi.jflac.ChannelData; -import org.kc7bfi.jflac.FixedPredictor; -import org.kc7bfi.jflac.FrameDecodeException; -import org.kc7bfi.jflac.io.BitInputStream; +import mb.jflac.ChannelData; +import mb.jflac.FixedPredictor; +import mb.jflac.FrameDecodeException; +import mb.jflac.io.BitInputStream; /** * Fixed FLAC subframe (channel). diff --git a/src/java/org/kc7bfi/jflac/frame/ChannelLPC.java b/src/main/java/mb/jflac/frame/ChannelLPC.java similarity index 94% rename from src/java/org/kc7bfi/jflac/frame/ChannelLPC.java rename to src/main/java/mb/jflac/frame/ChannelLPC.java index 2a2bc9d..c0c3961 100644 --- a/src/java/org/kc7bfi/jflac/frame/ChannelLPC.java +++ b/src/main/java/mb/jflac/frame/ChannelLPC.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.frame; +package mb.jflac.frame; /** * libFLAC - Free Lossless Audio Codec library @@ -22,11 +22,11 @@ import java.io.IOException; -import org.kc7bfi.jflac.ChannelData; -import org.kc7bfi.jflac.FrameDecodeException; -import org.kc7bfi.jflac.LPCPredictor; -import org.kc7bfi.jflac.io.BitInputStream; -import org.kc7bfi.jflac.util.BitMath; +import mb.jflac.ChannelData; +import mb.jflac.FrameDecodeException; +import mb.jflac.LPCPredictor; +import mb.jflac.io.BitInputStream; +import mb.jflac.util.BitMath; /** * LPC FLAC subframe (channel). diff --git a/src/java/org/kc7bfi/jflac/frame/ChannelVerbatim.java b/src/main/java/mb/jflac/frame/ChannelVerbatim.java similarity index 92% rename from src/java/org/kc7bfi/jflac/frame/ChannelVerbatim.java rename to src/main/java/mb/jflac/frame/ChannelVerbatim.java index 8494b2d..f56f32f 100644 --- a/src/java/org/kc7bfi/jflac/frame/ChannelVerbatim.java +++ b/src/main/java/mb/jflac/frame/ChannelVerbatim.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.frame; +package mb.jflac.frame; /** * libFLAC - Free Lossless Audio Codec library @@ -22,8 +22,8 @@ import java.io.IOException; -import org.kc7bfi.jflac.ChannelData; -import org.kc7bfi.jflac.io.BitInputStream; +import mb.jflac.ChannelData; +import mb.jflac.io.BitInputStream; /** * Verbatim FLAC subframe (channel). diff --git a/src/java/org/kc7bfi/jflac/frame/EntropyCodingMethod.java b/src/main/java/mb/jflac/frame/EntropyCodingMethod.java similarity index 93% rename from src/java/org/kc7bfi/jflac/frame/EntropyCodingMethod.java rename to src/main/java/mb/jflac/frame/EntropyCodingMethod.java index 8cfa45e..1bb9828 100644 --- a/src/java/org/kc7bfi/jflac/frame/EntropyCodingMethod.java +++ b/src/main/java/mb/jflac/frame/EntropyCodingMethod.java @@ -1,8 +1,8 @@ -package org.kc7bfi.jflac.frame; +package mb.jflac.frame; import java.io.IOException; -import org.kc7bfi.jflac.io.BitInputStream; +import mb.jflac.io.BitInputStream; /** * libFLAC - Free Lossless Audio Codec library diff --git a/src/java/org/kc7bfi/jflac/frame/EntropyPartitionedRice.java b/src/main/java/mb/jflac/frame/EntropyPartitionedRice.java similarity index 95% rename from src/java/org/kc7bfi/jflac/frame/EntropyPartitionedRice.java rename to src/main/java/mb/jflac/frame/EntropyPartitionedRice.java index 60fe793..d6ce54c 100644 --- a/src/java/org/kc7bfi/jflac/frame/EntropyPartitionedRice.java +++ b/src/main/java/mb/jflac/frame/EntropyPartitionedRice.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.frame; +package mb.jflac.frame; /** * libFLAC - Free Lossless Audio Codec library @@ -22,7 +22,7 @@ import java.io.IOException; -import org.kc7bfi.jflac.io.BitInputStream; +import mb.jflac.io.BitInputStream; /** * This class holds the Entropy Partitioned Rice contents. diff --git a/src/java/org/kc7bfi/jflac/frame/EntropyPartitionedRice2.java b/src/main/java/mb/jflac/frame/EntropyPartitionedRice2.java similarity index 95% rename from src/java/org/kc7bfi/jflac/frame/EntropyPartitionedRice2.java rename to src/main/java/mb/jflac/frame/EntropyPartitionedRice2.java index d0b71e8..ea88996 100644 --- a/src/java/org/kc7bfi/jflac/frame/EntropyPartitionedRice2.java +++ b/src/main/java/mb/jflac/frame/EntropyPartitionedRice2.java @@ -1,8 +1,8 @@ -package org.kc7bfi.jflac.frame; +package mb.jflac.frame; import java.io.IOException; -import org.kc7bfi.jflac.io.BitInputStream; +import mb.jflac.io.BitInputStream; /** * JustFLAC - Free Lossless Audio Codec library diff --git a/src/java/org/kc7bfi/jflac/frame/EntropyPartitionedRiceContents.java b/src/main/java/mb/jflac/frame/EntropyPartitionedRiceContents.java similarity index 95% rename from src/java/org/kc7bfi/jflac/frame/EntropyPartitionedRiceContents.java rename to src/main/java/mb/jflac/frame/EntropyPartitionedRiceContents.java index d8483bc..75911e4 100644 --- a/src/java/org/kc7bfi/jflac/frame/EntropyPartitionedRiceContents.java +++ b/src/main/java/mb/jflac/frame/EntropyPartitionedRiceContents.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.frame; +package mb.jflac.frame; /** * libFLAC - Free Lossless Audio Codec library diff --git a/src/java/org/kc7bfi/jflac/frame/Frame.java b/src/main/java/mb/jflac/frame/Frame.java similarity index 60% rename from src/java/org/kc7bfi/jflac/frame/Frame.java rename to src/main/java/mb/jflac/frame/Frame.java index 775c3ac..073b02b 100644 --- a/src/java/org/kc7bfi/jflac/frame/Frame.java +++ b/src/main/java/mb/jflac/frame/Frame.java @@ -1,26 +1,6 @@ -package org.kc7bfi.jflac.frame; +package mb.jflac.frame; -/** - * libFLAC - Free Lossless Audio Codec library - * Copyright (C) 2001,2002,2003 Josh Coalson - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -import org.kc7bfi.jflac.Constants; +import mb.jflac.Constants; /** * The FLAC Frame class. diff --git a/src/java/org/kc7bfi/jflac/frame/Header.java b/src/main/java/mb/jflac/frame/Header.java similarity index 95% rename from src/java/org/kc7bfi/jflac/frame/Header.java rename to src/main/java/mb/jflac/frame/Header.java index 921606a..a0c6f91 100644 --- a/src/java/org/kc7bfi/jflac/frame/Header.java +++ b/src/main/java/mb/jflac/frame/Header.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.frame; +package mb.jflac.frame; /** * libFLAC - Free Lossless Audio Codec library @@ -22,11 +22,11 @@ import java.io.IOException; -import org.kc7bfi.jflac.Constants; -import org.kc7bfi.jflac.io.BitInputStream; -import org.kc7bfi.jflac.metadata.StreamInfo; -import org.kc7bfi.jflac.util.ByteData; -import org.kc7bfi.jflac.util.CRC8; +import mb.jflac.Constants; +import mb.jflac.io.BitInputStream; +import mb.jflac.metadata.StreamInfo; +import mb.jflac.util.ByteData; +import mb.jflac.util.CRC8; /** * Frame header class. diff --git a/src/java/org/kc7bfi/jflac/io/BitInputStream.java b/src/main/java/mb/jflac/io/BitInputStream.java similarity index 96% rename from src/java/org/kc7bfi/jflac/io/BitInputStream.java rename to src/main/java/mb/jflac/io/BitInputStream.java index b61d424..36f0067 100644 --- a/src/java/org/kc7bfi/jflac/io/BitInputStream.java +++ b/src/main/java/mb/jflac/io/BitInputStream.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.io; +package mb.jflac.io; /** * libFLAC - Free Lossless Audio Codec library Copyright (C) 2000,2001,2002,2003 @@ -23,8 +23,8 @@ import java.io.IOException; import java.io.InputStream; -import org.kc7bfi.jflac.util.ByteData; -import org.kc7bfi.jflac.util.CRC16; +import mb.jflac.util.ByteData; +import mb.jflac.util.CRC16; /** diff --git a/src/java/org/kc7bfi/jflac/io/BitOutputStream.java b/src/main/java/mb/jflac/io/BitOutputStream.java similarity index 97% rename from src/java/org/kc7bfi/jflac/io/BitOutputStream.java rename to src/main/java/mb/jflac/io/BitOutputStream.java index f5f9c26..8574d2f 100644 --- a/src/java/org/kc7bfi/jflac/io/BitOutputStream.java +++ b/src/main/java/mb/jflac/io/BitOutputStream.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.io; +package mb.jflac.io; /** * libFLAC - Free Lossless Audio Codec library Copyright (C) 2000,2001,2002,2003 @@ -22,8 +22,8 @@ import java.io.IOException; import java.io.OutputStream; -import org.kc7bfi.jflac.util.CRC16; -import org.kc7bfi.jflac.util.CRC8; +import mb.jflac.util.CRC16; +import mb.jflac.util.CRC8; /** diff --git a/src/java/org/kc7bfi/jflac/io/RandomFileInputStream.java b/src/main/java/mb/jflac/io/RandomFileInputStream.java similarity index 95% rename from src/java/org/kc7bfi/jflac/io/RandomFileInputStream.java rename to src/main/java/mb/jflac/io/RandomFileInputStream.java index 3ebe529..fee069c 100644 --- a/src/java/org/kc7bfi/jflac/io/RandomFileInputStream.java +++ b/src/main/java/mb/jflac/io/RandomFileInputStream.java @@ -4,7 +4,7 @@ * To change the template for this generated file go to * Window - Preferences - Java - Code Generation - Code and Comments */ -package org.kc7bfi.jflac.io; +package mb.jflac.io; import java.io.File; import java.io.FileNotFoundException; diff --git a/src/java/org/kc7bfi/jflac/metadata/Application.java b/src/main/java/mb/jflac/metadata/Application.java similarity index 93% rename from src/java/org/kc7bfi/jflac/metadata/Application.java rename to src/main/java/mb/jflac/metadata/Application.java index 4828d17..e5efb0b 100644 --- a/src/java/org/kc7bfi/jflac/metadata/Application.java +++ b/src/main/java/mb/jflac/metadata/Application.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.metadata; +package mb.jflac.metadata; /** * libFLAC - Free Lossless Audio Codec library @@ -22,7 +22,7 @@ import java.io.IOException; -import org.kc7bfi.jflac.io.BitInputStream; +import mb.jflac.io.BitInputStream; /** * Application Metadata block. diff --git a/src/java/org/kc7bfi/jflac/metadata/CueIndex.java b/src/main/java/mb/jflac/metadata/CueIndex.java similarity index 93% rename from src/java/org/kc7bfi/jflac/metadata/CueIndex.java rename to src/main/java/mb/jflac/metadata/CueIndex.java index a3bc509..c1285df 100644 --- a/src/java/org/kc7bfi/jflac/metadata/CueIndex.java +++ b/src/main/java/mb/jflac/metadata/CueIndex.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.metadata; +package mb.jflac.metadata; /** * libFLAC - Free Lossless Audio Codec library @@ -22,7 +22,7 @@ import java.io.IOException; -import org.kc7bfi.jflac.io.BitInputStream; +import mb.jflac.io.BitInputStream; /** * An entry into the cue track. diff --git a/src/java/org/kc7bfi/jflac/metadata/CueSheet.java b/src/main/java/mb/jflac/metadata/CueSheet.java similarity index 96% rename from src/java/org/kc7bfi/jflac/metadata/CueSheet.java rename to src/main/java/mb/jflac/metadata/CueSheet.java index 04ba526..ffda10f 100644 --- a/src/java/org/kc7bfi/jflac/metadata/CueSheet.java +++ b/src/main/java/mb/jflac/metadata/CueSheet.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.metadata; +package mb.jflac.metadata; /** * libFLAC - Free Lossless Audio Codec library @@ -22,7 +22,7 @@ import java.io.IOException; -import org.kc7bfi.jflac.io.BitInputStream; +import mb.jflac.io.BitInputStream; /** * CueSheet Metadata block. diff --git a/src/java/org/kc7bfi/jflac/metadata/CueTrack.java b/src/main/java/mb/jflac/metadata/CueTrack.java similarity index 95% rename from src/java/org/kc7bfi/jflac/metadata/CueTrack.java rename to src/main/java/mb/jflac/metadata/CueTrack.java index 0c58414..da25058 100644 --- a/src/java/org/kc7bfi/jflac/metadata/CueTrack.java +++ b/src/main/java/mb/jflac/metadata/CueTrack.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.metadata; +package mb.jflac.metadata; /** * libFLAC - Free Lossless Audio Codec library @@ -22,7 +22,7 @@ import java.io.IOException; -import org.kc7bfi.jflac.io.BitInputStream; +import mb.jflac.io.BitInputStream; /** * An entry into the cue sheet. diff --git a/src/java/org/kc7bfi/jflac/metadata/Metadata.java b/src/main/java/mb/jflac/metadata/Metadata.java similarity index 95% rename from src/java/org/kc7bfi/jflac/metadata/Metadata.java rename to src/main/java/mb/jflac/metadata/Metadata.java index 244ebf6..c196c5b 100644 --- a/src/java/org/kc7bfi/jflac/metadata/Metadata.java +++ b/src/main/java/mb/jflac/metadata/Metadata.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.metadata; +package mb.jflac.metadata; /** * libFLAC - Free Lossless Audio Codec library diff --git a/src/java/org/kc7bfi/jflac/metadata/Padding.java b/src/main/java/mb/jflac/metadata/Padding.java similarity index 92% rename from src/java/org/kc7bfi/jflac/metadata/Padding.java rename to src/main/java/mb/jflac/metadata/Padding.java index e3eff2a..f8741fd 100644 --- a/src/java/org/kc7bfi/jflac/metadata/Padding.java +++ b/src/main/java/mb/jflac/metadata/Padding.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.metadata; +package mb.jflac.metadata; /** * libFLAC - Free Lossless Audio Codec library @@ -22,7 +22,7 @@ import java.io.IOException; -import org.kc7bfi.jflac.io.BitInputStream; +import mb.jflac.io.BitInputStream; /** * Padding Metadata block. diff --git a/src/java/org/kc7bfi/jflac/metadata/Picture.java b/src/main/java/mb/jflac/metadata/Picture.java similarity index 95% rename from src/java/org/kc7bfi/jflac/metadata/Picture.java rename to src/main/java/mb/jflac/metadata/Picture.java index 4de2433..15d5e95 100644 --- a/src/java/org/kc7bfi/jflac/metadata/Picture.java +++ b/src/main/java/mb/jflac/metadata/Picture.java @@ -18,11 +18,12 @@ * Boston, MA 02111-1307, USA. */ -package org.kc7bfi.jflac.metadata; +package mb.jflac.metadata; import java.io.IOException; import java.io.UnsupportedEncodingException; -import org.kc7bfi.jflac.io.BitInputStream; + +import mb.jflac.io.BitInputStream; /** diff --git a/src/java/org/kc7bfi/jflac/metadata/SeekPoint.java b/src/main/java/mb/jflac/metadata/SeekPoint.java similarity index 94% rename from src/java/org/kc7bfi/jflac/metadata/SeekPoint.java rename to src/main/java/mb/jflac/metadata/SeekPoint.java index 5a26368..32a9232 100644 --- a/src/java/org/kc7bfi/jflac/metadata/SeekPoint.java +++ b/src/main/java/mb/jflac/metadata/SeekPoint.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.metadata; +package mb.jflac.metadata; /** * libFLAC - Free Lossless Audio Codec library @@ -22,8 +22,8 @@ import java.io.IOException; -import org.kc7bfi.jflac.io.BitInputStream; -import org.kc7bfi.jflac.io.BitOutputStream; +import mb.jflac.io.BitInputStream; +import mb.jflac.io.BitOutputStream; /** * An entry into the seek table. diff --git a/src/java/org/kc7bfi/jflac/metadata/SeekTable.java b/src/main/java/mb/jflac/metadata/SeekTable.java similarity index 94% rename from src/java/org/kc7bfi/jflac/metadata/SeekTable.java rename to src/main/java/mb/jflac/metadata/SeekTable.java index bf6e725..408f924 100644 --- a/src/java/org/kc7bfi/jflac/metadata/SeekTable.java +++ b/src/main/java/mb/jflac/metadata/SeekTable.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.metadata; +package mb.jflac.metadata; /** * libFLAC - Free Lossless Audio Codec library @@ -22,8 +22,8 @@ import java.io.IOException; -import org.kc7bfi.jflac.io.BitInputStream; -import org.kc7bfi.jflac.io.BitOutputStream; +import mb.jflac.io.BitInputStream; +import mb.jflac.io.BitOutputStream; /** * SeekTable Metadata block. diff --git a/src/java/org/kc7bfi/jflac/metadata/StreamInfo.java b/src/main/java/mb/jflac/metadata/StreamInfo.java similarity index 95% rename from src/java/org/kc7bfi/jflac/metadata/StreamInfo.java rename to src/main/java/mb/jflac/metadata/StreamInfo.java index cc08b5c..70d129b 100644 --- a/src/java/org/kc7bfi/jflac/metadata/StreamInfo.java +++ b/src/main/java/mb/jflac/metadata/StreamInfo.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.metadata; +package mb.jflac.metadata; /** * libFLAC - Free Lossless Audio Codec library @@ -22,8 +22,8 @@ import java.io.IOException; -import org.kc7bfi.jflac.io.BitInputStream; -import org.kc7bfi.jflac.io.BitOutputStream; +import mb.jflac.io.BitInputStream; +import mb.jflac.io.BitOutputStream; /** * StreamInfo Metadata block. diff --git a/src/java/org/kc7bfi/jflac/metadata/Unknown.java b/src/main/java/mb/jflac/metadata/Unknown.java similarity index 92% rename from src/java/org/kc7bfi/jflac/metadata/Unknown.java rename to src/main/java/mb/jflac/metadata/Unknown.java index 5f7779a..18786ad 100644 --- a/src/java/org/kc7bfi/jflac/metadata/Unknown.java +++ b/src/main/java/mb/jflac/metadata/Unknown.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.metadata; +package mb.jflac.metadata; /** * libFLAC - Free Lossless Audio Codec library @@ -22,7 +22,7 @@ import java.io.IOException; -import org.kc7bfi.jflac.io.BitInputStream; +import mb.jflac.io.BitInputStream; /** * Unknown Metadata block. diff --git a/src/java/org/kc7bfi/jflac/metadata/Violation.java b/src/main/java/mb/jflac/metadata/Violation.java similarity index 94% rename from src/java/org/kc7bfi/jflac/metadata/Violation.java rename to src/main/java/mb/jflac/metadata/Violation.java index 7aebad4..85b9ca8 100644 --- a/src/java/org/kc7bfi/jflac/metadata/Violation.java +++ b/src/main/java/mb/jflac/metadata/Violation.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.metadata; +package mb.jflac.metadata; /** * libFLAC - Free Lossless Audio Codec library diff --git a/src/java/org/kc7bfi/jflac/metadata/VorbisComment.java b/src/main/java/mb/jflac/metadata/VorbisComment.java similarity index 82% rename from src/java/org/kc7bfi/jflac/metadata/VorbisComment.java rename to src/main/java/mb/jflac/metadata/VorbisComment.java index cba4142..1b7700f 100644 --- a/src/java/org/kc7bfi/jflac/metadata/VorbisComment.java +++ b/src/main/java/mb/jflac/metadata/VorbisComment.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.metadata; +package mb.jflac.metadata; /** * libFLAC - Free Lossless Audio Codec library @@ -21,8 +21,10 @@ */ import java.io.IOException; +import java.util.HashMap; +import java.util.Map; -import org.kc7bfi.jflac.io.BitInputStream; +import mb.jflac.io.BitInputStream; /** * VorbisComment Metadata block. @@ -87,4 +89,18 @@ public String toString() { return (String [])sbuff.toArray(new String[0]); //return null; } + + /** + * Converts this instance to name value pairs + */ + public Map toMap() { + Map props = new HashMap(comments.length); + for (VorbisString comment : comments) { + String[] split = comment.toString().split("="); + if(split.length == 2) { + props.put(split[0].toLowerCase(), split[1]); + } + } + return props; + } } diff --git a/src/java/org/kc7bfi/jflac/metadata/VorbisString.java b/src/main/java/mb/jflac/metadata/VorbisString.java similarity index 92% rename from src/java/org/kc7bfi/jflac/metadata/VorbisString.java rename to src/main/java/mb/jflac/metadata/VorbisString.java index 9c717d6..c9a830a 100644 --- a/src/java/org/kc7bfi/jflac/metadata/VorbisString.java +++ b/src/main/java/mb/jflac/metadata/VorbisString.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.metadata; +package mb.jflac.metadata; /** * libFLAC - Free Lossless Audio Codec library @@ -23,7 +23,7 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; -import org.kc7bfi.jflac.io.BitInputStream; +import mb.jflac.io.BitInputStream; /** * An entry into the Vorbis comment. diff --git a/src/java/org/kc7bfi/jflac/sound/spi/Flac2PcmAudioInputStream.java b/src/main/java/mb/jflac/sound/spi/Flac2PcmAudioInputStream.java similarity index 85% rename from src/java/org/kc7bfi/jflac/sound/spi/Flac2PcmAudioInputStream.java rename to src/main/java/mb/jflac/sound/spi/Flac2PcmAudioInputStream.java index 9d7eed8..ce2f3a2 100644 --- a/src/java/org/kc7bfi/jflac/sound/spi/Flac2PcmAudioInputStream.java +++ b/src/main/java/mb/jflac/sound/spi/Flac2PcmAudioInputStream.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.sound.spi; +package mb.jflac.sound.spi; /** * libFLAC - Free Lossless Audio Codec library @@ -25,12 +25,12 @@ import javax.sound.sampled.AudioFormat; -import org.kc7bfi.jflac.PCMProcessor; -import org.kc7bfi.jflac.FLACDecoder; -import org.kc7bfi.jflac.frame.Frame; -import org.kc7bfi.jflac.metadata.Metadata; -import org.kc7bfi.jflac.metadata.StreamInfo; -import org.kc7bfi.jflac.util.ByteData; +import mb.jflac.FLACDecoder; +import mb.jflac.PCMProcessor; +import mb.jflac.frame.Frame; +import mb.jflac.metadata.Metadata; +import mb.jflac.metadata.StreamInfo; +import mb.jflac.util.ByteData; /** * Converts an Flac bitstream into a PCM 16bits/sample audio stream. @@ -111,7 +111,7 @@ protected void initDecoder() throws IOException { * Process the StreamInfo block. * * @param streamInfo the StreamInfo block - * @see org.kc7bfi.jflac.PCMProcessor#processStreamInfo(org.kc7bfi.jflac.metadata.StreamInfo) + * @see mb.jflac.PCMProcessor#processStreamInfo(mb.jflac.metadata.StreamInfo) */ public void processStreamInfo(StreamInfo streamInfo) { this.streamInfo = streamInfo; @@ -122,7 +122,7 @@ public void processStreamInfo(StreamInfo streamInfo) { * fill() method. * * @param pcm The decoded PCM data - * @see org.kc7bfi.jflac.PCMProcessor#processPCM(ByteData) + * @see mb.jflac.PCMProcessor#processPCM(ByteData) */ public void processPCM(ByteData pcm) { buffer.resize(pcm.getLen() * 2); diff --git a/src/java/org/kc7bfi/jflac/sound/spi/FlacAudioFileReader.java b/src/main/java/mb/jflac/sound/spi/FlacAudioFileReader.java similarity index 90% rename from src/java/org/kc7bfi/jflac/sound/spi/FlacAudioFileReader.java rename to src/main/java/mb/jflac/sound/spi/FlacAudioFileReader.java index d0ab134..7110d9c 100644 --- a/src/java/org/kc7bfi/jflac/sound/spi/FlacAudioFileReader.java +++ b/src/main/java/mb/jflac/sound/spi/FlacAudioFileReader.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.sound.spi; +package mb.jflac.sound.spi; /** * libFLAC - Free Lossless Audio Codec library @@ -28,6 +28,8 @@ import java.io.InputStream; import java.io.SequenceInputStream; import java.net.URL; +import java.util.HashMap; +import java.util.Map; import javax.sound.sampled.AudioFileFormat; import javax.sound.sampled.AudioFormat; @@ -36,11 +38,13 @@ import javax.sound.sampled.UnsupportedAudioFileException; import javax.sound.sampled.spi.AudioFileReader; -import org.kc7bfi.jflac.Constants; -import org.kc7bfi.jflac.FLACDecoder; -import org.kc7bfi.jflac.io.BitInputStream; -import org.kc7bfi.jflac.io.BitOutputStream; -import org.kc7bfi.jflac.metadata.StreamInfo; +import mb.jflac.Constants; +import mb.jflac.FLACDecoder; +import mb.jflac.io.BitInputStream; +import mb.jflac.io.BitOutputStream; +import mb.jflac.metadata.Metadata; +import mb.jflac.metadata.StreamInfo; +import mb.jflac.metadata.VorbisComment; /** * Provider for Flac audio file reading services. This implementation can parse @@ -75,7 +79,7 @@ public AudioFileFormat getAudioFileFormat(File file) throws UnsupportedAudioFile InputStream inputStream = null; try { inputStream = new FileInputStream(file); - return getAudioFileFormat(inputStream, (int) file.length()); + return includeMetadata(getAudioFileFormat(inputStream, (int) file.length())); } finally { inputStream.close(); } @@ -119,7 +123,7 @@ public AudioFileFormat getAudioFileFormat(URL url) throws UnsupportedAudioFileEx * if an I/O exception occurs. */ public AudioFileFormat getAudioFileFormat(InputStream stream) throws UnsupportedAudioFileException, IOException { - return getAudioFileFormat(stream, AudioSystem.NOT_SPECIFIED); + return includeMetadata(getAudioFileFormat(stream, AudioSystem.NOT_SPECIFIED)); } /** @@ -384,4 +388,25 @@ protected AudioInputStream getAudioInputStream(InputStream inputStream, int medi // .getFormat(), audioFileFormat.getFrameLength()); return new AudioInputStream(sequenceInputStream, audioFileFormat.getFormat(), audioFileFormat.getFrameLength()); } + + /** + * Reads the metadata of the currently processed stream and enriches the format object with it. + * Note that reading metadata consumes part of the stream, so it should not be used directly + * for reading audio data. + * @param format + * @return Enriched format + * @throws IOException + */ + private AudioFileFormat includeMetadata(AudioFileFormat format) throws IOException { + if (decoder != null) { + Map props = new HashMap(); + for (Metadata md : decoder.readMetadata(streamInfo)) { + if (md instanceof VorbisComment) { + props.putAll(((VorbisComment) md).toMap()); + } + } + format = new AudioFileFormat(FlacFileFormatType.FLAC, format.getFormat(), AudioSystem.NOT_SPECIFIED, props); + } + return format; + } } diff --git a/src/java/org/kc7bfi/jflac/sound/spi/FlacAudioFormat.java b/src/main/java/mb/jflac/sound/spi/FlacAudioFormat.java similarity index 93% rename from src/java/org/kc7bfi/jflac/sound/spi/FlacAudioFormat.java rename to src/main/java/mb/jflac/sound/spi/FlacAudioFormat.java index d21f81c..0e14efb 100644 --- a/src/java/org/kc7bfi/jflac/sound/spi/FlacAudioFormat.java +++ b/src/main/java/mb/jflac/sound/spi/FlacAudioFormat.java @@ -1,7 +1,7 @@ /** * */ -package org.kc7bfi.jflac.sound.spi; +package mb.jflac.sound.spi; import java.util.Collections; import java.util.HashMap; @@ -10,7 +10,7 @@ import javax.sound.sampled.AudioFormat; import javax.sound.sampled.AudioSystem; -import org.kc7bfi.jflac.metadata.StreamInfo; +import mb.jflac.metadata.StreamInfo; /** * An AudioFormat instance wrapping a FLAC StreamInfo object. With Java 5.0 diff --git a/src/java/org/kc7bfi/jflac/sound/spi/FlacEncoding.java b/src/main/java/mb/jflac/sound/spi/FlacEncoding.java similarity index 94% rename from src/java/org/kc7bfi/jflac/sound/spi/FlacEncoding.java rename to src/main/java/mb/jflac/sound/spi/FlacEncoding.java index 98c7472..3efe177 100644 --- a/src/java/org/kc7bfi/jflac/sound/spi/FlacEncoding.java +++ b/src/main/java/mb/jflac/sound/spi/FlacEncoding.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.sound.spi; +package mb.jflac.sound.spi; /** * libFLAC - Free Lossless Audio Codec library diff --git a/src/java/org/kc7bfi/jflac/sound/spi/FlacFileFormatType.java b/src/main/java/mb/jflac/sound/spi/FlacFileFormatType.java similarity index 94% rename from src/java/org/kc7bfi/jflac/sound/spi/FlacFileFormatType.java rename to src/main/java/mb/jflac/sound/spi/FlacFileFormatType.java index 8636299..c8a1378 100644 --- a/src/java/org/kc7bfi/jflac/sound/spi/FlacFileFormatType.java +++ b/src/main/java/mb/jflac/sound/spi/FlacFileFormatType.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.sound.spi; +package mb.jflac.sound.spi; /** * libFLAC - Free Lossless Audio Codec library diff --git a/src/java/org/kc7bfi/jflac/sound/spi/FlacFormatConversionProvider.java b/src/main/java/mb/jflac/sound/spi/FlacFormatConversionProvider.java similarity index 96% rename from src/java/org/kc7bfi/jflac/sound/spi/FlacFormatConversionProvider.java rename to src/main/java/mb/jflac/sound/spi/FlacFormatConversionProvider.java index 6bb146d..9952304 100644 --- a/src/java/org/kc7bfi/jflac/sound/spi/FlacFormatConversionProvider.java +++ b/src/main/java/mb/jflac/sound/spi/FlacFormatConversionProvider.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.sound.spi; +package mb.jflac.sound.spi; /** * libFLAC - Free Lossless Audio Codec library diff --git a/src/java/org/kc7bfi/jflac/sound/spi/RingedAudioInputStream.java b/src/main/java/mb/jflac/sound/spi/RingedAudioInputStream.java similarity index 96% rename from src/java/org/kc7bfi/jflac/sound/spi/RingedAudioInputStream.java rename to src/main/java/mb/jflac/sound/spi/RingedAudioInputStream.java index 561a531..bd8bf7c 100644 --- a/src/java/org/kc7bfi/jflac/sound/spi/RingedAudioInputStream.java +++ b/src/main/java/mb/jflac/sound/spi/RingedAudioInputStream.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.sound.spi; +package mb.jflac.sound.spi; /** * libFLAC - Free Lossless Audio Codec library @@ -26,7 +26,7 @@ import javax.sound.sampled.AudioFormat; import javax.sound.sampled.AudioInputStream; -import org.kc7bfi.jflac.util.RingBuffer; +import mb.jflac.util.RingBuffer; /** * A FilteredAudioInputStream is an AudioInputStream with buffers diff --git a/src/java/org/kc7bfi/jflac/util/BitMath.java b/src/main/java/mb/jflac/util/BitMath.java similarity index 95% rename from src/java/org/kc7bfi/jflac/util/BitMath.java rename to src/main/java/mb/jflac/util/BitMath.java index 1014c3f..417010c 100644 --- a/src/java/org/kc7bfi/jflac/util/BitMath.java +++ b/src/main/java/mb/jflac/util/BitMath.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.util; +package mb.jflac.util; /** * libFLAC - Free Lossless Audio Codec library diff --git a/src/java/org/kc7bfi/jflac/util/ByteData.java b/src/main/java/mb/jflac/util/ByteData.java similarity index 95% rename from src/java/org/kc7bfi/jflac/util/ByteData.java rename to src/main/java/mb/jflac/util/ByteData.java index ebf1d14..588ecf1 100644 --- a/src/java/org/kc7bfi/jflac/util/ByteData.java +++ b/src/main/java/mb/jflac/util/ByteData.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.util; +package mb.jflac.util; /** * libFLAC - Free Lossless Audio Codec library diff --git a/src/java/org/kc7bfi/jflac/util/CRC16.java b/src/main/java/mb/jflac/util/CRC16.java similarity index 96% rename from src/java/org/kc7bfi/jflac/util/CRC16.java rename to src/main/java/mb/jflac/util/CRC16.java index c1f9785..a692734 100644 --- a/src/java/org/kc7bfi/jflac/util/CRC16.java +++ b/src/main/java/mb/jflac/util/CRC16.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.util; +package mb.jflac.util; /** * libFLAC - Free Lossless Audio Codec library diff --git a/src/java/org/kc7bfi/jflac/util/CRC8.java b/src/main/java/mb/jflac/util/CRC8.java similarity index 95% rename from src/java/org/kc7bfi/jflac/util/CRC8.java rename to src/main/java/mb/jflac/util/CRC8.java index 759e77d..a3f1139 100644 --- a/src/java/org/kc7bfi/jflac/util/CRC8.java +++ b/src/main/java/mb/jflac/util/CRC8.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.util; +package mb.jflac.util; /** * libFLAC - Free Lossless Audio Codec library diff --git a/src/java/org/kc7bfi/jflac/util/LittleEndianDataOutput.java b/src/main/java/mb/jflac/util/LittleEndianDataOutput.java similarity index 95% rename from src/java/org/kc7bfi/jflac/util/LittleEndianDataOutput.java rename to src/main/java/mb/jflac/util/LittleEndianDataOutput.java index 1a67ced..02bcaea 100644 --- a/src/java/org/kc7bfi/jflac/util/LittleEndianDataOutput.java +++ b/src/main/java/mb/jflac/util/LittleEndianDataOutput.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.util; +package mb.jflac.util; /** * libFLAC - Free Lossless Audio Codec library diff --git a/src/java/org/kc7bfi/jflac/util/PCMDecoder.java b/src/main/java/mb/jflac/util/PCMDecoder.java similarity index 94% rename from src/java/org/kc7bfi/jflac/util/PCMDecoder.java rename to src/main/java/mb/jflac/util/PCMDecoder.java index 3660a04..75e8aa0 100644 --- a/src/java/org/kc7bfi/jflac/util/PCMDecoder.java +++ b/src/main/java/mb/jflac/util/PCMDecoder.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.util; +package mb.jflac.util; /** * libFLAC - Free Lossless Audio Codec library @@ -22,9 +22,9 @@ import java.io.IOException; -import org.kc7bfi.jflac.ChannelData; -import org.kc7bfi.jflac.frame.Frame; -import org.kc7bfi.jflac.metadata.StreamInfo; +import mb.jflac.ChannelData; +import mb.jflac.frame.Frame; +import mb.jflac.metadata.StreamInfo; /** * This class is a PCM FLAC decoder. diff --git a/src/java/org/kc7bfi/jflac/util/RiceCodes.java b/src/main/java/mb/jflac/util/RiceCodes.java similarity index 92% rename from src/java/org/kc7bfi/jflac/util/RiceCodes.java rename to src/main/java/mb/jflac/util/RiceCodes.java index 23e8b70..ccd6237 100644 --- a/src/java/org/kc7bfi/jflac/util/RiceCodes.java +++ b/src/main/java/mb/jflac/util/RiceCodes.java @@ -4,7 +4,7 @@ * To change the template for this generated file go to * Window - Preferences - Java - Code Generation - Code and Comments */ -package org.kc7bfi.jflac.util; +package mb.jflac.util; /** diff --git a/src/java/org/kc7bfi/jflac/util/RingBuffer.java b/src/main/java/mb/jflac/util/RingBuffer.java similarity index 96% rename from src/java/org/kc7bfi/jflac/util/RingBuffer.java rename to src/main/java/mb/jflac/util/RingBuffer.java index 6a7d8a7..1b75bac 100644 --- a/src/java/org/kc7bfi/jflac/util/RingBuffer.java +++ b/src/main/java/mb/jflac/util/RingBuffer.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.util; +package mb.jflac.util; /** * libFLAC - Free Lossless Audio Codec library diff --git a/src/java/org/kc7bfi/jflac/util/WavWriter.java b/src/main/java/mb/jflac/util/WavWriter.java similarity index 95% rename from src/java/org/kc7bfi/jflac/util/WavWriter.java rename to src/main/java/mb/jflac/util/WavWriter.java index 29c41d1..85f651c 100644 --- a/src/java/org/kc7bfi/jflac/util/WavWriter.java +++ b/src/main/java/mb/jflac/util/WavWriter.java @@ -1,4 +1,4 @@ -package org.kc7bfi.jflac.util; +package mb.jflac.util; /** * libFLAC - Free Lossless Audio Codec library @@ -26,10 +26,10 @@ import java.io.OutputStream; import java.io.RandomAccessFile; -import org.kc7bfi.jflac.ChannelData; -import org.kc7bfi.jflac.Constants; -import org.kc7bfi.jflac.frame.Frame; -import org.kc7bfi.jflac.metadata.StreamInfo; +import mb.jflac.ChannelData; +import mb.jflac.Constants; +import mb.jflac.frame.Frame; +import mb.jflac.metadata.StreamInfo; /** * Utility class for writing WAV files. diff --git a/src/main/resources/META-INF/services/javax.sound.sampled.spi.AudioFileReader b/src/main/resources/META-INF/services/javax.sound.sampled.spi.AudioFileReader new file mode 100644 index 0000000..293394c --- /dev/null +++ b/src/main/resources/META-INF/services/javax.sound.sampled.spi.AudioFileReader @@ -0,0 +1 @@ +mb.jflac.sound.spi.FlacAudioFileReader \ No newline at end of file diff --git a/src/main/resources/META-INF/services/javax.sound.sampled.spi.FormatConversionProvider b/src/main/resources/META-INF/services/javax.sound.sampled.spi.FormatConversionProvider new file mode 100644 index 0000000..1120e05 --- /dev/null +++ b/src/main/resources/META-INF/services/javax.sound.sampled.spi.FormatConversionProvider @@ -0,0 +1 @@ +mb.jflac.sound.spi.FlacFormatConversionProvider \ No newline at end of file diff --git a/src/resources/META-INF/services/javax.sound.sampled.spi.AudioFileReader b/src/resources/META-INF/services/javax.sound.sampled.spi.AudioFileReader deleted file mode 100644 index e720960..0000000 --- a/src/resources/META-INF/services/javax.sound.sampled.spi.AudioFileReader +++ /dev/null @@ -1 +0,0 @@ -org.kc7bfi.jflac.sound.spi.FlacAudioFileReader \ No newline at end of file diff --git a/src/resources/META-INF/services/javax.sound.sampled.spi.FormatConversionProvider b/src/resources/META-INF/services/javax.sound.sampled.spi.FormatConversionProvider deleted file mode 100644 index 9bf3d39..0000000 --- a/src/resources/META-INF/services/javax.sound.sampled.spi.FormatConversionProvider +++ /dev/null @@ -1 +0,0 @@ -org.kc7bfi.jflac.sound.spi.FlacFormatConversionProvider \ No newline at end of file