rik/mimis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit before merging mimis/base

Browse Source
This commit is contained in:
Rik Veenboer
2013-12-02 20:38:19 +00:00
parent 1554117f99
commit 5b0d8bd977
15 changed files with 98 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/sound/src/main/java/old/Converter.java
View File

@@ -8,9 +8,9 @@ import java.io.OutputStream;
import javazoom.jl.decoder.Bitstream;
import javazoom.jl.decoder.BitstreamException;
import mimis.exception.worker.ActivateException;
import mimis.exception.worker.DeactivateException;
import mimis.worker.Worker;
import base.exception.worker.ActivateException;
import base.exception.worker.DeactivateException;
import base.worker.Worker;
import com.Ostermiller.util.CircularByteBuffer;

4
java/sound/src/main/java/old/List.java
View File

@@ -8,8 +8,8 @@ import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Scanner;
import mimis.exception.worker.ActivateException;
import mimis.worker.Worker;
import base.exception.worker.ActivateException;
import base.worker.Worker;
import com.Ostermiller.util.BufferOverflowException;
import com.Ostermiller.util.CircularByteBuffer;

4
java/sound/src/main/java/old/Mp3.java
View File

@@ -5,11 +5,11 @@ import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import mimis.exception.worker.ActivateException;
import org.farng.mp3.MP3File;
import org.farng.mp3.TagException;
import base.exception.worker.ActivateException;
public class Mp3 extends Converter {
protected File file;
protected String title;

6
java/sound/src/main/java/sound/Port.java
View File

@@ -6,9 +6,9 @@ import java.io.OutputStream;
import javax.sound.sampled.AudioFormat;
import mimis.exception.worker.ActivateException;
import mimis.exception.worker.DeactivateException;
import mimis.worker.Worker;
import base.exception.worker.ActivateException;
import base.exception.worker.DeactivateException;
import base.worker.Worker;
import sound.Format.Standard;
import sound.SoxBuilder.File;
import sound.SoxBuilder.File.Type;

7
java/sound/src/main/java/sound/Source.java
View File

@@ -9,13 +9,14 @@ import javax.sound.sampled.SourceDataLine;
import javazoom.jl.decoder.JavaLayerException;
import javazoom.jl.player.Player;
import mimis.exception.worker.ActivateException;
import mimis.exception.worker.DeactivateException;
import mimis.worker.Worker;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import base.exception.worker.ActivateException;
import base.exception.worker.DeactivateException;
import base.worker.Worker;
public class Source implements Consumer {
protected Logger logger = LoggerFactory.getLogger(getClass());

6
java/sound/src/main/java/sound/Stream.java
View File

@@ -7,9 +7,9 @@ import java.io.OutputStreamWriter;
import java.net.Socket;
import java.net.URL;
import mimis.exception.worker.ActivateException;
import mimis.exception.worker.DeactivateException;
import mimis.worker.Worker;
import base.exception.worker.ActivateException;
import base.exception.worker.DeactivateException;
import base.worker.Worker;
import com.Ostermiller.util.CircularByteBuffer;
import com.Ostermiller.util.CircularObjectBuffer;