xavi
/
pcsxr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
SND\weimingzhi_cp 2010-07-11 02:21:32 +00:00
parent b06f5ffdb3
commit 133ada0c77
3 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
July 11, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
* plugins/dfcdrom/cfg.c: Pick default cdrom device automatically on Solaris.
* plugins/dfsound/spu.c: Reverted the previous change.
July 10, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
* configure.ac: Added --enable-libcdio parameter.

35
plugins/dfcdrom/cfg.c
View File

@ -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);

8
plugins/dfsound/spu.c
View File

@ -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;
}