Menu
▾
▴
[JavaAmp-CVS] javaamp/src JavaAmp.java,1.21,1.22 Language.java,1.7,1.8 PreferencesDialog.java,1.9,1.10 Settings.java,1.9,1.10
|
From: WiESi <wi...@us...> - 2006-04-10 10:04:05
|
Update of /cvsroot/javaamp/javaamp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9107/src Modified Files: JavaAmp.java Language.java PreferencesDialog.java Settings.java Log Message: Index: Language.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/Language.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Language.java 9 Apr 2006 18:22:57 -0000 1.7 +++ Language.java 10 Apr 2006 10:03:50 -0000 1.8 @@ -20,6 +20,7 @@ english.put("ALLOW_MULTIPLE", "Allow multiple instances"); english.put("APPEARANCE", "Appearance"); english.put("BELOW_SPLINE", "Requested point below spline region"); + english.put("BUFFER_SIZE", "Buffer size:"); english.put("CANCEL", "Cancel"); english.put("CHECK_NEW", "Check for new versions at startup"); english.put("CLOSE", "Close"); @@ -28,6 +29,7 @@ english.put("DIRECTORY", "Directory"); english.put("DOCKING", "Enable window docking"); english.put("DOCKINGD", "Docking at (pixels):"); + english.put("DRIVER", "Driver:"); english.put("ENABLE_PROXY", "Enable proxy"); english.put("ENTER_URL", "Enter URL:"); english.put("EQF_FILES", "EQF files"); @@ -59,10 +61,13 @@ english.put("LOAD_PLAYLIST", "Load playlist"); english.put("LOADING_INFORMATIONS", "Loading file informations..."); english.put("LOOK_AND_FEEL", "Look and Feel:"); - english.put("MISCELLANEOUS", "Miscellaneous"); - english.put("MISCELLANEOUS_SHORT", "Msc"); english.put("M3U_FILES", "M3U files"); english.put("M3U_AND_PLS_FILES", "M3U and PLS files"); + english.put("MAX_CHANNELS", "Max. channels:"); + english.put("MISCELLANEOUS", "Miscellaneous"); + english.put("MISCELLANEOUS_SHORT", "Msc"); + english.put("MIX_RATE", "Mix rate:"); + english.put("MIXER_TYPE", "Mixer type:"); english.put("NEXT", "Next"); english.put("NOT_DELETED", "File cannot be deleted"); english.put("NOT_ENOUGH_POINTS_BUILD", "Not enough points to build spline"); @@ -110,6 +115,7 @@ english.put("SHOW_SPLASH", "Show splash screen"); english.put("SHUFFLE", "Shuffle"); english.put("SOUND_OUTPUT", "Sound output"); + english.put("SPEAKER_MODE", "Speaker mode:"); english.put("START_VISUALIZATION", "Start visualization"); english.put("STOP", "Stop"); english.put("SYSTRAY", "System tray"); Index: PreferencesDialog.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/PreferencesDialog.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- PreferencesDialog.java 9 Apr 2006 18:22:57 -0000 1.9 +++ PreferencesDialog.java 10 Apr 2006 10:03:50 -0000 1.10 @@ -58,6 +58,21 @@ JLabel lblDockingDPixels; JPanel panPlugins; JPanel panSoundOutput; + JLabel lblMixRate; + JSlider sliMixRate; + JLabel lblMixRateHz; + JLabel lblMaxChannels; + JSlider sliMaxChannels; + JLabel lblMaxChannelsChs; + JLabel lblBufferSize; + JSlider sliBufferSize; + JLabel lblBufferSizeMs; + JLabel lblSpeakerMode; + JComboBox cmbSpeakerMode; + JLabel lblMixerType; + JComboBox cmbMixerType; + JLabel lblDriver; + JComboBox cmbDriver; JPanel panVisualization; JButton btnClose; @@ -347,6 +362,67 @@ panSoundOutput.setBorder(BorderFactory.createTitledBorder( Language.get("PLUGINS") + " - " + Language.get("SOUND_OUTPUT"))); panSoundOutput.setBounds(170, 10, 395, 400); + lblMixRate = new JLabel(Language.get("MIX_RATE")); + lblMixRate.setBounds(15, 15, 80, 20); + panSoundOutput.add(lblMixRate); + sliMixRate = new JSlider(4000, 65535); + sliMixRate.setBounds(95, 15, 200, 20); + sliMixRate.addChangeListener(new ChangeListener() { + public void stateChanged(ChangeEvent e) { + lblMixRateHz.setText(sliMixRate.getValue() + " Hz"); + } + }); + panSoundOutput.add(sliMixRate); + lblMixRateHz = new JLabel(); + lblMixRateHz.setBounds(300, 15, 80, 20); + panSoundOutput.add(lblMixRateHz); + lblMaxChannels = new JLabel(Language.get("MAX_CHANNELS")); + lblMaxChannels.setBounds(15, 40, 80, 20); + panSoundOutput.add(lblMaxChannels); + sliMaxChannels = new JSlider(1, 1024); + sliMaxChannels.setBounds(95, 40, 200, 20); + sliMaxChannels.addChangeListener(new ChangeListener() { + public void stateChanged(ChangeEvent e) { + lblMaxChannelsChs.setText(Integer.toString( + sliMaxChannels.getValue())); + } + }); + panSoundOutput.add(sliMaxChannels); + lblMaxChannelsChs = new JLabel(); + lblMaxChannelsChs.setBounds(300, 40, 80, 20); + panSoundOutput.add(lblMaxChannelsChs); + lblBufferSize = new JLabel(Language.get("BUFFER_SIZE")); + lblBufferSize.setBounds(15, 65, 80, 20); + panSoundOutput.add(lblBufferSize); + sliBufferSize = new JSlider(50, 5000); + sliBufferSize.setBounds(95, 65, 200, 20); + sliBufferSize.addChangeListener(new ChangeListener() { + public void stateChanged(ChangeEvent e) { + lblBufferSizeMs.setText(sliBufferSize.getValue() + " ms"); + } + }); + panSoundOutput.add(sliBufferSize); + lblBufferSizeMs = new JLabel(); + lblBufferSizeMs.setBounds(300, 65, 80, 20); + panSoundOutput.add(lblBufferSizeMs); + lblSpeakerMode = new JLabel(Language.get("SPEAKER_MODE")); + lblSpeakerMode.setBounds(15, 90, 80, 20); + panSoundOutput.add(lblSpeakerMode); + cmbSpeakerMode = new JComboBox(Settings.SPEAKER_MODES_DESCS); + cmbSpeakerMode.setBounds(95, 90, 285, 20); + panSoundOutput.add(cmbSpeakerMode); + lblMixerType = new JLabel(Language.get("MIXER_TYPE")); + lblMixerType.setBounds(15, 115, 80, 20); + panSoundOutput.add(lblMixerType); + cmbMixerType = new JComboBox(Settings.MIXER_TYPES_DESCS); + cmbMixerType.setBounds(95, 115, 285, 20); + panSoundOutput.add(cmbMixerType); + lblDriver = new JLabel(Language.get("DRIVER")); + lblDriver.setBounds(15, 140, 80, 20); + panSoundOutput.add(lblDriver); + cmbDriver = new JComboBox(); + cmbDriver.setBounds(95, 140, 285, 20); + panSoundOutput.add(cmbDriver); panVisualization = new JPanel(null); panVisualization.setBorder(BorderFactory.createTitledBorder( @@ -397,6 +473,9 @@ cmbLookAndFeel.setSelectedItem(UIManager.getLookAndFeel().getName()); chbDocking.setSelected(Settings.docking); sliDockingD.setValue(Settings.dockingd); + sliMixRate.setValue(Settings.mixrate); + sliMaxChannels.setValue(Settings.maxchannels); + sliBufferSize.setValue(Settings.buffersize); // TODO ... setVisible(true); } @@ -423,6 +502,9 @@ Settings.lookAndFeel = UIManager.getLookAndFeel().getClass().getName(); Settings.docking = chbDocking.isSelected(); Settings.dockingd = sliDockingD.getValue(); + Settings.mixrate = sliMixRate.getValue(); + Settings.maxchannels = sliMaxChannels.getValue(); + Settings.buffersize = sliBufferSize.getValue(); // TODO ... setVisible(false); } Index: JavaAmp.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/JavaAmp.java,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- JavaAmp.java 9 Apr 2006 16:29:05 -0000 1.21 +++ JavaAmp.java 10 Apr 2006 10:03:50 -0000 1.22 @@ -9,7 +9,7 @@ private final static long serialVersionUID = 0; public final static String VERSION = "0.0.5 pre"; - public final static String DATE = "April 09 2006"; + public final static String DATE = "April 10 2006"; PlayDialog playDialog; PlaylistDialog playlistDialog; Index: Settings.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/Settings.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- Settings.java 9 Apr 2006 18:22:57 -0000 1.9 +++ Settings.java 10 Apr 2006 10:03:50 -0000 1.10 @@ -5,30 +5,30 @@ public class Settings { - private final static String[] SPEAKER_MODES = new String[] { + final static String[] SPEAKER_MODES = new String[] { "DOLBYDIGITAL", "HEADPHONES", "MONO", "QUAD", "STEREO", "SURROUND" }; - private final static int[] SPEAKER_MODES_VALS = new int[] { + final static int[] SPEAKER_MODES_VALS = new int[] { FSound.FSOUND_SPEAKERMODE_DOLBYDIGITAL, FSound.FSOUND_SPEAKERMODE_HEADPHONES, FSound.FSOUND_SPEAKERMODE_MONO, FSound.FSOUND_SPEAKERMODE_QUAD, FSound.FSOUND_SPEAKERMODE_STEREO, FSound.FSOUND_SPEAKERMODE_SURROUND }; - private final static String[] SPEAKER_MODES_DESCS = new String[] { + final static String[] SPEAKER_MODES_DESCS = new String[] { "Dolby Digital", "Headphones", "Monaural", "Quadraphonic", "Stereo", "Surround Sound" }; - private final static String[] MIXER_TYPES = new String[] { + final static String[] MIXER_TYPES = new String[] { "QUALITY_AUTODETECT", "QUALITY_FPU", "QUALITY_MMXP5", "QUALITY_MMXP6", "MAX" }; - private final static int[] MIXER_TYPES_VALS = new int[] { + final static int[] MIXER_TYPES_VALS = new int[] { FSound.FSOUND_MIXER_QUALITY_AUTODETECT, FSound.FSOUND_MIXER_QUALITY_FPU, FSound.FSOUND_MIXER_QUALITY_MMXP5, FSound.FSOUND_MIXER_QUALITY_MMXP6, FSound.FSOUND_MIXER_MAX }; - private final static String[] MIXER_TYPES_DESCS = new String[] { + final static String[] MIXER_TYPES_DESCS = new String[] { "Quality autodetect", "Quality FPU", "Quality MMXP5", "Quality MMXP6", "Max" }; @@ -103,7 +103,7 @@ mixrate = 4000; else if(mixrate > 65535) mixrate = 65535; - maxchannels = getIntValue(p.get("MaxChannels"), 16); + maxchannels = getIntValue(p.get("MaxChannels"), 32); if(maxchannels < 1) maxchannels = 1; else if(maxchannels > 1024) |
