CW Cyrix's Git Repository Mirror
Browse code

Various updates:

* Fix build with Visual Studio, updating projects to Visual Studio 2019 (as that is what I have installed).
* Changed C++ language standard to C++ 17.
* Add files for in_2sf's spu from Coda's recent commit.
* Add files for zlib now that it is being included as a submodule (removes the need for the zlib DLL as well).
* Remove common.props (due to the aforementioned zlib inclusion as well as the winamp headers also being in the project now).
* Minor NCSF file in the SSEQ player, the check for when to process tracks should've been >=, not >.

Naram Qashat authored on 2021/03/15 22:34:25
Showing 1 changed files
src/in_2sf/desmume/metaspu/metaspu.h
History View file @ 6311c58
... ... 
@@ -1,54 +1,54 @@
1 
-/*  Copyright 2009-2015 DeSmuME team
2 
-
3 
-	This file is free software: you can redistribute it and/or modify
4 
-	it under the terms of the GNU General Public License as published by
5 
-	the Free Software Foundation, either version 2 of the License, or
6 
-	(at your option) any later version.
7 
-
8 
-	This file is distributed in the hope that it will be useful,
9 
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
10 
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11 
-	GNU General Public License for more details.
12 
-
13 
-	You should have received a copy of the GNU General Public License
14 
-	along with the this software.  If not, see <http://www.gnu.org/licenses/>.
15 
-*/
16 
-
17 
-//-------------------------
18 
-//this file contains the METASPU system
19 
-//which is designed to handle the task of audio synchronization
20 
-//and is designed to be as portable between multiple emulators
21 
-//-------------------------
22 
-
23 
-
24 
-#ifndef _METASPU_H_
25 
-#define _METASPU_H_
26 
-
27 
-#include <algorithm>
28 
-
29 
-#include "types.h"
30 
-
31 
-class ISynchronizingAudioBuffer
32 
-{
33 
-public:
34 
-  virtual ~ISynchronizingAudioBuffer() {}
35 
-
36 
-	virtual void enqueue_samples(s16* buf, int samples_provided) = 0;
37 
-
38 
-	//returns the number of samples actually supplied, which may not match the number requested
39 
-	virtual int output_samples(s16* buf, int samples_requested) = 0;
40 
-};
41 
-
42 
-enum ESynchMode
43 
-{
44 
-	ESynchMode_Synchronous
45 
-};
46 
-
47 
-enum ESynchMethod
48 
-{
49 
-	ESynchMethod_0, //Null
50 
-};
51 
-
52 
-ISynchronizingAudioBuffer* metaspu_construct(ESynchMethod method);
53 
-
54 
-#endif
1 
+/*  Copyright 2009-2015 DeSmuME team
2 
+
3 
+	This file is free software: you can redistribute it and/or modify
4 
+	it under the terms of the GNU General Public License as published by
5 
+	the Free Software Foundation, either version 2 of the License, or
6 
+	(at your option) any later version.
7 
+
8 
+	This file is distributed in the hope that it will be useful,
9 
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
10 
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11 
+	GNU General Public License for more details.
12 
+
13 
+	You should have received a copy of the GNU General Public License
14 
+	along with the this software.  If not, see <http://www.gnu.org/licenses/>.
15 
+*/
16 
+
17 
+//-------------------------
18 
+//this file contains the METASPU system
19 
+//which is designed to handle the task of audio synchronization
20 
+//and is designed to be as portable between multiple emulators
21 
+//-------------------------
22 
+
23 
+
24 
+#ifndef _METASPU_H_
25 
+#define _METASPU_H_
26 
+
27 
+#include <algorithm>
28 
+
29 
+#include "../types.h"
30 
+
31 
+class ISynchronizingAudioBuffer
32 
+{
33 
+public:
34 
+  virtual ~ISynchronizingAudioBuffer() {}
35 
+
36 
+	virtual void enqueue_samples(s16* buf, int samples_provided) = 0;
37 
+
38 
+	//returns the number of samples actually supplied, which may not match the number requested
39 
+	virtual int output_samples(s16* buf, int samples_requested) = 0;
40 
+};
41 
+
42 
+enum ESynchMode
43 
+{
44 
+	ESynchMode_Synchronous
45 
+};
46 
+
47 
+enum ESynchMethod
48 
+{
49 
+	ESynchMethod_0, //Null
50 
+};
51 
+
52 
+ISynchronizingAudioBuffer* metaspu_construct(ESynchMethod method);
53 
+
54 
+#endif
Browse code

