Skip to content

Commit d5ead6c

Browse files
WohlstandWohlstand
committed
Updated libOPNMIDI
1 parent fa6972b commit d5ead6c

18 files changed

Lines changed: 5692 additions & 5690 deletions

‎OPNMIDI-Player/src/main/cpp/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,10 +176,10 @@ option(WITH_XMI_SUPPORT "Build with support for AIL XMI files)" ON)
176176
option(USE_MAME_EMULATOR "Use MAME YM2612 emulator (for most of hardware)" ON)
177177
option(USE_GENS_EMULATOR "Use GENS 2.10 emulator (fastest, very outdated, inaccurate)" ON)
178178
option(USE_NUKED_EMULATOR "Use Nuked OPN2 emulator (most accurate, heavy)" ${DEFAULT_HEAVY_EMULATORS})
179-
option(USE_GX_EMULATOR "Use Genesis Plus GX emulator (experimental)" OFF)
179+
# option(USE_GX_EMULATOR "Use Genesis Plus GX emulator (experimental)" OFF)
180180
option(USE_NP2_EMULATOR "Use Neko Project II emulator" ON)
181181
option(USE_MAME_2608_EMULATOR "Use MAME YM2608 emulator" ON)
182-
option(USE_PMDWIN_EMULATOR "Use PMDWin emulator (experimental)" OFF)
182+
# option(USE_PMDWIN_EMULATOR "Use PMDWin emulator (experimental)" OFF)
183183
option(USE_VGM_FILE_DUMPER "Use VGM File Dumper (required to build the MIDI2VGM tool)" ON)
184184
if(COMPILER_SUPPORTS_CXX14)
185185
option(USE_YMFM_EMULATOR "Use YMFM emulator (requires C++14 support)" ON)

‎OPNMIDI-Player/src/main/cpp/src/chips/np2/fmgen_diag.h‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
#ifndef incl_diag_h
2-
#define incl_diag_h
3-
4-
#define LOG0(m) void (0)
5-
#define LOG1(m,a) void (0)
6-
#define LOG2(m,a,b) void (0)
7-
#define LOG3(m,a,b,c) void (0)
8-
#define LOG4(m,a,b,c,d) void (0)
9-
#define LOG5(m,a,b,c,d,e) void (0)
10-
#define LOG6(m,a,b,c,d,e,f) void (0)
11-
#define LOG7(m,a,b,c,d,e,f,g) void (0)
12-
#define LOG8(m,a,b,c,d,e,f,g,h) void (0)
13-
#define LOG9(m,a,b,c,d,e,f,g,h,i) void (0)
14-
15-
#endif // incl_diag_h
1+
#ifndef incl_diag_h
2+
#define incl_diag_h
3+
4+
#define LOG0(m) void (0)
5+
#define LOG1(m,a) void (0)
6+
#define LOG2(m,a,b) void (0)
7+
#define LOG3(m,a,b,c) void (0)
8+
#define LOG4(m,a,b,c,d) void (0)
9+
#define LOG5(m,a,b,c,d,e) void (0)
10+
#define LOG6(m,a,b,c,d,e,f) void (0)
11+
#define LOG7(m,a,b,c,d,e,f,g) void (0)
12+
#define LOG8(m,a,b,c,d,e,f,g,h) void (0)
13+
#define LOG9(m,a,b,c,d,e,f,g,h,i) void (0)
14+
15+
#endif // incl_diag_h

‎OPNMIDI-Player/src/main/cpp/src/chips/np2/fmgen_file.cpp‎

