Skip to content

Examine audio stuff #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shlomiv wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Examine audio stuff #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions src/MidiOptionsDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public class MidiOptionsDialog extends JDialog implements ActionListener
private JComboBox inputDeviceComboBox;
private JButton audioTestButton;

//private JCheckBox soundOnCheckBox;
private JCheckBox soundOnCheckBox;
private JComboBox instrumentsComboBox;
private JComboBox keyboardLengthComboBox; // virtual keyboard keys number
private JSpinner transpositionSpinner; // MIDI IN transposition
Expand Down Expand Up @@ -136,23 +136,23 @@ public MidiOptionsDialog(ResourceBundle b, Preferences p, MidiController midiCtr
inputDeviceComboBox = new JComboBox();
inputDeviceComboBox.setBounds(180, 42, 260, 25);
String midiInput = appPrefs.getProperty("inputDevice");
if (midiInput == "-1" || midiInput.split(",")[0].equals("MIDI"))
midiInputRadio.setSelected(true);
else if (midiInput.split(",")[0].equals("Audio"))
audioInputRadio.setSelected(true);
midiInputRadio.addActionListener(this);
audioInputRadio.addActionListener(this);

audioTestButton = new JButton("...");
audioTestButton.setIcon(new ImageIcon(getClass().getResource("/resources/microphone.png")));
audioTestButton.setFont(new Font("Arial", Font.BOLD, 13));
audioTestButton.setBounds(445, 42, 45, 25);
audioTestButton.addActionListener(this);
if (audioInputRadio.isSelected() == false)
audioTestButton.setVisible(false);
if (midiInput == "-1" || midiInput.split(",")[0].equals("MIDI"))
midiInputRadio.setSelected(true);
else if (midiInput.split(",")[0].equals("Audio"))
audioInputRadio.setSelected(true);
midiInputRadio.addActionListener(this);
audioInputRadio.addActionListener(this);
audioTestButton = new JButton("...");
audioTestButton.setIcon(new ImageIcon(getClass().getResource("/resources/microphone.png")));
audioTestButton.setFont(new Font("Arial", Font.BOLD, 13));
audioTestButton.setBounds(445, 42, 45, 25);
audioTestButton.addActionListener(this);
if (audioInputRadio.isSelected() == false)
audioTestButton.setVisible(false);

midiInPanel.add(midiInputRadio);
//midiInPanel.add(audioInputRadio); // TODO: audio unfinished business
midiInPanel.add(audioInputRadio); // TODO: audio unfinished business
midiInPanel.add(inputDeviceComboBox);
midiInPanel.add(audioTestButton);
tmpYpos+=85;
Expand Down Expand Up @@ -251,12 +251,12 @@ else if (midiSynth.split(",")[0].equals("Fluidsynth"))
keyboardLengthComboBox.setSelectedIndex(1);
keyboardLengthComboBox.addActionListener(this);

/*soundOnCheckBox = new JCheckBox(appBundle.getString("_notessound"), false);
soundOnCheckBox = new JCheckBox(appBundle.getString("_notessound"), false);
if (Integer.parseInt(appPrefs.getProperty("sound")) != 0)
soundOnCheckBox.setSelected(true);
*/


//soundPanel.add(soundOnCheckBox);
soundPanel.add(soundOnCheckBox);
soundPanel.add(keyboardsoundCheckBox);
soundPanel.add(instrumentsComboBox);
soundPanel.add(keyboardLengthComboBox);
Expand Down Expand Up @@ -501,12 +501,12 @@ public void actionPerformed(ActionEvent ae)
boolean newInstrument = false;
boolean newTranpose = false;

/*

if (soundOnCheckBox.isSelected())
appPrefs.setProperty("sound", "1");
else
appPrefs.setProperty("sound", "0");
*/

String inDev = appPrefs.getProperty("inputDevice");
String outDev = appPrefs.getProperty("outputDevice");
int inputDevIdx = -1;
Expand Down