Menu
▾
▴
javaamp-cvs
|
From: WiESi <wi...@us...> - 2006-04-08 18:14:05
|
Update of /cvsroot/javaamp/javaamp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7183/src Modified Files: JavaAmp.java PreferencesDialog.java Settings.java Log Message: Index: PreferencesDialog.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/PreferencesDialog.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- PreferencesDialog.java 8 Apr 2006 15:38:03 -0000 1.6 +++ PreferencesDialog.java 8 Apr 2006 18:13:56 -0000 1.7 @@ -372,9 +372,10 @@ chbTaskbar.setSelected(Settings.showInTaskbar); chbSysTray.setSelected(Settings.showInSysTray); chbScroll.setSelected(Settings.scrollTitle); - //Settings.docking = ... - //Settings.dockingd = ... - //... + cmbLookAndFeel.setSelectedItem(UIManager.getLookAndFeel().getName()); + chbDocking.setSelected(Settings.docking); + tfdDockingD.setText(Integer.toString(Settings.dockingd)); + // TODO ... setVisible(true); } @@ -384,10 +385,8 @@ Settings.proxyHost = tfdProxyHost.getText(); try { Settings.proxyPort = Integer.parseInt(tfdProxyPort.getText()); - if(Settings.proxyPort < 0) - Settings.proxyPort = 0; - else if(Settings.proxyPort > 65535) - Settings.proxyPort = 65535; + if(Settings.proxyPort < 0 || Settings.proxyPort > 65535) + Settings.proxyPort = -1; } catch(Exception e) { Settings.proxyPort = -1; @@ -398,9 +397,17 @@ Settings.showInTaskbar = chbTaskbar.isSelected(); Settings.showInSysTray = chbSysTray.isSelected(); Settings.scrollTitle = chbScroll.isSelected(); - //Settings.docking = ... - //Settings.dockingd = ... - //... + Settings.lookAndFeel = UIManager.getLookAndFeel().getClass().getName(); + Settings.docking = chbDocking.isSelected(); + try { + Settings.dockingd = Integer.parseInt(tfdDockingD.getText()); + if(Settings.dockingd < 0 || Settings.dockingd > 50) + Settings.dockingd = 10; + } + catch(Exception e) { + Settings.dockingd = 10; + } + // TODO ... setVisible(false); } } \ No newline at end of file Index: JavaAmp.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/JavaAmp.java,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- JavaAmp.java 8 Apr 2006 15:38:03 -0000 1.19 +++ JavaAmp.java 8 Apr 2006 18:13:56 -0000 1.20 @@ -56,10 +56,14 @@ GraphicsLoader.startLoading(this); FMOD.create(); + FSound.FSOUND_SetDriver(Settings.getDriver()); + Settings.driver = FSound.FSOUND_GetDriverName( + FSound.FSOUND_GetDriver()); + if(Settings.driver == null) + Settings.driver = ""; FSound.FSOUND_SetMixer(Settings.mixertype); FSound.FSOUND_SetBufferSize(Settings.buffersize); FSound.FSOUND_SetSpeakerMode(Settings.speakermode); - FSound.FSOUND_SetDriver(Settings.getDriver()); FSound.FSOUND_Init(Settings.mixrate, Settings.maxchannels, 0); FSound.FSOUND_DSP_SetActive(FSound.FSOUND_DSP_GetFFTUnit(), true); @@ -163,10 +167,11 @@ catch(Exception e) { } try { - UIManager.setLookAndFeel( - "com.jgoodies.looks.plastic.Plastic3DLookAndFeel"); + UIManager.setLookAndFeel(Settings.lookAndFeel); } catch(Exception e) { + Settings.lookAndFeel = + UIManager.getLookAndFeel().getClass().getName(); } try { new JavaAmp(); Index: Settings.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/Settings.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Settings.java 8 Apr 2006 15:38:03 -0000 1.6 +++ Settings.java 8 Apr 2006 18:13:56 -0000 1.7 @@ -6,28 +6,32 @@ public class Settings { private final static String[] SPEAKER_MODES = new String[] { - "DOLBYDIGITAL", "HEADPHONES", "MONO", "QUAD", "STEREO", "SURROUND", - "DTS", "PROLOGIC2", "PROLOGIC2_INTERIOR" + "DOLBYDIGITAL", "HEADPHONES", "MONO", "QUAD", "STEREO", "SURROUND" }; private 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, FSound.FSOUND_SPEAKERMODE_DTS, - FSound.FSOUND_SPEAKERMODE_PROLOGIC2, - FSound.FSOUND_SPEAKERMODE_PROLOGIC2_INTERIOR + FSound.FSOUND_SPEAKERMODE_SURROUND + }; + private final static String[] SPEAKER_MODES_DESCS = new String[] { + "Dolby Digital", "Headphones", "Monaural", "Quadraphonic", "Stereo", + "Surround Sound" }; private final static String[] MIXER_TYPES = new String[] { - "AUTODETECT", "QUALITY_AUTODETECT", "QUALITY_MMXP5", "QUALITY_MMXP6", - "MONO", "QUALITY_MONO", "MAX" + "QUALITY_AUTODETECT", "QUALITY_FPU", "QUALITY_MMXP5", "QUALITY_MMXP6", + "MAX" }; private final static int[] MIXER_TYPES_VALS = new int[] { - FSound.FSOUND_MIXER_AUTODETECT, FSound.FSOUND_MIXER_QUALITY_AUTODETECT, + FSound.FSOUND_MIXER_QUALITY_AUTODETECT, FSound.FSOUND_MIXER_QUALITY_FPU, FSound.FSOUND_MIXER_QUALITY_MMXP5, FSound.FSOUND_MIXER_QUALITY_MMXP6, - FSound.FSOUND_MIXER_MONO, FSound.FSOUND_MIXER_QUALITY_MONO, FSound.FSOUND_MIXER_MAX }; + private final static String[] MIXER_TYPES_DESCS = new String[] { + "Quality autodetect", "Quality FPU", "Quality MMXP5", "Quality MMXP6", + "Max" + }; static String language; static boolean proxyEnabled; @@ -39,6 +43,7 @@ static boolean showInTaskbar; static boolean showInSysTray; static boolean scrollTitle; + static String lookAndFeel; static boolean docking; static int dockingd; @@ -83,6 +88,8 @@ showInTaskbar = getBooleanValue(p.get("ShowInTaskbar"), true); showInSysTray = getBooleanValue(p.get("ShowInSysTray"), false); scrollTitle = getBooleanValue(p.get("ScrollTitle"), false); + lookAndFeel = getStringValue(p.get("LookAndFeel"), + "com.jgoodies.looks.plastic.Plastic3DLookAndFeel"); docking = getBooleanValue(p.get("Docking"), true); dockingd = getIntValue(p.get("DockingDistance"), 10); if(dockingd < 0) @@ -107,7 +114,7 @@ speakermode = getValueByString(p.get("SpeakerMode"), SPEAKER_MODES, SPEAKER_MODES_VALS, FSound.FSOUND_SPEAKERMODE_STEREO); mixertype = getValueByString(p.get("MixerType"), MIXER_TYPES, - MIXER_TYPES_VALS, FSound.FSOUND_MIXER_AUTODETECT); + MIXER_TYPES_VALS, FSound.FSOUND_MIXER_QUALITY_AUTODETECT); driver = getStringValue(p.get("Driver"), ""); int x = (Toolkit.getDefaultToolkit().getScreenSize().width - 275) / 2; int y = (Toolkit.getDefaultToolkit().getScreenSize().height - 345) / 2; @@ -200,6 +207,7 @@ p.put("ShowInTaskbar", Boolean.toString(showInTaskbar)); p.put("ShowInSysTray", Boolean.toString(showInSysTray)); p.put("ScrollTitle", Boolean.toString(scrollTitle)); + p.put("LookAndFeel", lookAndFeel); p.put("Docking", Boolean.toString(docking)); p.put("DockingDistance", Integer.toString(dockingd)); p.put("MixRate", Integer.toString(mixrate)); |
