[Scummvm-cvs-logs] SF.net SVN: scummvm:[40353] scummvm/trunk/engines/sci/sfx
sev at users.sourceforge.net
sev at users.sourceforge.net
Wed May 6 13:00:25 CEST 2009
Revision: 40353
http://scummvm.svn.sourceforge.net/scummvm/?rev=40353&view=rev
Author: sev
Date: 2009-05-06 11:00:24 +0000 (Wed, 06 May 2009)
Log Message:
-----------
Rename duplicate named files in order to make MSVC happier
Added Paths:
-----------
scummvm/trunk/engines/sci/sfx/adlib_sbi.cpp
scummvm/trunk/engines/sci/sfx/adlib_sbi.h
Removed Paths:
-------------
scummvm/trunk/engines/sci/sfx/adlib.cpp
scummvm/trunk/engines/sci/sfx/adlib.h
Deleted: scummvm/trunk/engines/sci/sfx/adlib.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/adlib.cpp 2009-05-06 10:29:30 UTC (rev 40352)
+++ scummvm/trunk/engines/sci/sfx/adlib.cpp 2009-05-06 11:00:24 UTC (rev 40353)
@@ -1,74 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include "sci/sfx/adlib.h"
-
-namespace Sci {
-
-adlib_instr adlib_sbi[96];
-
-void make_sbi(adlib_def *one, uint8 *buffer) {
- memset(buffer, 0, sizeof(adlib_instr));
-
-#if 0
- printf("%02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x ", one->keyscale1, one->freqmod1, one->feedback1, one->attackrate1, one->sustainvol1, one->envelope1, one->decayrate1, one->releaserate1, one->volume1, one->ampmod1, one->vibrato1, one->keybdscale1, one->algorithm1, one->waveform1);
-
- printf(" %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x ", one->keyscale2, one->freqmod2, one->feedback2, one->attackrate2, one->sustainvol2, one->envelope2, one->decayrate2, one->releaserate2, one->volume2, one->ampmod2, one->vibrato2, one->keybdscale2, one->algorithm2, one->waveform2);
-
- printf("\n");
-#endif
-
- buffer[0] |= ((one->ampmod1 & 0x1) << 7);
- buffer[0] |= ((one->vibrato1 & 0x1) << 6);
- buffer[0] |= ((one->envelope1 & 0x1) << 5);
- buffer[0] |= ((one->keybdscale1 & 0x1) << 4);
- buffer[0] |= (one->freqmod1 & 0xf);
- buffer[1] |= ((one->ampmod2 & 0x1) << 7);
- buffer[1] |= ((one->vibrato2 & 0x1) << 6);
- buffer[1] |= ((one->envelope2 & 0x1) << 5);
- buffer[1] |= ((one->keybdscale2 & 0x1) << 4);
- buffer[1] |= (one->freqmod2 & 0xf);
- buffer[2] |= ((one->keyscale1 & 0x3) << 6);
- buffer[2] |= (one->volume1 & 0x3f);
- buffer[3] |= ((one->keyscale2 & 0x3) << 6);
- buffer[3] |= (one->volume2 & 0x3f);
- buffer[4] |= ((one->attackrate1 & 0xf) << 4);
- buffer[4] |= (one->decayrate1 & 0xf);
- buffer[5] |= ((one->attackrate2 & 0xf) << 4);
- buffer[5] |= (one->decayrate2 & 0xf);
- buffer[6] |= ((one->sustainvol1 & 0xf) << 4);
- buffer[6] |= (one->releaserate1 & 0xf);
- buffer[7] |= ((one->sustainvol2 & 0xf) << 4);
- buffer[7] |= (one->releaserate2 & 0xf);
- buffer[8] |= (one->waveform1 & 0x3);
- buffer[9] |= (one->waveform2 & 0x3);
-
- buffer[10] |= ((one->feedback1 & 0x7) << 1);
- buffer[10] |= (1 - (one->algorithm1 & 0x1));
-
- return;
-}
-
-} // End of namespace Sci
Deleted: scummvm/trunk/engines/sci/sfx/adlib.h
===================================================================
--- scummvm/trunk/engines/sci/sfx/adlib.h 2009-05-06 10:29:30 UTC (rev 40352)
+++ scummvm/trunk/engines/sci/sfx/adlib.h 2009-05-06 11:00:24 UTC (rev 40353)
@@ -1,76 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-
-#ifndef SCI_SFX_ADLIB_H
-#define SCI_SFX_ADLIB_H
-
-#include "sci/tools.h"
-
-namespace Sci {
-
-#define ADLIB_VOICES 9
-
-struct adlib_def {
- uint8 keyscale1; /* 0-3 !*/
- uint8 freqmod1; /* 0-15 !*/
- uint8 feedback1; /* 0-7 !*/
- uint8 attackrate1; /* 0-15 !*/
- uint8 sustainvol1; /* 0-15 !*/
- uint8 envelope1; /* t/f !*/
- uint8 decayrate1; /* 0-15 !*/
- uint8 releaserate1; /* 0-15 !*/
- uint8 volume1; /* 0-63 !*/
- uint8 ampmod1; /* t/f !*/
- uint8 vibrato1; /* t/f !*/
- uint8 keybdscale1; /* t/f !*/
- uint8 algorithm1; /* 0,1 REVERSED */
- uint8 keyscale2; /* 0-3 !*/
- uint8 freqmod2; /* 0-15 !*/
- uint8 feedback2; /* 0-7 UNUSED */
- uint8 attackrate2; /* 0-15 !*/
- uint8 sustainvol2; /* 0-15 !*/
- uint8 envelope2; /* t/f !*/
- uint8 decayrate2; /* 0-15 !*/
- uint8 releaserate2; /* 0-15 !*/
- uint8 volume2; /* 0-63 !*/
- uint8 ampmod2; /* t/f !*/
- uint8 vibrato2; /* t/f !*/
- uint8 keybdscale2; /* t/f !*/
- uint8 algorithm2; /* 0,1 UNUSED */
- uint8 waveform1; /* 0-3 !*/
- uint8 waveform2; /* 0-3 !*/
-};
-
-typedef unsigned char adlib_instr[12];
-
-extern adlib_instr adlib_sbi[96];
-
-/** Converts a raw SCI adlib instrument into the adlib register format. */
-void make_sbi(adlib_def *one, uint8 *buffer);
-
-} // End of namespace Sci
-
-#endif // SCI_SFX_ADLIB_H
Copied: scummvm/trunk/engines/sci/sfx/adlib_sbi.cpp (from rev 40352, scummvm/trunk/engines/sci/sfx/adlib.cpp)
===================================================================
--- scummvm/trunk/engines/sci/sfx/adlib_sbi.cpp (rev 0)
+++ scummvm/trunk/engines/sci/sfx/adlib_sbi.cpp 2009-05-06 11:00:24 UTC (rev 40353)
@@ -0,0 +1,74 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "sci/sfx/adlib.h"
+
+namespace Sci {
+
+adlib_instr adlib_sbi[96];
+
+void make_sbi(adlib_def *one, uint8 *buffer) {
+ memset(buffer, 0, sizeof(adlib_instr));
+
+#if 0
+ printf("%02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x ", one->keyscale1, one->freqmod1, one->feedback1, one->attackrate1, one->sustainvol1, one->envelope1, one->decayrate1, one->releaserate1, one->volume1, one->ampmod1, one->vibrato1, one->keybdscale1, one->algorithm1, one->waveform1);
+
+ printf(" %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x ", one->keyscale2, one->freqmod2, one->feedback2, one->attackrate2, one->sustainvol2, one->envelope2, one->decayrate2, one->releaserate2, one->volume2, one->ampmod2, one->vibrato2, one->keybdscale2, one->algorithm2, one->waveform2);
+
+ printf("\n");
+#endif
+
+ buffer[0] |= ((one->ampmod1 & 0x1) << 7);
+ buffer[0] |= ((one->vibrato1 & 0x1) << 6);
+ buffer[0] |= ((one->envelope1 & 0x1) << 5);
+ buffer[0] |= ((one->keybdscale1 & 0x1) << 4);
+ buffer[0] |= (one->freqmod1 & 0xf);
+ buffer[1] |= ((one->ampmod2 & 0x1) << 7);
+ buffer[1] |= ((one->vibrato2 & 0x1) << 6);
+ buffer[1] |= ((one->envelope2 & 0x1) << 5);
+ buffer[1] |= ((one->keybdscale2 & 0x1) << 4);
+ buffer[1] |= (one->freqmod2 & 0xf);
+ buffer[2] |= ((one->keyscale1 & 0x3) << 6);
+ buffer[2] |= (one->volume1 & 0x3f);
+ buffer[3] |= ((one->keyscale2 & 0x3) << 6);
+ buffer[3] |= (one->volume2 & 0x3f);
+ buffer[4] |= ((one->attackrate1 & 0xf) << 4);
+ buffer[4] |= (one->decayrate1 & 0xf);
+ buffer[5] |= ((one->attackrate2 & 0xf) << 4);
+ buffer[5] |= (one->decayrate2 & 0xf);
+ buffer[6] |= ((one->sustainvol1 & 0xf) << 4);
+ buffer[6] |= (one->releaserate1 & 0xf);
+ buffer[7] |= ((one->sustainvol2 & 0xf) << 4);
+ buffer[7] |= (one->releaserate2 & 0xf);
+ buffer[8] |= (one->waveform1 & 0x3);
+ buffer[9] |= (one->waveform2 & 0x3);
+
+ buffer[10] |= ((one->feedback1 & 0x7) << 1);
+ buffer[10] |= (1 - (one->algorithm1 & 0x1));
+
+ return;
+}
+
+} // End of namespace Sci
Copied: scummvm/trunk/engines/sci/sfx/adlib_sbi.h (from rev 40352, scummvm/trunk/engines/sci/sfx/adlib.h)
===================================================================
--- scummvm/trunk/engines/sci/sfx/adlib_sbi.h (rev 0)
+++ scummvm/trunk/engines/sci/sfx/adlib_sbi.h 2009-05-06 11:00:24 UTC (rev 40353)
@@ -0,0 +1,76 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+
+#ifndef SCI_SFX_ADLIB_H
+#define SCI_SFX_ADLIB_H
+
+#include "sci/tools.h"
+
+namespace Sci {
+
+#define ADLIB_VOICES 9
+
+struct adlib_def {
+ uint8 keyscale1; /* 0-3 !*/
+ uint8 freqmod1; /* 0-15 !*/
+ uint8 feedback1; /* 0-7 !*/
+ uint8 attackrate1; /* 0-15 !*/
+ uint8 sustainvol1; /* 0-15 !*/
+ uint8 envelope1; /* t/f !*/
+ uint8 decayrate1; /* 0-15 !*/
+ uint8 releaserate1; /* 0-15 !*/
+ uint8 volume1; /* 0-63 !*/
+ uint8 ampmod1; /* t/f !*/
+ uint8 vibrato1; /* t/f !*/
+ uint8 keybdscale1; /* t/f !*/
+ uint8 algorithm1; /* 0,1 REVERSED */
+ uint8 keyscale2; /* 0-3 !*/
+ uint8 freqmod2; /* 0-15 !*/
+ uint8 feedback2; /* 0-7 UNUSED */
+ uint8 attackrate2; /* 0-15 !*/
+ uint8 sustainvol2; /* 0-15 !*/
+ uint8 envelope2; /* t/f !*/
+ uint8 decayrate2; /* 0-15 !*/
+ uint8 releaserate2; /* 0-15 !*/
+ uint8 volume2; /* 0-63 !*/
+ uint8 ampmod2; /* t/f !*/
+ uint8 vibrato2; /* t/f !*/
+ uint8 keybdscale2; /* t/f !*/
+ uint8 algorithm2; /* 0,1 UNUSED */
+ uint8 waveform1; /* 0-3 !*/
+ uint8 waveform2; /* 0-3 !*/
+};
+
+typedef unsigned char adlib_instr[12];
+
+extern adlib_instr adlib_sbi[96];
+
+/** Converts a raw SCI adlib instrument into the adlib register format. */
+void make_sbi(adlib_def *one, uint8 *buffer);
+
+} // End of namespace Sci
+
+#endif // SCI_SFX_ADLIB_H
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list