git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@54465 e17a0e51-4ae3-4d35-97c3-1a29b211df97

2 files changed, 33 insertions, 10 deletions

diff --git a/plugins/dfcdrom/cfg.c b/plugins/dfcdrom/cfg.c
index b9e0f92a..2bbc8447 100644
--- a/plugins/dfcdrom/cfg.c
+++ b/plugins/dfcdrom/cfg.c
@@ -30,17 +30,41 @@ long SpinDown;
 
 void LoadConf() {
 	FILE *f;
-	char cfg[255];
 
+#if defined (__sun)
+	char buf[256], *devname, *nick;
+
+	CdromDev[0] = '\0';
+	f = popen("eject -l", "r");
+
+	if (f != NULL) {
+		while (!feof(f)) {
+			fgets(buf, 256, f);
+
+			devname = strtok(buf, " ");
+			nick = strtok(NULL, " ");
+
+			if (devname == NULL || nick == NULL) continue;
+
+			if (strstr(nick, "cdrom") != NULL) {
+				strcpy(CdromDev, devname);
+				break;
+			}
+		}
+
+		pclose(f);
+	}
+#else
 	strcpy(CdromDev, DEV_DEF);
+#endif
+
 	ReadMode = THREADED;
 	UseSubQ = 0;
 	CacheSize = 64;
 	CdrSpeed = 0;
 	SpinDown = SPINDOWN_VENDOR_SPECIFIC;
 
-	sprintf(cfg, "dfcdrom.cfg");
-	f = fopen(cfg, "r");
+	f = fopen("dfcdrom.cfg", "r");
 	if (f == NULL) return;
 
 	fscanf(f, "CdromDev = %s\n", CdromDev);
@@ -60,12 +84,11 @@ void LoadConf() {
 
 void SaveConf() {
 	FILE *f;
-	char cfg[255];
 
-	sprintf(cfg, "dfcdrom.cfg");
-	f = fopen(cfg, "w");
+	f = fopen("dfcdrom.cfg", "w");
 	if (f == NULL)
 		return;
+
 	fprintf(f, "CdromDev = %s\n", CdromDev);
 	fprintf(f, "ReadMode = %ld\n", ReadMode);
 	fprintf(f, "UseSubQ = %ld\n", UseSubQ);
diff --git a/plugins/dfsound/spu.c b/plugins/dfsound/spu.c
index bfaa69a3..15c30a45 100644
--- a/plugins/dfsound/spu.c
+++ b/plugins/dfsound/spu.c
@@ -681,12 +681,12 @@ ENDX:   ;
      {
       SSumL[ns] += MixREVERBLeft(ns);
 
-      dl = SSumL[ns] * 2 / voldiv; SSumL[ns] = 0;
+      dl = SSumL[ns] / voldiv; SSumL[ns] = 0;
       if (dl < -32767) dl = -32767; if (dl > 32767) dl = 32767;
 
       SSumR[ns] += MixREVERBRight();
 
-      dr = SSumR[ns] * 2 / voldiv; SSumR[ns] = 0;
+      dr = SSumR[ns] / voldiv; SSumR[ns] = 0;
       if (dr < -32767) dr = -32767; if (dr > 32767) dr = 32767;
       *pS++ = (dl + dr) / 2;
      }
@@ -696,13 +696,13 @@ ENDX:   ;
    {
     SSumL[ns] += MixREVERBLeft(ns);
 
-    d = SSumL[ns] * 2 / voldiv; SSumL[ns] = 0;
+    d = SSumL[ns] / voldiv; SSumL[ns] = 0;
     if (d < -32767) d = -32767; if (d > 32767) d = 32767;
     *pS++ = d;
 
     SSumR[ns] += MixREVERBRight();
 
-    d = SSumR[ns] * 2 / voldiv; SSumR[ns] = 0;
+    d = SSumR[ns] / voldiv; SSumR[ns] = 0;
     if(d < -32767) d = -32767; if(d > 32767) d = 32767;
     *pS++ = d;
    }