fix mingw build, clean up new warnings

Adam Higerd authored on 2021/02/11 17:42:05
Showing 1 changed files
src/in_2sf/desmume/metaspu/metaspu.h
History View file @ 08fa1c9
... ... 
@@ -31,6 +31,8 @@
31 31 
 class ISynchronizingAudioBuffer
32 32 
 {
33 33 
 public:
34 
+  virtual ~ISynchronizingAudioBuffer() {}
35 
+
34 36 
 	virtual void enqueue_samples(s16* buf, int samples_provided) = 0;
35 37
36 38 
 	//returns the number of samples actually supplied, which may not match the number requested
Browse code

update for C++17 compliance, update to latest 2sf, add WINE cross-compile makefiles

Adam Higerd authored on 2021/02/11 15:36:17
Showing 1 changed files
src/in_2sf/desmume/metaspu/metaspu.h
History View file @ 846d8df
... ... 
@@ -1,51 +1,52 @@
1 
-/*  Copyright 2009-2010 DeSmuME team
2 
-
3 
-	This file is free software: you can redistribute it and/or modify
4 
-	it under the terms of the GNU General Public License as published by
5 
-	the Free Software Foundation, either version 2 of the License, or
6 
-	(at your option) any later version.
7 
-
8 
-	This file is distributed in the hope that it will be useful,
9 
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
10 
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11 
-	GNU General Public License for more details.
12 
-
13 
-	You should have received a copy of the GNU General Public License
14 
-	along with the this software.  If not, see <http://www.gnu.org/licenses/>.
15 
-*/
16 
-
17 
-// -------------------------
18 
-// this file contains the METASPU system
19 
-// which is designed to handle the task of audio synchronization
20 
-// and is designed to be as portable between multiple emulators
21 
-// -------------------------
22 
-
23 
-#pragma once
24 
-
25 
-#include "../types.h"
26 
-
27 
-class ISynchronizingAudioBuffer
28 
-{
29 
-public:
30 
-	virtual ~ISynchronizingAudioBuffer() { }
31 
-
32 
-	virtual void enqueue_samples(int16_t *buf, int samples_provided) = 0;
33 
-
34 
-	// returns the number of samples actually supplied, which may not match the number requested
35 
-	virtual int output_samples(int16_t *buf, int samples_requested) = 0;
36 
-};
37 
-
38 
-enum ESynchMode
39 
-{
40 
-	ESynchMode_DualSynchAsynch,
41 
-	ESynchMode_Synchronous
42 
-};
43 
-
44 
-enum ESynchMethod
45 
-{
46 
-	ESynchMethod_N, // nitsuja's
47 
-	ESynchMethod_Z, // zero's
48 
-	ESynchMethod_P // PCSX2 spu2-x
49 
-};
50 
-
51 
-ISynchronizingAudioBuffer *metaspu_construct(ESynchMethod method);
1 
+/*  Copyright 2009-2015 DeSmuME team
2 
+
3 
+	This file is free software: you can redistribute it and/or modify
4 
+	it under the terms of the GNU General Public License as published by
5 
+	the Free Software Foundation, either version 2 of the License, or
6 
+	(at your option) any later version.
7 
+
8 
+	This file is distributed in the hope that it will be useful,
9 
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
10 
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11 
+	GNU General Public License for more details.
12 
+
13 
+	You should have received a copy of the GNU General Public License
14 
+	along with the this software.  If not, see <http://www.gnu.org/licenses/>.
15 
+*/
16 
+
17 
+//-------------------------
18 
+//this file contains the METASPU system
19 
+//which is designed to handle the task of audio synchronization
20 
+//and is designed to be as portable between multiple emulators
21 
+//-------------------------
22 
+
23 
+
24 
+#ifndef _METASPU_H_
25 
+#define _METASPU_H_
26 
+
27 
+#include <algorithm>
28 
+
29 
+#include "types.h"
30 
+
31 
+class ISynchronizingAudioBuffer
32 
+{
33 
+public:
34 
+	virtual void enqueue_samples(s16* buf, int samples_provided) = 0;
35 
+
36 
+	//returns the number of samples actually supplied, which may not match the number requested
37 
+	virtual int output_samples(s16* buf, int samples_requested) = 0;
38 
+};
39 
+
40 
+enum ESynchMode
41 
+{
42 
+	ESynchMode_Synchronous
43 
+};
44 
+
45 
+enum ESynchMethod
46 
+{
47 
+	ESynchMethod_0, //Null
48 
+};
49 
+
50 
+ISynchronizingAudioBuffer* metaspu_construct(ESynchMethod method);
51 
+
52 
+#endif
Browse code

* Small Makefile changes.

* Removed a couple files that were not being used.
* Cleanups found with clang's -Weverything (and shutting it up about a
lot of things that were ridiculous, as well as ignoring some of the
warnings still coming up).

