github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-16 03:00:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2060 from magefree/revert-2029-audio_threadpool

Browse source 
Revert "Use a dedicated thread pool for audio"
This commit is contained in:
LevelX2 2016-07-10 22:01:26 +02:00 committed by GitHub
commit 01c21723fd
1 changed files with 3 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Mage.Client/src/main/java/mage/client/util/audio/LinePool.java
View file

@ -5,10 +5,6 @@ import java.util.LinkedList;
import java.util.Set; import java.util.Set;
import java.util.Timer; import java.util.Timer;
import java.util.TimerTask; import java.util.TimerTask;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import javax.sound.sampled.AudioFormat; import javax.sound.sampled.AudioFormat;
import javax.sound.sampled.AudioSystem; import javax.sound.sampled.AudioSystem;
@ -23,6 +19,8 @@ import javax.sound.sampled.SourceDataLine;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import mage.utils.ThreadUtils;
public class LinePool { public class LinePool {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
@ -43,25 +41,12 @@ public class LinePool {
private Mixer mixer; private Mixer mixer;
private int alwaysActive; private int alwaysActive;
private ThreadPoolExecutor threadPool;
private int threadCount;
public LinePool() { public LinePool() {
this(new AudioFormat(22050, 16, 1, true, false), 4, 1); this(new AudioFormat(22050, 16, 1, true, false), 4, 1);
} }
public LinePool(AudioFormat audioFormat, int size, int alwaysActive) { public LinePool(AudioFormat audioFormat, int size, int alwaysActive) {
threadPool = new ThreadPoolExecutor(alwaysActive, size, 30L, TimeUnit.SECONDS, new LinkedBlockingQueue(), new ThreadFactory() {
@Override
public Thread newThread (Runnable runnable) {
threadCount++;
Thread thread = new Thread(runnable, "Audio" + threadCount);
thread.setDaemon(true);
return thread;
}
});
threadPool.prestartAllCoreThreads();
format = audioFormat; format = audioFormat;
this.alwaysActive = alwaysActive; this.alwaysActive = alwaysActive;
mixer = AudioSystem.getMixer(null); mixer = AudioSystem.getMixer(null);
@ -110,7 +95,7 @@ public class LinePool {
busyLines.add(line); busyLines.add(line);
logLineStats(); logLineStats();
} }
threadPool.submit(new Runnable() { ThreadUtils.threadPool.submit(new Runnable() {
@Override @Override
public void run() { public void run() {