MajenkoProjects/AudiobookRecorder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed mixer list to show more than one device

Browse Source
This commit is contained in:
Matt Jenkins
2020-02-16 12:21:43 +00:00
parent 1416f6d632
commit 75873b9e8c
1 changed files with 37 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
src/uk/co/majenko/audiobookrecorder/Options.java
View File

@@ -495,49 +495,33 @@ public class Options extends JDialog {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
static KVPair<String, String>[] getRecordingMixerList() { static KVPair<String, String>[] getRecordingMixerList() {
TreeSet<KVPair<String, String>> list = new TreeSet<KVPair<String, String>>(); return getMixerList(TargetDataLine.class);
AudioFormat stereoFormat = new AudioFormat(44100f, 16, 2, true, false);
AudioFormat monoFormat = new AudioFormat(44100f, 16, 1, true, false);
DataLine.Info stereoDIF = new DataLine.Info(TargetDataLine.class, stereoFormat);
DataLine.Info monoDIF = new DataLine.Info(TargetDataLine.class, monoFormat);
Mixer.Info[] info = AudioSystem.getMixerInfo();
for (Mixer.Info i : info) {
Mixer m = AudioSystem.getMixer(i);
boolean supported = false;
try {
m.getLine(stereoDIF);
supported = true;
} catch (Exception e) {
}
try {
m.getLine(monoDIF);
supported = true;
} catch (Exception e) {
}
if (supported) {
KVPair<String, String> p = new KVPair<String, String>(i.getName(), i.getName()); //i.getDescription());
list.add(p);
}
}
return list.toArray(new KVPair[0]);
} }
static KVPair[] getPlaybackMixerList() { static KVPair[] getPlaybackMixerList() {
TreeSet<KVPair<String, String>> list = new TreeSet<KVPair<String, String>>(); return getMixerList(SourceDataLine.class);
}
static KVPair[] getMixerList(Class<?> cl) {
ArrayList<KVPair<String, String>> list = new ArrayList<KVPair<String, String>>();
AudioFormat stereoFormat = new AudioFormat(44100f, 16, 2, true, false); AudioFormat stereoFormat = new AudioFormat(44100f, 16, 2, true, false);
AudioFormat monoFormat = new AudioFormat(44100f, 16, 1, true, false); AudioFormat monoFormat = new AudioFormat(44100f, 16, 1, true, false);
DataLine.Info stereoDIF = new DataLine.Info(SourceDataLine.class, stereoFormat); ArrayList<AudioFormat> validFormats = new ArrayList<AudioFormat>();
DataLine.Info monoDIF = new DataLine.Info(SourceDataLine.class, monoFormat);
validFormats.add(new AudioFormat(44100f, 16, 1, true, false));
validFormats.add(new AudioFormat(44100f, 16, 2, true, false));
validFormats.add(new AudioFormat(44100f, 24, 1, true, false));
validFormats.add(new AudioFormat(44100f, 24, 2, true, false));
validFormats.add(new AudioFormat(48000f, 16, 1, true, false));
validFormats.add(new AudioFormat(48000f, 16, 2, true, false));
validFormats.add(new AudioFormat(48000f, 24, 1, true, false));
validFormats.add(new AudioFormat(48000f, 24, 2, true, false));
validFormats.add(new AudioFormat(96000f, 16, 1, true, false));
validFormats.add(new AudioFormat(96000f, 16, 2, true, false));
validFormats.add(new AudioFormat(96000f, 24, 1, true, false));
validFormats.add(new AudioFormat(96000f, 24, 2, true, false));
Mixer.Info[] info = AudioSystem.getMixerInfo(); Mixer.Info[] info = AudioSystem.getMixerInfo();
for (Mixer.Info i : info) { for (Mixer.Info i : info) {
@@ -545,19 +529,14 @@ public class Options extends JDialog {
boolean supported = false; boolean supported = false;
try { for (AudioFormat valid : validFormats) {
m.getLine(stereoDIF); try {
supported = true; m.getLine(new DataLine.Info(cl, valid));
} catch (Exception e) { supported = true;
} catch (Exception e) {
}
} }
try {
m.getLine(monoDIF);
supported = true;
} catch (Exception e) {
}
if (supported) { if (supported) {
KVPair<String, String> p = new KVPair<String, String>(i.getName(), i.getName()); //i.getDescription()); KVPair<String, String> p = new KVPair<String, String>(i.getName(), i.getName()); //i.getDescription());
list.add(p); list.add(p);
@@ -727,12 +706,12 @@ public class Options extends JDialog {
} }
void storePreferences() { void storePreferences() {
set("audio.recording.device", ((KVPair)mixerList.getSelectedItem()).key); if (mixerList.getSelectedItem() != null) set("audio.recording.device", ((KVPair)mixerList.getSelectedItem()).key);
set("audio.recording.channels", ((KVPair)channelList.getSelectedItem()).key); if (channelList.getSelectedItem() != null) set("audio.recording.channels", ((KVPair)channelList.getSelectedItem()).key);
set("audio.recording.samplerate", ((KVPair)rateList.getSelectedItem()).key); if (rateList.getSelectedItem() != null) set("audio.recording.samplerate", ((KVPair)rateList.getSelectedItem()).key);
set("audio.recording.resolution", ((KVPair)bitDepth.getSelectedItem()).key); if (bitDepth.getSelectedItem() != null) set("audio.recording.resolution", ((KVPair)bitDepth.getSelectedItem()).key);
set("audio.recording.trim", ((KVPair)trimMethod.getSelectedItem()).key); if (trimMethod.getSelectedItem() != null) set("audio.recording.trim", ((KVPair)trimMethod.getSelectedItem()).key);
set("audio.playback.device", ((KVPair)playbackList.getSelectedItem()).key); if (playbackList.getSelectedItem() != null) set("audio.playback.device", ((KVPair)playbackList.getSelectedItem()).key);
set("path.storage", storageFolder.getText()); set("path.storage", storageFolder.getText());
set("path.archive", archiveFolder.getText()); set("path.archive", archiveFolder.getText());
set("path.ffmpeg", ffmpegLocation.getText()); set("path.ffmpeg", ffmpegLocation.getText());
@@ -742,9 +721,9 @@ public class Options extends JDialog {
set("catenation.short-sentence", shortSentenceGap.getValue()); set("catenation.short-sentence", shortSentenceGap.getValue());
set("catenation.post-paragraph", postParagraphGap.getValue()); set("catenation.post-paragraph", postParagraphGap.getValue());
set("catenation.post-section", postSectionGap.getValue()); set("catenation.post-section", postSectionGap.getValue());
set("audio.export.bitrate", ((KVPair)bitRate.getSelectedItem()).key); if (bitRate.getSelectedItem() != null) set("audio.export.bitrate", ((KVPair)bitRate.getSelectedItem()).key);
set("audio.export.channels", ((KVPair)channels.getSelectedItem()).key); if (channels.getSelectedItem() != null) set("audio.export.channels", ((KVPair)channels.getSelectedItem()).key);
set("audio.export.samplerate", ((KVPair)exportRate.getSelectedItem()).key); if (exportRate.getSelectedItem() != null) set("audio.export.samplerate", ((KVPair)exportRate.getSelectedItem()).key);
set("process.sphinx", enableParsing.isSelected()); set("process.sphinx", enableParsing.isSelected());
set("process.command", speechCommand.getText()); set("process.command", speechCommand.getText());
set("process.threads", workerThreads.getValue()); set("process.threads", workerThreads.getValue());
@@ -752,8 +731,8 @@ public class Options extends JDialog {
set("cache.size", cacheSize.getValue()); set("cache.size", cacheSize.getValue());
set("audio.recording.trim.fft", fftThreshold.getValue()); set("audio.recording.trim.fft", fftThreshold.getValue());
set("audio.recording.variance", maxGainVariance.getValue()); set("audio.recording.variance", maxGainVariance.getValue());
set("audio.recording.trim.blocksize", ((KVPair)fftBlockSize.getSelectedItem()).key); if (fftBlockSize.getSelectedItem() != null) set("audio.recording.trim.blocksize", ((KVPair)fftBlockSize.getSelectedItem()).key);
set("audio.playback.blocksize", ((KVPair)playbackBlockSize.getSelectedItem()).key); if (playbackBlockSize.getSelectedItem() != null) set("audio.playback.blocksize", ((KVPair)playbackBlockSize.getSelectedItem()).key);
set("scripts.startup", startupScript.getText()); set("scripts.startup", startupScript.getText());