Naram Qashat authored on 2014/09/25 12:28:21
Showing 1 changed files
src/in_2sf/desmume/metaspu/metaspu.h
History View file @ ec120fe
... ... 
@@ -27,6 +27,8 @@
27 27 
 class ISynchronizingAudioBuffer
28 28 
 {
29 29 
 public:
30 
+	virtual ~ISynchronizingAudioBuffer() { }
31 
+
30 32 
 	virtual void enqueue_samples(int16_t *buf, int samples_provided) = 0;
31 33
32 34 
 	// returns the number of samples actually supplied, which may not match the number requested
Browse code

Use #pragma once instead of include guards.

Naram Qashat authored on 2014/09/08 14:47:36
Showing 1 changed files
src/in_2sf/desmume/metaspu/metaspu.h
History View file @ b6add6e
... ... 
@@ -20,8 +20,7 @@
20 20 
 // and is designed to be as portable between multiple emulators
21 21 
 // -------------------------
22 22
23 
-#ifndef _METASPU_H_
24 
-#define _METASPU_H_
23 
+#pragma once
25 24
26 25 
 #include "../types.h"
27 26
... ... 
@@ -48,5 +47,3 @@ enum ESynchMethod
48 47 
 };
49 48
50 49 
 ISynchronizingAudioBuffer *metaspu_construct(ESynchMethod method);
51 
-
52 
-#endif
Browse code

Updating in_2sf to use a newish version of DeSmuME, 0.9.9 from SVN. Somewhat cleaned up as well, but not everything because it's a pain in the ass.

Naram Qashat authored on 2013/04/18 17:22:55
Showing 1 changed files
src/in_2sf/desmume/metaspu/metaspu.h
History View file @ dfb7763
... ... 
@@ -14,27 +14,16 @@
14 14 
 	along with the this software.  If not, see <http://www.gnu.org/licenses/>.
15 15 
 */
16 16
17 
-//-------------------------
18 
-//this file contains the METASPU system
19 
-//which is designed to handle the task of audio synchronization
20 
-//and is designed to be as portable between multiple emulators
21 
-//-------------------------
17 
+// -------------------------
18 
+// this file contains the METASPU system
19 
+// which is designed to handle the task of audio synchronization
20 
+// and is designed to be as portable between multiple emulators
21 
+// -------------------------
22 22
23 23 
 #ifndef _METASPU_H_
