[JavaAmp-CVS] javaamp/src EqualizerDialog.java,1.16,1.17 JavaAmp.java,1.15,1.16 PlayDialog.java,1.14,1.15 PlaylistDialog.java,1.24,1.25 Settings.java,1.3,1.4

[WiESi <wi...@us...>]

Update of /cvsroot/javaamp/javaamp/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17475/src

Modified Files:
	EqualizerDialog.java JavaAmp.java PlayDialog.java 
	PlaylistDialog.java Settings.java 
Log Message:
Settings update

Index: PlayDialog.java
===================================================================
RCS file: /cvsroot/javaamp/javaamp/src/PlayDialog.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- PlayDialog.java	25 Mar 2006 10:35:19 -0000	1.14
+++ PlayDialog.java	26 Mar 2006 11:18:05 -0000	1.15
@@ -54,7 +54,6 @@
 		
 		setUndecorated(true);
 		setSize(275, 115);
-		setLocation(50, 50);
 		dockedEqualizer = dockedEqualizer2 = true;
 		dockedPlaylist = dockedPlaylist2 = false;
 		

Index: PlaylistDialog.java
===================================================================
RCS file: /cvsroot/javaamp/javaamp/src/PlaylistDialog.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- PlaylistDialog.java	25 Mar 2006 10:35:19 -0000	1.24
+++ PlaylistDialog.java	26 Mar 2006 11:18:05 -0000	1.25
@@ -67,7 +67,6 @@
 		
 		setUndecorated(true);
 		setSize(275, 115);
-		setLocation(50, 280);
 		
 		addMouseListener(new MouseAdapter() {
 			public void mousePressed(MouseEvent e) {

Index: JavaAmp.java
===================================================================
RCS file: /cvsroot/javaamp/javaamp/src/JavaAmp.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- JavaAmp.java	25 Mar 2006 21:11:40 -0000	1.15
+++ JavaAmp.java	26 Mar 2006 11:18:05 -0000	1.16
@@ -42,7 +42,11 @@
 		GraphicsLoader.startLoading(this);
 		
 		FMOD.create();
-		FSound.FSOUND_Init(44100, 16, 0);
+		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);
 		
 		fchChooser = new JFileChooser();
@@ -60,20 +64,19 @@
 		equalizerDialog = new EqualizerDialog(this);
 		playlistDialog = new PlaylistDialog(this);
 		preferencesDialog = new PreferencesDialog(this);
-		Dimension si = getToolkit().getScreenSize();
-		Insets in = getToolkit().getScreenInsets(getGraphicsConfiguration());
-		int x = (si.width + in.left - in.right - 275) / 2;
-		int y = (si.height + in.top - in.bottom - 345) / 2;
-		playDialog.setLocation(x, y);
-		equalizerDialog.setLocation(x, y + 115);
-		playlistDialog.setLocation(x, y + 230);
+		playDialog.setLocation(Settings.playDialogX, Settings.playDialogY);
+		equalizerDialog.setLocation(Settings.equalizerDialogX,
+			Settings.equalizerDialogY);
+		playlistDialog.setBounds(Settings.playlistDialogX,
+			Settings.playlistDialogY, Settings.playlistDialogWidth,
+			Settings.playlistDialogHeight);
 		
 		if(!GraphicsLoader.finishLoading())
 			throw new Exception(Language.get("ERROR_LOADING_GRAPHICS"));
 		
-		playDialog.setVisible(true);
-		equalizerDialog.setVisible(true);
-		playlistDialog.setVisible(true);
+		playDialog.setVisible(Settings.playDialogVisible);
+		equalizerDialog.setVisible(Settings.equalizerDialogVisible);
+		playlistDialog.setVisible(Settings.playlistDialogVisible);
 	}
 	
 	public final static void error(Exception e) {

Index: EqualizerDialog.java
===================================================================
RCS file: /cvsroot/javaamp/javaamp/src/EqualizerDialog.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- EqualizerDialog.java	25 Mar 2006 10:35:19 -0000	1.16
+++ EqualizerDialog.java	26 Mar 2006 11:18:05 -0000	1.17
@@ -43,7 +43,6 @@
 		
 		setUndecorated(true);
 		setSize(275, 115);
-		setLocation(50, 165);
 		dockedPlaylist = dockedPlaylist2 = true;
 		
 		addMouseListener(new MouseAdapter() {

Index: Settings.java
===================================================================
RCS file: /cvsroot/javaamp/javaamp/src/Settings.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Settings.java	25 Mar 2006 21:28:25 -0000	1.3
+++ Settings.java	26 Mar 2006 11:18:05 -0000	1.4
@@ -115,7 +115,7 @@
 		equalizerDialogVisible = getBooleanValue(p.get(
 			"EqualizerDialogVisible"), true);
 		equalizerDialogX = getIntValue(p.get("EqualizerDialogX"), x);
-		equalizerDialogY = getIntValue(p.get("EqualizerDialogX"), y + 115);
+		equalizerDialogY = getIntValue(p.get("EqualizerDialogY"), y + 115);
 		playlistDialogVisible = getBooleanValue(p.get("PlaylistDialogVisible"),
 			true);
 		playlistDialogX = getIntValue(p.get("PlaylistDialogX"), x);
@@ -179,6 +179,13 @@
 		return def;
 	}
 	
+	public final static int getDriver() {
+		for(int i = 0; i < FSound.FSOUND_GetNumDrivers(); i++)
+			if(FSound.FSOUND_GetDriverName(i).equalsIgnoreCase(driver))
+				return i;
+		return 0;
+	}
+	
 	public final static void storeSettings() throws Exception {
 		Properties p = new Properties();
 		p.put("Language", language);