Lines changed: 177 additions & 177 deletions
Original file line numberDiff line numberDiff line change
@@ -1,177 +1,177 @@
1-
// $Id: file.cpp,v 1.6 1999/12/28 11:14:05 cisc Exp $
2-
3-
#include <stdio.h>
4-
#include "fmgen_types.h"
5-
#include "fmgen_headers.h"
6-
#include "fmgen_file.h"
7-
8-
// ---------------------------------------------------------------------------
9-
// 構築/消滅
10-
// ---------------------------------------------------------------------------
11-
12-
FileIO::FileIO()
13-
{
14-
flags = 0;
15-
}
16-
17-
FileIO::FileIO(const char* filename, uint flg)
18-
{
19-
flags = 0;
20-
Open(filename, flg);
21-
}
22-
23-
FileIO::~FileIO()
24-
{
25-
Close();
26-
}
27-
28-
// ---------------------------------------------------------------------------
29-
// ファイルを開く
30-
// ---------------------------------------------------------------------------
31-
32-
bool FileIO::Open(const char* filename, uint flg)
33-
{
34-
char mode[5] = "rwb";
35-
Close();
36-
37-
strncpy(path, filename, MAX_PATH - 1);
38-
39-
if(flg & readonly)
40-
strcpy(mode, "rb");
41-
else {
42-
if(flg & create)
43-
strcpy(mode, "rwb+");
44-
else
45-
strcpy(mode, "rwb");
46-
}
47-
48-
pfile = fopen(filename, mode);
49-
50-
flags = (flg & readonly) | (pfile == NULL ? 0 : open);
51-
52-
if (pfile == NULL)
53-
error = file_not_found;
54-
55-
SetLogicalOrigin(0);
56-
57-
return !(pfile == NULL);
58-
}
59-
60-
// ---------------------------------------------------------------------------
61-
// ファイルがない場合は作成
62-
// ---------------------------------------------------------------------------
63-
64-
bool FileIO::CreateNew(const char* filename)
65-
{
66-
uint flg = create;
67-
68-
return Open(filename, flg);
69-
}
70-
71-
// ---------------------------------------------------------------------------
72-
// ファイルを作り直す
73-
// ---------------------------------------------------------------------------
74-
75-
bool FileIO::Reopen(uint flg)
76-
{
77-
if (!(flags & open)) return false;
78-
if ((flags & readonly) && (flg & create)) return false;
79-
80-
if (flags & readonly) flg |= readonly;
81-
82-
return Open(path, flg);
83-
}
84-
85-
// ---------------------------------------------------------------------------
86-
// ファイルを閉じる
87-
// ---------------------------------------------------------------------------
88-
89-
void FileIO::Close()
90-
{
91-
if (GetFlags() & open)
92-
{
93-
fclose(pfile);
94-
flags = 0;
95-
}
96-
}
97-
98-
// ---------------------------------------------------------------------------
99-
// ファイル殻の読み出し
100-
// ---------------------------------------------------------------------------
101-
102-
int32 FileIO::Read(void* dest, int32 size)
103-
{
104-
if (!(GetFlags() & open))
105-
return -1;
106-
107-
size_t readsize;
108-
if (!(readsize = fread(dest, 1, static_cast<size_t>(size), pfile)))
109-
return -1;
110-
return size;
111-
}
112-
113-
// ---------------------------------------------------------------------------
114-
// ファイルへの書き出し
115-
// ---------------------------------------------------------------------------
116-
117-
int32 FileIO::Write(const void* dest, int32 size)
118-
{
119-
if (!(GetFlags() & open) || (GetFlags() & readonly))
120-
return -1;
121-
122-
size_t writtensize;
123-
if (!(writtensize = fwrite(dest, 1, static_cast<size_t>(size), pfile)))
124-
return -1;
125-
return static_cast<int32>(writtensize);
126-
}
127-
128-
// ---------------------------------------------------------------------------
129-
// ファイルをシーク
130-
// ---------------------------------------------------------------------------
131-
132-
bool FileIO::Seek(int32 pos, SeekMethod method)
133-
{
134-
if (!(GetFlags() & open))
135-
return false;
136-
137-
int origin;
138-
switch (method)
139-
{
140-
case begin:
141-
origin = SEEK_SET;
142-
break;
143-
case current:
144-
origin = SEEK_CUR;
145-
break;
146-
case end:
147-
origin = SEEK_END;
148-
break;
149-
default:
150-
return false;
151-
}
152-
153-
return (fseek(pfile, pos, origin) != 0);
154-
}
155-
156-
// ---------------------------------------------------------------------------
157-
// ファイルの位置を得る
158-
// ---------------------------------------------------------------------------
159-
160-
int32 FileIO::Tellp()
161-
{
162-
if (!(GetFlags() & open))
163-
return 0;
164-
165-
return static_cast<int32>(ftell(pfile));
166-
}
167-
168-
// ---------------------------------------------------------------------------
169-
// 現在の位置をファイルの終端とする
170-
// ---------------------------------------------------------------------------
171-
172-
bool FileIO::SetEndOfFile()
173-
{
174-
if (!(GetFlags() & open))
175-
return false;
176-
return Seek(0, end);
177-
}
1+
// $Id: file.cpp,v 1.6 1999/12/28 11:14:05 cisc Exp $
2+
3+
#include <stdio.h>
4+
#include "fmgen_types.h"
5+
#include "fmgen_headers.h"
6+
#include "fmgen_file.h"
7+
8+
// ---------------------------------------------------------------------------
9+
// 構築/消滅
10+
// ---------------------------------------------------------------------------
11+
12+
FileIO::FileIO()
13+
{
14+
flags = 0;
15+
}
16+
17+
FileIO::FileIO(const char* filename, uint flg)
18+
{
19+
flags = 0;
20+
Open(filename, flg);
21+
}
22+
23+
FileIO::~FileIO()
24+
{
25+
Close();
26+
}
27+
28+
// ---------------------------------------------------------------------------
29+
// ファイルを開く
30+
// ---------------------------------------------------------------------------
31+
32+
bool FileIO::Open(const char* filename, uint flg)
33+
{
34+
char mode[5] = "rwb";
35+
Close();
36+
37+
strncpy(path, filename, MAX_PATH - 1);
38+
39+
if(flg & readonly)
40+
strcpy(mode, "rb");
41+
else {
42+
if(flg & create)
43+
strcpy(mode, "rwb+");
44+
else
45+
strcpy(mode, "rwb");
46+
}
47+
48+
pfile = fopen(filename, mode);
49+
50+
flags = (flg & readonly) | (pfile == NULL ? 0 : open);
51+
52+
if (pfile == NULL)
53+
error = file_not_found;
54+
55+
SetLogicalOrigin(0);
56+
57+
return !(pfile == NULL);
58+
}
59+
60+
// ---------------------------------------------------------------------------
61+
// ファイルがない場合は作成
62+
// ---------------------------------------------------------------------------
63+
64+
bool FileIO::CreateNew(const char* filename)
65+
{
66+
uint flg = create;
67+
68+
return Open(filename, flg);
69+
}
70+
71+
// ---------------------------------------------------------------------------
72+
// ファイルを作り直す
73+
// ---------------------------------------------------------------------------
74+
75+
bool FileIO::Reopen(uint flg)
76+
{
77+
if (!(flags & open)) return false;
78+
if ((flags & readonly) && (flg & create)) return false;
79+
80+
if (flags & readonly) flg |= readonly;
81+
82+
return Open(path, flg);
83+
}
84+
85+
// ---------------------------------------------------------------------------
86+
// ファイルを閉じる
87+
// ---------------------------------------------------------------------------
88+
89+
void FileIO::Close()
90+
{
91+
if (GetFlags() & open)
92+
{
93+
fclose(pfile);
94+
flags = 0;
95+
}
96+
}
97+
98+
// ---------------------------------------------------------------------------
99+
// ファイル殻の読み出し
100+
// ---------------------------------------------------------------------------
101+
102+
int32 FileIO::Read(void* dest, int32 size)
103+
{
104+
if (!(GetFlags() & open))
105+
return -1;
106+
107+
size_t readsize;
108+
if (!(readsize = fread(dest, 1, static_cast<size_t>(size), pfile)))
109+
return -1;
110+
return size;
111+
}
112+
113+
// ---------------------------------------------------------------------------
114+
// ファイルへの書き出し
115+
// ---------------------------------------------------------------------------
116+
117+
int32 FileIO::Write(const void* dest, int32 size)
118+
{
119+
if (!(GetFlags() & open) || (GetFlags() & readonly))
120+
return -1;
121+
122+
size_t writtensize;
123+
if (!(writtensize = fwrite(dest, 1, static_cast<size_t>(size), pfile)))
124+
return -1;
125+
return static_cast<int32>(writtensize);
126+
}
127+
128+
// ---------------------------------------------------------------------------
129+
// ファイルをシーク
130+
// ---------------------------------------------------------------------------
131+
132+
bool FileIO::Seek(int32 pos, SeekMethod method)
133+
{
134+
if (!(GetFlags() & open))
135+
return false;
136+
137+
int origin;
138+
switch (method)
139+
{
140+
case begin:
141+
origin = SEEK_SET;
142+
break;
143+
case current:
144+
origin = SEEK_CUR;
145+
break;
146+
case end:
147+
origin = SEEK_END;
148+
break;
149+
default:
150+
return false;
151+
}
152+
153+
return (fseek(pfile, pos, origin) != 0);
154+
}
155+
156+
// ---------------------------------------------------------------------------
157+
// ファイルの位置を得る
158+
// ---------------------------------------------------------------------------
159+
160+
int32 FileIO::Tellp()
161+
{
162+
if (!(GetFlags() & open))
163+
return 0;
164+
165+
return static_cast<int32>(ftell(pfile));
166+
}
167+
168+
// ---------------------------------------------------------------------------
169+
// 現在の位置をファイルの終端とする
170+
// ---------------------------------------------------------------------------
171+
172+
bool FileIO::SetEndOfFile()
173+
{
174+
if (!(GetFlags() & open))
175+
return false;
176+
return Seek(0, end);
177+
}

0 commit comments

Comments
 (0)