24 24 
 #define _METASPU_H_
25 25
26 
-#include <algorithm>
27 
-#include <cmath>
28 
-
29 
-/*template<typename T> static inline void Clampify(T &src, T min, T max)
30 
-{
31 
-	src = std::min(std::max(src, min), max);
32 
-}*/
33 
-
34 
-/*template<typename T> static inline T GetClamped(T src, T min, T max)
35 
-{
36 
-	return std::min(std::max( src, min ), max);
37 
-}*/
26 
+#include "../types.h"
38 27
39 28 
 class ISynchronizingAudioBuffer
40 29 
 {
... ... 
@@ -53,9 +42,9 @@ enum ESynchMode
53 42
54 43 
 enum ESynchMethod
55 44 
 {
56 
-	ESynchMethod_N, //nitsuja's
57 
-	ESynchMethod_Z, //zero's
58 
-	ESynchMethod_P //PCSX2 spu2-x
45 
+	ESynchMethod_N, // nitsuja's
46 
+	ESynchMethod_Z, // zero's
47 
+	ESynchMethod_P // PCSX2 spu2-x
59 48 
 };
60 49
61 50 
 ISynchronizingAudioBuffer *metaspu_construct(ESynchMethod method);
Browse code

Import actual code.

Naram Qashat authored on 2013/03/26 02:41:19
Showing 1 changed files
src/in_2sf/desmume/metaspu/metaspu.h
History View file @ bc076aa
1 1 
new file mode 100644
... ... 
@@ -0,0 +1,63 @@
1 
+/*  Copyright 2009-2010 DeSmuME team
2 
+
3 
+	This file is free software: you can redistribute it and/or modify
4 
+	it under the terms of the GNU General Public License as published by
5 
+	the Free Software Foundation, either version 2 of the License, or
6 
+	(at your option) any later version.
7 
+
8 
+	This file is distributed in the hope that it will be useful,
9 
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
10 
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11 
+	GNU General Public License for more details.
12 
+
13 
+	You should have received a copy of the GNU General Public License
14 
+	along with the this software.  If not, see <http://www.gnu.org/licenses/>.
15 
+*/
16 
+
17 
+//-------------------------
18 
+//this file contains the METASPU system
19 
+//which is designed to handle the task of audio synchronization
20 
+//and is designed to be as portable between multiple emulators
21 
+//-------------------------
22 
+
23 
+#ifndef _METASPU_H_
24 
+#define _METASPU_H_
25 
+
26 
+#include <algorithm>
27 
+#include <cmath>
28 
+
29 
+/*template<typename T> static inline void Clampify(T &src, T min, T max)
30 
+{
31 
+	src = std::min(std::max(src, min), max);
32 
+}*/
33 
+
34 
+/*template<typename T> static inline T GetClamped(T src, T min, T max)
35 
+{
36 
+	return std::min(std::max( src, min ), max);
37 
+}*/
38 
+
39 
+class ISynchronizingAudioBuffer
40 
+{
41 
+public:
42 
+	virtual void enqueue_samples(int16_t *buf, int samples_provided) = 0;
43 
+
44 
+	// returns the number of samples actually supplied, which may not match the number requested
45 
+	virtual int output_samples(int16_t *buf, int samples_requested) = 0;
46 
+};
47 
+
48 
+enum ESynchMode
49 
+{
50 
+	ESynchMode_DualSynchAsynch,
51 
+	ESynchMode_Synchronous
52 
+};
53 
+
54 
+enum ESynchMethod
55 
+{
56 
+	ESynchMethod_N, //nitsuja's
57 
+	ESynchMethod_Z, //zero's
58 
+	ESynchMethod_P //PCSX2 spu2-x
59 
+};
60 
+
61 
+ISynchronizingAudioBuffer *metaspu_construct(ESynchMethod method);
62 
+
63 
+#endif