Merge branch 'master' of https://github.com/tildearrow/furnace into ay_divider
* 'master' of https://github.com/tildearrow/furnace: dev92 - GUI: customizable channel collapsing! GUI: more improvements to instrument loading GUI: implement instrument load replace NES: fix duty effect not working at all GUI: part 2 of previous commit GUI: only use edit color when pat view is focused GUI: fix more issues here's the new OPLL default instrument OPL: fix channel muting - PLEASE READ! OPLL: fix compatible drum mode the final part of extra FM effects implement extra FM effects (OPLL and OPL) update to-do list prepare for possible .ftm import implement extra FM effects (OPN, OPM and OPZ) # Conflicts: # src/engine/engine.h
This commit is contained in:
cam900
commit
9109d2c64f
3
.gitmodules
vendored
3
.gitmodules
vendored
|
|
@ -19,6 +19,3 @@
|
||||||
[submodule "extern/adpcm"]
|
[submodule "extern/adpcm"]
|
||||||
path = extern/adpcm
|
path = extern/adpcm
|
||||||
url = https://github.com/superctr/adpcm
|
url = https://github.com/superctr/adpcm
|
||||||
[submodule "extern/Nuked-OPL3"]
|
|
||||||
path = extern/Nuked-OPL3
|
|
||||||
url = https://github.com/nukeykt/Nuked-OPL3.git
|
|
||||||
|
|
|
||||||
|
|
@ -237,7 +237,7 @@ extern/adpcm/ymz_codec.c
|
||||||
extern/Nuked-OPN2/ym3438.c
|
extern/Nuked-OPN2/ym3438.c
|
||||||
extern/opm/opm.c
|
extern/opm/opm.c
|
||||||
extern/Nuked-OPLL/opll.c
|
extern/Nuked-OPLL/opll.c
|
||||||
extern/Nuked-OPL3/opl3.c
|
extern/opl/opl3.c
|
||||||
src/engine/platform/sound/sn76496.cpp
|
src/engine/platform/sound/sn76496.cpp
|
||||||
src/engine/platform/sound/ay8910.cpp
|
src/engine/platform/sound/ay8910.cpp
|
||||||
src/engine/platform/sound/saa1099.cpp
|
src/engine/platform/sound/saa1099.cpp
|
||||||
|
|
|
||||||
5
TODO.md
5
TODO.md
|
|
@ -12,7 +12,6 @@
|
||||||
- SCC/SCC+ system
|
- SCC/SCC+ system
|
||||||
- maybe YMU759 ADPCM channel
|
- maybe YMU759 ADPCM channel
|
||||||
- ADPCM chips
|
- ADPCM chips
|
||||||
- more effects for FM param control
|
|
||||||
- Game Boy envelope macro/sequence
|
- Game Boy envelope macro/sequence
|
||||||
- option to display chip names instead of "multi-system" on title bar
|
- option to display chip names instead of "multi-system" on title bar
|
||||||
- rewrite the system name detection function anyway
|
- rewrite the system name detection function anyway
|
||||||
|
|
@ -29,4 +28,6 @@
|
||||||
- add ability to select a column by double clicking
|
- add ability to select a column by double clicking
|
||||||
- add ability to move selection by dragging
|
- add ability to move selection by dragging
|
||||||
- Apply button in settings
|
- Apply button in settings
|
||||||
- find and replace
|
- find and replace
|
||||||
|
- finish wave synth
|
||||||
|
- make compact mode multi-state (note, note/ins, note/ins/vol and note/ins/vol/effects)
|
||||||
1
extern/Nuked-OPL3
vendored
1
extern/Nuked-OPL3
vendored
|
|
@ -1 +0,0 @@
|
||||||
Subproject commit bb5c8d08a85779c42b75c79d7b84f365a1b93b66
|
|
||||||
12
extern/opl/.github/FUNDING.yml
vendored
Normal file
12
extern/opl/.github/FUNDING.yml
vendored
Normal file
|
|
@ -0,0 +1,12 @@
|
||||||
|
# These are supported funding model platforms
|
||||||
|
|
||||||
|
github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
|
||||||
|
patreon: nukeykt # Replace with a single Patreon username
|
||||||
|
open_collective: # Replace with a single Open Collective username
|
||||||
|
ko_fi: # Replace with a single Ko-fi username
|
||||||
|
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
|
||||||
|
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
|
||||||
|
liberapay: # Replace with a single Liberapay username
|
||||||
|
issuehunt: # Replace with a single IssueHunt username
|
||||||
|
otechie: # Replace with a single Otechie username
|
||||||
|
custom: ['https://www.buymeacoffee.com/nukeykt', 'https://paypal.me/nukeykt'] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
|
||||||
504
extern/opl/LICENSE
vendored
Normal file
504
extern/opl/LICENSE
vendored
Normal file
|
|
@ -0,0 +1,504 @@
|
||||||
|
GNU LESSER GENERAL PUBLIC LICENSE
|
||||||
|
Version 2.1, February 1999
|
||||||
|
|
||||||
|
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
|
||||||
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
[This is the first released version of the Lesser GPL. It also counts
|
||||||
|
as the successor of the GNU Library Public License, version 2, hence
|
||||||
|
the version number 2.1.]
|
||||||
|
|
||||||
|
Preamble
|
||||||
|
|
||||||
|
The licenses for most software are designed to take away your
|
||||||
|
freedom to share and change it. By contrast, the GNU General Public
|
||||||
|
Licenses are intended to guarantee your freedom to share and change
|
||||||
|
free software--to make sure the software is free for all its users.
|
||||||
|
|
||||||
|
This license, the Lesser General Public License, applies to some
|
||||||
|
specially designated software packages--typically libraries--of the
|
||||||
|
Free Software Foundation and other authors who decide to use it. You
|
||||||
|
can use it too, but we suggest you first think carefully about whether
|
||||||
|
this license or the ordinary General Public License is the better
|
||||||
|
strategy to use in any particular case, based on the explanations below.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom of use,
|
||||||
|
not price. Our General Public Licenses are designed to make sure that
|
||||||
|
you have the freedom to distribute copies of free software (and charge
|
||||||
|
for this service if you wish); that you receive source code or can get
|
||||||
|
it if you want it; that you can change the software and use pieces of
|
||||||
|
it in new free programs; and that you are informed that you can do
|
||||||
|
these things.
|
||||||
|
|
||||||
|
To protect your rights, we need to make restrictions that forbid
|
||||||
|
distributors to deny you these rights or to ask you to surrender these
|
||||||
|
rights. These restrictions translate to certain responsibilities for
|
||||||
|
you if you distribute copies of the library or if you modify it.
|
||||||
|
|
||||||
|
For example, if you distribute copies of the library, whether gratis
|
||||||
|
or for a fee, you must give the recipients all the rights that we gave
|
||||||
|
you. You must make sure that they, too, receive or can get the source
|
||||||
|
code. If you link other code with the library, you must provide
|
||||||
|
complete object files to the recipients, so that they can relink them
|
||||||
|
with the library after making changes to the library and recompiling
|
||||||
|
it. And you must show them these terms so they know their rights.
|
||||||
|
|
||||||
|
We protect your rights with a two-step method: (1) we copyright the
|
||||||
|
library, and (2) we offer you this license, which gives you legal
|
||||||
|
permission to copy, distribute and/or modify the library.
|
||||||
|
|
||||||
|
To protect each distributor, we want to make it very clear that
|
||||||
|
there is no warranty for the free library. Also, if the library is
|
||||||
|
modified by someone else and passed on, the recipients should know
|
||||||
|
that what they have is not the original version, so that the original
|
||||||
|
author's reputation will not be affected by problems that might be
|
||||||
|
introduced by others.
|
||||||
|
|
||||||
|
Finally, software patents pose a constant threat to the existence of
|
||||||
|
any free program. We wish to make sure that a company cannot
|
||||||
|
effectively restrict the users of a free program by obtaining a
|
||||||
|
restrictive license from a patent holder. Therefore, we insist that
|
||||||
|
any patent license obtained for a version of the library must be
|
||||||
|
consistent with the full freedom of use specified in this license.
|
||||||
|
|
||||||
|
Most GNU software, including some libraries, is covered by the
|
||||||
|
ordinary GNU General Public License. This license, the GNU Lesser
|
||||||
|
General Public License, applies to certain designated libraries, and
|
||||||
|
is quite different from the ordinary General Public License. We use
|
||||||
|
this license for certain libraries in order to permit linking those
|
||||||
|
libraries into non-free programs.
|
||||||
|
|
||||||
|
When a program is linked with a library, whether statically or using
|
||||||
|
a shared library, the combination of the two is legally speaking a
|
||||||
|
combined work, a derivative of the original library. The ordinary
|
||||||
|
General Public License therefore permits such linking only if the
|
||||||
|
entire combination fits its criteria of freedom. The Lesser General
|
||||||
|
Public License permits more lax criteria for linking other code with
|
||||||
|
the library.
|
||||||
|
|
||||||
|
We call this license the "Lesser" General Public License because it
|
||||||
|
does Less to protect the user's freedom than the ordinary General
|
||||||
|
Public License. It also provides other free software developers Less
|
||||||
|
of an advantage over competing non-free programs. These disadvantages
|
||||||
|
are the reason we use the ordinary General Public License for many
|
||||||
|
libraries. However, the Lesser license provides advantages in certain
|
||||||
|
special circumstances.
|
||||||
|
|
||||||
|
For example, on rare occasions, there may be a special need to
|
||||||
|
encourage the widest possible use of a certain library, so that it becomes
|
||||||
|
a de-facto standard. To achieve this, non-free programs must be
|
||||||
|
allowed to use the library. A more frequent case is that a free
|
||||||
|
library does the same job as widely used non-free libraries. In this
|
||||||
|
case, there is little to gain by limiting the free library to free
|
||||||
|
software only, so we use the Lesser General Public License.
|
||||||
|
|
||||||
|
In other cases, permission to use a particular library in non-free
|
||||||
|
programs enables a greater number of people to use a large body of
|
||||||
|
free software. For example, permission to use the GNU C Library in
|
||||||
|
non-free programs enables many more people to use the whole GNU
|
||||||
|
operating system, as well as its variant, the GNU/Linux operating
|
||||||
|
system.
|
||||||
|
|
||||||
|
Although the Lesser General Public License is Less protective of the
|
||||||
|
users' freedom, it does ensure that the user of a program that is
|
||||||
|
linked with the Library has the freedom and the wherewithal to run
|
||||||
|
that program using a modified version of the Library.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow. Pay close attention to the difference between a
|
||||||
|
"work based on the library" and a "work that uses the library". The
|
||||||
|
former contains code derived from the library, whereas the latter must
|
||||||
|
be combined with the library in order to run.
|
||||||
|
|
||||||
|
GNU LESSER GENERAL PUBLIC LICENSE
|
||||||
|
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||||
|
|
||||||
|
0. This License Agreement applies to any software library or other
|
||||||
|
program which contains a notice placed by the copyright holder or
|
||||||
|
other authorized party saying it may be distributed under the terms of
|
||||||
|
this Lesser General Public License (also called "this License").
|
||||||
|
Each licensee is addressed as "you".
|
||||||
|
|
||||||
|
A "library" means a collection of software functions and/or data
|
||||||
|
prepared so as to be conveniently linked with application programs
|
||||||
|
(which use some of those functions and data) to form executables.
|
||||||
|
|
||||||
|
The "Library", below, refers to any such software library or work
|
||||||
|
which has been distributed under these terms. A "work based on the
|
||||||
|
Library" means either the Library or any derivative work under
|
||||||
|
copyright law: that is to say, a work containing the Library or a
|
||||||
|
portion of it, either verbatim or with modifications and/or translated
|
||||||
|
straightforwardly into another language. (Hereinafter, translation is
|
||||||
|
included without limitation in the term "modification".)
|
||||||
|
|
||||||
|
"Source code" for a work means the preferred form of the work for
|
||||||
|
making modifications to it. For a library, complete source code means
|
||||||
|
all the source code for all modules it contains, plus any associated
|
||||||
|
interface definition files, plus the scripts used to control compilation
|
||||||
|
and installation of the library.
|
||||||
|
|
||||||
|
Activities other than copying, distribution and modification are not
|
||||||
|
covered by this License; they are outside its scope. The act of
|
||||||
|
running a program using the Library is not restricted, and output from
|
||||||
|
such a program is covered only if its contents constitute a work based
|
||||||
|
on the Library (independent of the use of the Library in a tool for
|
||||||
|
writing it). Whether that is true depends on what the Library does
|
||||||
|
and what the program that uses the Library does.
|
||||||
|
|
||||||
|
1. You may copy and distribute verbatim copies of the Library's
|
||||||
|
complete source code as you receive it, in any medium, provided that
|
||||||
|
you conspicuously and appropriately publish on each copy an
|
||||||
|
appropriate copyright notice and disclaimer of warranty; keep intact
|
||||||
|
all the notices that refer to this License and to the absence of any
|
||||||
|
warranty; and distribute a copy of this License along with the
|
||||||
|
Library.
|
||||||
|
|
||||||
|
You may charge a fee for the physical act of transferring a copy,
|
||||||
|
and you may at your option offer warranty protection in exchange for a
|
||||||
|
fee.
|
||||||
|
|
||||||
|
2. You may modify your copy or copies of the Library or any portion
|
||||||
|
of it, thus forming a work based on the Library, and copy and
|
||||||
|
distribute such modifications or work under the terms of Section 1
|
||||||
|
above, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) The modified work must itself be a software library.
|
||||||
|
|
||||||
|
b) You must cause the files modified to carry prominent notices
|
||||||
|
stating that you changed the files and the date of any change.
|
||||||
|
|
||||||
|
c) You must cause the whole of the work to be licensed at no
|
||||||
|
charge to all third parties under the terms of this License.
|
||||||
|
|
||||||
|
d) If a facility in the modified Library refers to a function or a
|
||||||
|
table of data to be supplied by an application program that uses
|
||||||
|
the facility, other than as an argument passed when the facility
|
||||||
|
is invoked, then you must make a good faith effort to ensure that,
|
||||||
|
in the event an application does not supply such function or
|
||||||
|
table, the facility still operates, and performs whatever part of
|
||||||
|
its purpose remains meaningful.
|
||||||
|
|
||||||
|
(For example, a function in a library to compute square roots has
|
||||||
|
a purpose that is entirely well-defined independent of the
|
||||||
|
application. Therefore, Subsection 2d requires that any
|
||||||
|
application-supplied function or table used by this function must
|
||||||
|
be optional: if the application does not supply it, the square
|
||||||
|
root function must still compute square roots.)
|
||||||
|
|
||||||
|
These requirements apply to the modified work as a whole. If
|
||||||
|
identifiable sections of that work are not derived from the Library,
|
||||||
|
and can be reasonably considered independent and separate works in
|
||||||
|
themselves, then this License, and its terms, do not apply to those
|
||||||
|
sections when you distribute them as separate works. But when you
|
||||||
|
distribute the same sections as part of a whole which is a work based
|
||||||
|
on the Library, the distribution of the whole must be on the terms of
|
||||||
|
this License, whose permissions for other licensees extend to the
|
||||||
|
entire whole, and thus to each and every part regardless of who wrote
|
||||||
|
it.
|
||||||
|
|
||||||
|
Thus, it is not the intent of this section to claim rights or contest
|
||||||
|
your rights to work written entirely by you; rather, the intent is to
|
||||||
|
exercise the right to control the distribution of derivative or
|
||||||
|
collective works based on the Library.
|
||||||
|
|
||||||
|
In addition, mere aggregation of another work not based on the Library
|
||||||
|
with the Library (or with a work based on the Library) on a volume of
|
||||||
|
a storage or distribution medium does not bring the other work under
|
||||||
|
the scope of this License.
|
||||||
|
|
||||||
|
3. You may opt to apply the terms of the ordinary GNU General Public
|
||||||
|
License instead of this License to a given copy of the Library. To do
|
||||||
|
this, you must alter all the notices that refer to this License, so
|
||||||
|
that they refer to the ordinary GNU General Public License, version 2,
|
||||||
|
instead of to this License. (If a newer version than version 2 of the
|
||||||
|
ordinary GNU General Public License has appeared, then you can specify
|
||||||
|
that version instead if you wish.) Do not make any other change in
|
||||||
|
these notices.
|
||||||
|
|
||||||
|
Once this change is made in a given copy, it is irreversible for
|
||||||
|
that copy, so the ordinary GNU General Public License applies to all
|
||||||
|
subsequent copies and derivative works made from that copy.
|
||||||
|
|
||||||
|
This option is useful when you wish to copy part of the code of
|
||||||
|
the Library into a program that is not a library.
|
||||||
|
|
||||||
|
4. You may copy and distribute the Library (or a portion or
|
||||||
|
derivative of it, under Section 2) in object code or executable form
|
||||||
|
under the terms of Sections 1 and 2 above provided that you accompany
|
||||||
|
it with the complete corresponding machine-readable source code, which
|
||||||
|
must be distributed under the terms of Sections 1 and 2 above on a
|
||||||
|
medium customarily used for software interchange.
|
||||||
|
|
||||||
|
If distribution of object code is made by offering access to copy
|
||||||
|
from a designated place, then offering equivalent access to copy the
|
||||||
|
source code from the same place satisfies the requirement to
|
||||||
|
distribute the source code, even though third parties are not
|
||||||
|
compelled to copy the source along with the object code.
|
||||||
|
|
||||||
|
5. A program that contains no derivative of any portion of the
|
||||||
|
Library, but is designed to work with the Library by being compiled or
|
||||||
|
linked with it, is called a "work that uses the Library". Such a
|
||||||
|
work, in isolation, is not a derivative work of the Library, and
|
||||||
|
therefore falls outside the scope of this License.
|
||||||
|
|
||||||
|
However, linking a "work that uses the Library" with the Library
|
||||||
|
creates an executable that is a derivative of the Library (because it
|
||||||
|
contains portions of the Library), rather than a "work that uses the
|
||||||
|
library". The executable is therefore covered by this License.
|
||||||
|
Section 6 states terms for distribution of such executables.
|
||||||
|
|
||||||
|
When a "work that uses the Library" uses material from a header file
|
||||||
|
that is part of the Library, the object code for the work may be a
|
||||||
|
derivative work of the Library even though the source code is not.
|
||||||
|
Whether this is true is especially significant if the work can be
|
||||||
|
linked without the Library, or if the work is itself a library. The
|
||||||
|
threshold for this to be true is not precisely defined by law.
|
||||||
|
|
||||||
|
If such an object file uses only numerical parameters, data
|
||||||
|
structure layouts and accessors, and small macros and small inline
|
||||||
|
functions (ten lines or less in length), then the use of the object
|
||||||
|
file is unrestricted, regardless of whether it is legally a derivative
|
||||||
|
work. (Executables containing this object code plus portions of the
|
||||||
|
Library will still fall under Section 6.)
|
||||||
|
|
||||||
|
Otherwise, if the work is a derivative of the Library, you may
|
||||||
|
distribute the object code for the work under the terms of Section 6.
|
||||||
|
Any executables containing that work also fall under Section 6,
|
||||||
|
whether or not they are linked directly with the Library itself.
|
||||||
|
|
||||||
|
6. As an exception to the Sections above, you may also combine or
|
||||||
|
link a "work that uses the Library" with the Library to produce a
|
||||||
|
work containing portions of the Library, and distribute that work
|
||||||
|
under terms of your choice, provided that the terms permit
|
||||||
|
modification of the work for the customer's own use and reverse
|
||||||
|
engineering for debugging such modifications.
|
||||||
|
|
||||||
|
You must give prominent notice with each copy of the work that the
|
||||||
|
Library is used in it and that the Library and its use are covered by
|
||||||
|
this License. You must supply a copy of this License. If the work
|
||||||
|
during execution displays copyright notices, you must include the
|
||||||
|
copyright notice for the Library among them, as well as a reference
|
||||||
|
directing the user to the copy of this License. Also, you must do one
|
||||||
|
of these things:
|
||||||
|
|
||||||
|
a) Accompany the work with the complete corresponding
|
||||||
|
machine-readable source code for the Library including whatever
|
||||||
|
changes were used in the work (which must be distributed under
|
||||||
|
Sections 1 and 2 above); and, if the work is an executable linked
|
||||||
|
with the Library, with the complete machine-readable "work that
|
||||||
|
uses the Library", as object code and/or source code, so that the
|
||||||
|
user can modify the Library and then relink to produce a modified
|
||||||
|
executable containing the modified Library. (It is understood
|
||||||
|
that the user who changes the contents of definitions files in the
|
||||||
|
Library will not necessarily be able to recompile the application
|
||||||
|
to use the modified definitions.)
|
||||||
|
|
||||||
|
b) Use a suitable shared library mechanism for linking with the
|
||||||
|
Library. A suitable mechanism is one that (1) uses at run time a
|
||||||
|
copy of the library already present on the user's computer system,
|
||||||
|
rather than copying library functions into the executable, and (2)
|
||||||
|
will operate properly with a modified version of the library, if
|
||||||
|
the user installs one, as long as the modified version is
|
||||||
|
interface-compatible with the version that the work was made with.
|
||||||
|
|
||||||
|
c) Accompany the work with a written offer, valid for at
|
||||||
|
least three years, to give the same user the materials
|
||||||
|
specified in Subsection 6a, above, for a charge no more
|
||||||
|
than the cost of performing this distribution.
|
||||||
|
|
||||||
|
d) If distribution of the work is made by offering access to copy
|
||||||
|
from a designated place, offer equivalent access to copy the above
|
||||||
|
specified materials from the same place.
|
||||||
|
|
||||||
|
e) Verify that the user has already received a copy of these
|
||||||
|
materials or that you have already sent this user a copy.
|
||||||
|
|
||||||
|
For an executable, the required form of the "work that uses the
|
||||||
|
Library" must include any data and utility programs needed for
|
||||||
|
reproducing the executable from it. However, as a special exception,
|
||||||
|
the materials to be distributed need not include anything that is
|
||||||
|
normally distributed (in either source or binary form) with the major
|
||||||
|
components (compiler, kernel, and so on) of the operating system on
|
||||||
|
which the executable runs, unless that component itself accompanies
|
||||||
|
the executable.
|
||||||
|
|
||||||
|
It may happen that this requirement contradicts the license
|
||||||
|
restrictions of other proprietary libraries that do not normally
|
||||||
|
accompany the operating system. Such a contradiction means you cannot
|
||||||
|
use both them and the Library together in an executable that you
|
||||||
|
distribute.
|
||||||
|
|
||||||
|
7. You may place library facilities that are a work based on the
|
||||||
|
Library side-by-side in a single library together with other library
|
||||||
|
facilities not covered by this License, and distribute such a combined
|
||||||
|
library, provided that the separate distribution of the work based on
|
||||||
|
the Library and of the other library facilities is otherwise
|
||||||
|
permitted, and provided that you do these two things:
|
||||||
|
|
||||||
|
a) Accompany the combined library with a copy of the same work
|
||||||
|
based on the Library, uncombined with any other library
|
||||||
|
facilities. This must be distributed under the terms of the
|
||||||
|
Sections above.
|
||||||
|
|
||||||
|
b) Give prominent notice with the combined library of the fact
|
||||||
|
that part of it is a work based on the Library, and explaining
|
||||||
|
where to find the accompanying uncombined form of the same work.
|
||||||
|
|
||||||
|
8. You may not copy, modify, sublicense, link with, or distribute
|
||||||
|
the Library except as expressly provided under this License. Any
|
||||||
|
attempt otherwise to copy, modify, sublicense, link with, or
|
||||||
|
distribute the Library is void, and will automatically terminate your
|
||||||
|
rights under this License. However, parties who have received copies,
|
||||||
|
or rights, from you under this License will not have their licenses
|
||||||
|
terminated so long as such parties remain in full compliance.
|
||||||
|
|
||||||
|
9. You are not required to accept this License, since you have not
|
||||||
|
signed it. However, nothing else grants you permission to modify or
|
||||||
|
distribute the Library or its derivative works. These actions are
|
||||||
|
prohibited by law if you do not accept this License. Therefore, by
|
||||||
|
modifying or distributing the Library (or any work based on the
|
||||||
|
Library), you indicate your acceptance of this License to do so, and
|
||||||
|
all its terms and conditions for copying, distributing or modifying
|
||||||
|
the Library or works based on it.
|
||||||
|
|
||||||
|
10. Each time you redistribute the Library (or any work based on the
|
||||||
|
Library), the recipient automatically receives a license from the
|
||||||
|
original licensor to copy, distribute, link with or modify the Library
|
||||||
|
subject to these terms and conditions. You may not impose any further
|
||||||
|
restrictions on the recipients' exercise of the rights granted herein.
|
||||||
|
You are not responsible for enforcing compliance by third parties with
|
||||||
|
this License.
|
||||||
|
|
||||||
|
11. If, as a consequence of a court judgment or allegation of patent
|
||||||
|
infringement or for any other reason (not limited to patent issues),
|
||||||
|
conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot
|
||||||
|
distribute so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you
|
||||||
|
may not distribute the Library at all. For example, if a patent
|
||||||
|
license would not permit royalty-free redistribution of the Library by
|
||||||
|
all those who receive copies directly or indirectly through you, then
|
||||||
|
the only way you could satisfy both it and this License would be to
|
||||||
|
refrain entirely from distribution of the Library.
|
||||||
|
|
||||||
|
If any portion of this section is held invalid or unenforceable under any
|
||||||
|
particular circumstance, the balance of the section is intended to apply,
|
||||||
|
and the section as a whole is intended to apply in other circumstances.
|
||||||
|
|
||||||
|
It is not the purpose of this section to induce you to infringe any
|
||||||
|
patents or other property right claims or to contest validity of any
|
||||||
|
such claims; this section has the sole purpose of protecting the
|
||||||
|
integrity of the free software distribution system which is
|
||||||
|
implemented by public license practices. Many people have made
|
||||||
|
generous contributions to the wide range of software distributed
|
||||||
|
through that system in reliance on consistent application of that
|
||||||
|
system; it is up to the author/donor to decide if he or she is willing
|
||||||
|
to distribute software through any other system and a licensee cannot
|
||||||
|
impose that choice.
|
||||||
|
|
||||||
|
This section is intended to make thoroughly clear what is believed to
|
||||||
|
be a consequence of the rest of this License.
|
||||||
|
|
||||||
|
12. If the distribution and/or use of the Library is restricted in
|
||||||
|
certain countries either by patents or by copyrighted interfaces, the
|
||||||
|
original copyright holder who places the Library under this License may add
|
||||||
|
an explicit geographical distribution limitation excluding those countries,
|
||||||
|
so that distribution is permitted only in or among countries not thus
|
||||||
|
excluded. In such case, this License incorporates the limitation as if
|
||||||
|
written in the body of this License.
|
||||||
|
|
||||||
|
13. The Free Software Foundation may publish revised and/or new
|
||||||
|
versions of the Lesser General Public License from time to time.
|
||||||
|
Such new versions will be similar in spirit to the present version,
|
||||||
|
but may differ in detail to address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the Library
|
||||||
|
specifies a version number of this License which applies to it and
|
||||||
|
"any later version", you have the option of following the terms and
|
||||||
|
conditions either of that version or of any later version published by
|
||||||
|
the Free Software Foundation. If the Library does not specify a
|
||||||
|
license version number, you may choose any version ever published by
|
||||||
|
the Free Software Foundation.
|
||||||
|
|
||||||
|
14. If you wish to incorporate parts of the Library into other free
|
||||||
|
programs whose distribution conditions are incompatible with these,
|
||||||
|
write to the author to ask for permission. For software which is
|
||||||
|
copyrighted by the Free Software Foundation, write to the Free
|
||||||
|
Software Foundation; we sometimes make exceptions for this. Our
|
||||||
|
decision will be guided by the two goals of preserving the free status
|
||||||
|
of all derivatives of our free software and of promoting the sharing
|
||||||
|
and reuse of software generally.
|
||||||
|
|
||||||
|
NO WARRANTY
|
||||||
|
|
||||||
|
15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
|
||||||
|
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
|
||||||
|
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
|
||||||
|
OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
|
||||||
|
KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
|
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
|
||||||
|
LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
|
||||||
|
THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||||
|
|
||||||
|
16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
|
||||||
|
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
|
||||||
|
AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
|
||||||
|
FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
|
||||||
|
CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
|
||||||
|
LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
|
||||||
|
RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
|
||||||
|
FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
|
||||||
|
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
|
||||||
|
DAMAGES.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
How to Apply These Terms to Your New Libraries
|
||||||
|
|
||||||
|
If you develop a new library, and you want it to be of the greatest
|
||||||
|
possible use to the public, we recommend making it free software that
|
||||||
|
everyone can redistribute and change. You can do so by permitting
|
||||||
|
redistribution under these terms (or, alternatively, under the terms of the
|
||||||
|
ordinary General Public License).
|
||||||
|
|
||||||
|
To apply these terms, attach the following notices to the library. It is
|
||||||
|
safest to attach them to the start of each source file to most effectively
|
||||||
|
convey the exclusion of warranty; and each file should have at least the
|
||||||
|
"copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
|
<one line to give the library's name and a brief idea of what it does.>
|
||||||
|
Copyright (C) <year> <name of author>
|
||||||
|
|
||||||
|
This library is free software; you can redistribute it and/or
|
||||||
|
modify it under the terms of the GNU Lesser General Public
|
||||||
|
License as published by the Free Software Foundation; either
|
||||||
|
version 2.1 of the License, or (at your option) any later version.
|
||||||
|
|
||||||
|
This library 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
|
||||||
|
Lesser General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Lesser General Public
|
||||||
|
License along with this library; if not, write to the Free Software
|
||||||
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
|
||||||
|
USA
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
|
You should also get your employer (if you work as a programmer) or your
|
||||||
|
school, if any, to sign a "copyright disclaimer" for the library, if
|
||||||
|
necessary. Here is a sample; alter the names:
|
||||||
|
|
||||||
|
Yoyodyne, Inc., hereby disclaims all copyright interest in the
|
||||||
|
library `Frob' (a library for tweaking knobs) written by James Random
|
||||||
|
Hacker.
|
||||||
|
|
||||||
|
<signature of Ty Coon>, 1 April 1990
|
||||||
|
Ty Coon, President of Vice
|
||||||
|
|
||||||
|
That's all there is to it!
|
||||||
4
extern/opl/MODIFIED.md
vendored
Normal file
4
extern/opl/MODIFIED.md
vendored
Normal file
|
|
@ -0,0 +1,4 @@
|
||||||
|
# modification disclaimer
|
||||||
|
|
||||||
|
this is a modified version of Nuked-OPL3 which implements channel muting in the core.
|
||||||
|
see [this issue](https://github.com/tildearrow/furnace/issues/414) for more information.
|
||||||
1476
extern/opl/opl3.c
vendored
Normal file
1476
extern/opl/opl3.c
vendored
Normal file
File diff suppressed because it is too large
Load diff
168
extern/opl/opl3.h
vendored
Normal file
168
extern/opl/opl3.h
vendored
Normal file
|
|
@ -0,0 +1,168 @@
|
||||||
|
/* Nuked OPL3
|
||||||
|
* Copyright (C) 2013-2020 Nuke.YKT
|
||||||
|
*
|
||||||
|
* This file is part of Nuked OPL3.
|
||||||
|
*
|
||||||
|
* Nuked OPL3 is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Lesser General Public License as
|
||||||
|
* published by the Free Software Foundation, either version 2.1
|
||||||
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* Nuked OPL3 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 Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public License
|
||||||
|
* along with Nuked OPL3. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
* Nuked OPL3 emulator.
|
||||||
|
* Thanks:
|
||||||
|
* MAME Development Team(Jarek Burczynski, Tatsuyuki Satoh):
|
||||||
|
* Feedback and Rhythm part calculation information.
|
||||||
|
* forums.submarine.org.uk(carbon14, opl3):
|
||||||
|
* Tremolo and phase generator calculation information.
|
||||||
|
* OPLx decapsulated(Matthew Gambrell, Olli Niemitalo):
|
||||||
|
* OPL2 ROMs.
|
||||||
|
* siliconpr0n.org(John McMaster, digshadow):
|
||||||
|
* YMF262 and VRC VII decaps and die shots.
|
||||||
|
*
|
||||||
|
* version: 1.8
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef OPL_OPL3_H
|
||||||
|
#define OPL_OPL3_H
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include <inttypes.h>
|
||||||
|
|
||||||
|
#ifndef OPL_ENABLE_STEREOEXT
|
||||||
|
#define OPL_ENABLE_STEREOEXT 0
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define OPL_WRITEBUF_SIZE 1024
|
||||||
|
#define OPL_WRITEBUF_DELAY 2
|
||||||
|
|
||||||
|
typedef struct _opl3_slot opl3_slot;
|
||||||
|
typedef struct _opl3_channel opl3_channel;
|
||||||
|
typedef struct _opl3_chip opl3_chip;
|
||||||
|
|
||||||
|
struct _opl3_slot {
|
||||||
|
opl3_channel *channel;
|
||||||
|
opl3_chip *chip;
|
||||||
|
int16_t out;
|
||||||
|
int16_t fbmod;
|
||||||
|
int16_t *mod;
|
||||||
|
int16_t prout;
|
||||||
|
uint16_t eg_rout;
|
||||||
|
uint16_t eg_out;
|
||||||
|
uint8_t eg_inc;
|
||||||
|
uint8_t eg_gen;
|
||||||
|
uint8_t eg_rate;
|
||||||
|
uint8_t eg_ksl;
|
||||||
|
uint8_t *trem;
|
||||||
|
uint8_t reg_vib;
|
||||||
|
uint8_t reg_type;
|
||||||
|
uint8_t reg_ksr;
|
||||||
|
uint8_t reg_mult;
|
||||||
|
uint8_t reg_ksl;
|
||||||
|
uint8_t reg_tl;
|
||||||
|
uint8_t reg_ar;
|
||||||
|
uint8_t reg_dr;
|
||||||
|
uint8_t reg_sl;
|
||||||
|
uint8_t reg_rr;
|
||||||
|
uint8_t reg_wf;
|
||||||
|
uint8_t key;
|
||||||
|
uint32_t pg_reset;
|
||||||
|
uint32_t pg_phase;
|
||||||
|
uint16_t pg_phase_out;
|
||||||
|
uint8_t slot_num;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct _opl3_channel {
|
||||||
|
opl3_slot *slots[2];
|
||||||
|
opl3_channel *pair;
|
||||||
|
opl3_chip *chip;
|
||||||
|
int16_t *out[4];
|
||||||
|
|
||||||
|
#if OPL_ENABLE_STEREOEXT
|
||||||
|
int32_t leftpan;
|
||||||
|
int32_t rightpan;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
uint8_t chtype;
|
||||||
|
uint16_t f_num;
|
||||||
|
uint8_t block;
|
||||||
|
uint8_t fb;
|
||||||
|
uint8_t con;
|
||||||
|
uint8_t alg;
|
||||||
|
uint8_t ksv;
|
||||||
|
uint16_t cha, chb;
|
||||||
|
uint8_t ch_num;
|
||||||
|
uint8_t muted;
|
||||||
|
};
|
||||||
|
|
||||||
|
typedef struct _opl3_writebuf {
|
||||||
|
uint64_t time;
|
||||||
|
uint16_t reg;
|
||||||
|
uint8_t data;
|
||||||
|
} opl3_writebuf;
|
||||||
|
|
||||||
|
struct _opl3_chip {
|
||||||
|
opl3_channel channel[18];
|
||||||
|
opl3_slot slot[36];
|
||||||
|
uint16_t timer;
|
||||||
|
uint64_t eg_timer;
|
||||||
|
uint8_t eg_timerrem;
|
||||||
|
uint8_t eg_state;
|
||||||
|
uint8_t eg_add;
|
||||||
|
uint8_t newm;
|
||||||
|
uint8_t nts;
|
||||||
|
uint8_t rhy;
|
||||||
|
uint8_t vibpos;
|
||||||
|
uint8_t vibshift;
|
||||||
|
uint8_t tremolo;
|
||||||
|
uint8_t tremolopos;
|
||||||
|
uint8_t tremoloshift;
|
||||||
|
uint32_t noise;
|
||||||
|
int16_t zeromod;
|
||||||
|
int32_t mixbuff[2];
|
||||||
|
uint8_t rm_hh_bit2;
|
||||||
|
uint8_t rm_hh_bit3;
|
||||||
|
uint8_t rm_hh_bit7;
|
||||||
|
uint8_t rm_hh_bit8;
|
||||||
|
uint8_t rm_tc_bit3;
|
||||||
|
uint8_t rm_tc_bit5;
|
||||||
|
|
||||||
|
#if OPL_ENABLE_STEREOEXT
|
||||||
|
uint8_t stereoext;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* OPL3L */
|
||||||
|
int32_t rateratio;
|
||||||
|
int32_t samplecnt;
|
||||||
|
int16_t oldsamples[2];
|
||||||
|
int16_t samples[2];
|
||||||
|
|
||||||
|
uint64_t writebuf_samplecnt;
|
||||||
|
uint32_t writebuf_cur;
|
||||||
|
uint32_t writebuf_last;
|
||||||
|
uint64_t writebuf_lasttime;
|
||||||
|
opl3_writebuf writebuf[OPL_WRITEBUF_SIZE];
|
||||||
|
};
|
||||||
|
|
||||||
|
void OPL3_Generate(opl3_chip *chip, int16_t *buf);
|
||||||
|
void OPL3_GenerateResampled(opl3_chip *chip, int16_t *buf);
|
||||||
|
void OPL3_Reset(opl3_chip *chip, uint32_t samplerate);
|
||||||
|
void OPL3_WriteReg(opl3_chip *chip, uint16_t reg, uint8_t v);
|
||||||
|
void OPL3_WriteRegBuffered(opl3_chip *chip, uint16_t reg, uint8_t v);
|
||||||
|
void OPL3_GenerateStream(opl3_chip *chip, int16_t *sndptr, uint32_t numsamples);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
@ -2,17 +2,17 @@
|
||||||
|
|
||||||
the YM2413, otherwise known as OPLL, is a cost-reduced FM synthesis sound chip, based on the Yamaha YM3812 (OPL2). thought OPL was downgraded enough? :p
|
the YM2413, otherwise known as OPLL, is a cost-reduced FM synthesis sound chip, based on the Yamaha YM3812 (OPL2). thought OPL was downgraded enough? :p
|
||||||
|
|
||||||
OPLL spawned also a few derivative chips, the best known of these is:
|
OPLL also spawned a few derivative chips, the best known of these is:
|
||||||
- the myth. the legend. THE VRC7. 6 channels, *rather interesting* instruments sound bank, no drums mode
|
- the famous Konami VRC7. used in the Japan-only video game Lagrange Point, it was **another** cost reduction on top of the OPLL! this time just 6 channels...
|
||||||
- Yamaha YM2423, same chip as YM2413, just a different patch set
|
- Yamaha YM2423, same chip as YM2413, just a different patch set
|
||||||
- Yamaha YMF281, ditto
|
- Yamaha YMF281, ditto
|
||||||
|
|
||||||
# technical specifications
|
# technical specifications
|
||||||
|
|
||||||
the YM2413 is equipped with the following features:
|
the YM2413 is equipped with the following features:
|
||||||
|
|
||||||
- 9 channels of 2 operator FM synthesis
|
- 9 channels of 2 operator FM synthesis
|
||||||
- A drum/percussion mode, replacing the last 3 voices with 3 rhythm channels
|
- A drum/percussion mode, replacing the last 3 voices with 5 rhythm channels
|
||||||
- 1 user-definable patch (this patch can be changed throughout the course of the song)
|
- 1 user-definable patch (this patch can be changed throughout the course of the song)
|
||||||
- 15 pre-defined patches which can all be used at the same time
|
- 15 pre-defined patches which can all be used at the same time
|
||||||
- Support for ADSR on both the modulator and the carrier
|
- Support for ADSR on both the modulator and the carrier
|
||||||
|
|
|
||||||
|
|
@ -52,6 +52,9 @@ no plans have been made for TX81Z MIDI passthrough, because:
|
||||||
- `2Bxy`: set EG shift of operator.
|
- `2Bxy`: set EG shift of operator.
|
||||||
- `x` is the operator (1-4). a value of 0 means "all operators".
|
- `x` is the operator (1-4). a value of 0 means "all operators".
|
||||||
- `y` is the value.
|
- `y` is the value.
|
||||||
|
- `2Cxy` set fine multiplier of operator.
|
||||||
|
- `x` is the operator (1-4). a value of 0 means "all operators".
|
||||||
|
- `y` is the value.
|
||||||
- `2Fxx`: enable envelope hard reset.
|
- `2Fxx`: enable envelope hard reset.
|
||||||
- this works by inserting a quick release and tiny delay before a new note.
|
- this works by inserting a quick release and tiny delay before a new note.
|
||||||
- `3xyy`: set fixed frequency of operator 1/2.
|
- `3xyy`: set fixed frequency of operator 1/2.
|
||||||
|
|
@ -97,4 +100,4 @@ no plans have been made for TX81Z MIDI passthrough, because:
|
||||||
- `5Cxx`: set D2R/SR of operator 1.
|
- `5Cxx`: set D2R/SR of operator 1.
|
||||||
- `5Dxx`: set D2R/SR of operator 2.
|
- `5Dxx`: set D2R/SR of operator 2.
|
||||||
- `5Exx`: set D2R/SR of operator 3.
|
- `5Exx`: set D2R/SR of operator 3.
|
||||||
- `5Fxx`: set D2R/SR of operator 4.
|
- `5Fxx`: set D2R/SR of operator 4.
|
||||||
|
|
|
||||||
|
|
@ -39,14 +39,14 @@ one of two chips that powered the Sega Genesis. It is a six-channel, four-operat
|
||||||
- `53xy` set DT of operator.
|
- `53xy` set DT of operator.
|
||||||
- `x` is the operator (1-4). a value of 0 means "all operators".
|
- `x` is the operator (1-4). a value of 0 means "all operators".
|
||||||
- `y` is the value:
|
- `y` is the value:
|
||||||
- 0: +0
|
- 0: -3
|
||||||
- 1: +1
|
- 1: -2
|
||||||
- 2: +2
|
- 2: -1
|
||||||
- 3: +3
|
- 3: 0
|
||||||
- 4: -0
|
- 4: 1
|
||||||
- 5: -3
|
- 5: 2
|
||||||
- 6: -2
|
- 6: 3
|
||||||
- 7: -1
|
- 7: -0
|
||||||
- `54xy` set RS of operator.
|
- `54xy` set RS of operator.
|
||||||
- `x` is the operator (1-4). a value of 0 means "all operators".
|
- `x` is the operator (1-4). a value of 0 means "all operators".
|
||||||
- `y` is the value.
|
- `y` is the value.
|
||||||
|
|
|
||||||
|
|
@ -45,8 +45,8 @@
|
||||||
#define BUSY_BEGIN_SOFT softLocked=true; isBusy.lock();
|
#define BUSY_BEGIN_SOFT softLocked=true; isBusy.lock();
|
||||||
#define BUSY_END isBusy.unlock(); softLocked=false;
|
#define BUSY_END isBusy.unlock(); softLocked=false;
|
||||||
|
|
||||||
#define DIV_VERSION "devff" // it breaks compatiblity
|
#define DIV_VERSION "dev92" // it breaks compatiblity
|
||||||
#define DIV_ENGINE_VERSION 0xff
|
#define DIV_ENGINE_VERSION 92
|
||||||
|
|
||||||
// for imports
|
// for imports
|
||||||
#define DIV_VERSION_MOD 0xff01
|
#define DIV_VERSION_MOD 0xff01
|
||||||
|
|
@ -383,6 +383,7 @@ class DivEngine {
|
||||||
bool loadDMF(unsigned char* file, size_t len);
|
bool loadDMF(unsigned char* file, size_t len);
|
||||||
bool loadFur(unsigned char* file, size_t len);
|
bool loadFur(unsigned char* file, size_t len);
|
||||||
bool loadMod(unsigned char* file, size_t len);
|
bool loadMod(unsigned char* file, size_t len);
|
||||||
|
bool loadFTM(unsigned char* file, size_t len);
|
||||||
|
|
||||||
void loadDMP(SafeReader& reader, std::vector<DivInstrument*>& ret, String& stripPath);
|
void loadDMP(SafeReader& reader, std::vector<DivInstrument*>& ret, String& stripPath);
|
||||||
void loadTFI(SafeReader& reader, std::vector<DivInstrument*>& ret, String& stripPath);
|
void loadTFI(SafeReader& reader, std::vector<DivInstrument*>& ret, String& stripPath);
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,7 @@
|
||||||
#define DIV_READ_SIZE 131072
|
#define DIV_READ_SIZE 131072
|
||||||
#define DIV_DMF_MAGIC ".DelekDefleMask."
|
#define DIV_DMF_MAGIC ".DelekDefleMask."
|
||||||
#define DIV_FUR_MAGIC "-Furnace module-"
|
#define DIV_FUR_MAGIC "-Furnace module-"
|
||||||
|
#define DIV_FTM_MAGIC "FamiTracker Module"
|
||||||
|
|
||||||
struct InflateBlock {
|
struct InflateBlock {
|
||||||
unsigned char* buf;
|
unsigned char* buf;
|
||||||
|
|
@ -1314,6 +1315,12 @@ bool DivEngine::loadFur(unsigned char* file, size_t len) {
|
||||||
ds.chanCollapse[i]=reader.readC();
|
ds.chanCollapse[i]=reader.readC();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (ds.version<92) {
|
||||||
|
for (int i=0; i<tchans; i++) {
|
||||||
|
if (ds.chanCollapse[i]>0) ds.chanCollapse[i]=3;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
for (int i=0; i<tchans; i++) {
|
for (int i=0; i<tchans; i++) {
|
||||||
ds.chanName[i]=reader.readString();
|
ds.chanName[i]=reader.readString();
|
||||||
}
|
}
|
||||||
|
|
@ -1617,8 +1624,6 @@ bool DivEngine::loadFur(unsigned char* file, size_t len) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
bool DivEngine::loadMod(unsigned char* file, size_t len) {
|
bool DivEngine::loadMod(unsigned char* file, size_t len) {
|
||||||
struct InvalidHeaderException {};
|
struct InvalidHeaderException {};
|
||||||
bool success=false;
|
bool success=false;
|
||||||
|
|
@ -2029,10 +2034,43 @@ bool DivEngine::loadMod(unsigned char* file, size_t len) {
|
||||||
return success;
|
return success;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool DivEngine::loadFTM(unsigned char* file, size_t len) {
|
||||||
|
SafeReader reader=SafeReader(file,len);
|
||||||
|
warnings="";
|
||||||
|
try {
|
||||||
|
DivSong ds;
|
||||||
|
|
||||||
|
if (!reader.seek(18,SEEK_SET)) {
|
||||||
|
logE("premature end of file!");
|
||||||
|
lastError="incomplete file";
|
||||||
|
delete[] file;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
ds.version=(unsigned short)reader.readS();
|
||||||
|
logI("module version %d (0x%.4x)",ds.version,ds.version);
|
||||||
|
|
||||||
|
if (ds.version>0x0440) {
|
||||||
|
logE("incompatible version %x!",ds.version);
|
||||||
|
lastError="incompatible version";
|
||||||
|
delete[] file;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
} catch (EndOfFileException& e) {
|
||||||
|
logE("premature end of file!");
|
||||||
|
lastError="incomplete file";
|
||||||
|
delete[] file;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
delete[] file;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
bool DivEngine::load(unsigned char* f, size_t slen) {
|
bool DivEngine::load(unsigned char* f, size_t slen) {
|
||||||
unsigned char* file;
|
unsigned char* file;
|
||||||
size_t len;
|
size_t len;
|
||||||
if (slen<16) {
|
if (slen<18) {
|
||||||
logE("too small!");
|
logE("too small!");
|
||||||
lastError="file is too small";
|
lastError="file is too small";
|
||||||
delete[] f;
|
delete[] f;
|
||||||
|
|
@ -2137,6 +2175,8 @@ bool DivEngine::load(unsigned char* f, size_t slen) {
|
||||||
// step 2: try loading as .fur or .dmf
|
// step 2: try loading as .fur or .dmf
|
||||||
if (memcmp(file,DIV_DMF_MAGIC,16)==0) {
|
if (memcmp(file,DIV_DMF_MAGIC,16)==0) {
|
||||||
return loadDMF(file,len);
|
return loadDMF(file,len);
|
||||||
|
} else if (memcmp(file,DIV_FTM_MAGIC,18)==0) {
|
||||||
|
return loadFTM(file,len);
|
||||||
} else if (memcmp(file,DIV_FUR_MAGIC,16)==0) {
|
} else if (memcmp(file,DIV_FUR_MAGIC,16)==0) {
|
||||||
return loadFur(file,len);
|
return loadFur(file,len);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -135,6 +135,54 @@ const char* DivPlatformArcade::getEffectName(unsigned char effect) {
|
||||||
case 0x30:
|
case 0x30:
|
||||||
return "30xx: Toggle hard envelope reset on new notes";
|
return "30xx: Toggle hard envelope reset on new notes";
|
||||||
break;
|
break;
|
||||||
|
case 0x50:
|
||||||
|
return "50xy: Set AM (x: operator from 1 to 4 (0 for all ops); y: AM)";
|
||||||
|
break;
|
||||||
|
case 0x51:
|
||||||
|
return "51xy: Set sustain level (x: operator from 1 to 4 (0 for all ops); y: sustain)";
|
||||||
|
break;
|
||||||
|
case 0x52:
|
||||||
|
return "52xy: Set release (x: operator from 1 to 4 (0 for all ops); y: release)";
|
||||||
|
break;
|
||||||
|
case 0x53:
|
||||||
|
return "53xy: Set detune (x: operator from 1 to 4 (0 for all ops); y: detune where 3 is center)";
|
||||||
|
break;
|
||||||
|
case 0x54:
|
||||||
|
return "54xy: Set envelope scale (x: operator from 1 to 4 (0 for all ops); y: scale from 0 to 3)";
|
||||||
|
break;
|
||||||
|
case 0x55:
|
||||||
|
return "55xy: Set detune 2 (x: operator from 1 to 4 (0 for all ops); y: detune from 0 to 3)";
|
||||||
|
break;
|
||||||
|
case 0x56:
|
||||||
|
return "56xx: Set decay of all operators (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x57:
|
||||||
|
return "57xx: Set decay of operator 1 (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x58:
|
||||||
|
return "58xx: Set decay of operator 2 (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x59:
|
||||||
|
return "59xx: Set decay of operator 3 (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x5a:
|
||||||
|
return "5Axx: Set decay of operator 4 (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x5b:
|
||||||
|
return "5Bxx: Set decay 2 of all operators (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x5c:
|
||||||
|
return "5Cxx: Set decay 2 of operator 1 (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x5d:
|
||||||
|
return "5Dxx: Set decay 2 of operator 2 (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x5e:
|
||||||
|
return "5Exx: Set decay 2 of operator 3 (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x5f:
|
||||||
|
return "5Fxx: Set decay 2 of operator 4 (0 to 1F)";
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
@ -650,6 +698,134 @@ int DivPlatformArcade::dispatch(DivCommand c) {
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
case DIV_CMD_FM_RS: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
op.rs=c.value2&3;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_RS_AR,(op.ar&31)|(op.rs<<6));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.rs=c.value2&3;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_RS_AR,(op.ar&31)|(op.rs<<6));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_AM: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
op.am=c.value2&1;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_AM_DR,(op.dr&31)|(op.am<<7));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.am=c.value2&1;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_AM_DR,(op.dr&31)|(op.am<<7));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_DR: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
op.dr=c.value2&31;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_AM_DR,(op.dr&31)|(op.am<<7));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.dr=c.value2&31;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_AM_DR,(op.dr&31)|(op.am<<7));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_SL: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
op.sl=c.value2&15;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_SL_RR,(op.rr&15)|(op.sl<<4));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.sl=c.value2&15;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_SL_RR,(op.rr&15)|(op.sl<<4));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_RR: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
op.rr=c.value2&15;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_SL_RR,(op.rr&15)|(op.sl<<4));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.rr=c.value2&15;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_SL_RR,(op.rr&15)|(op.sl<<4));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_DT2: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
op.dt2=c.value2&3;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_DT2_D2R,(op.d2r&31)|(op.dt2<<6));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.dt2=c.value2&3;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_DT2_D2R,(op.d2r&31)|(op.dt2<<6));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_D2R: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
op.d2r=c.value2&31;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_DT2_D2R,(op.d2r&31)|(op.dt2<<6));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.d2r=c.value2&31;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_DT2_D2R,(op.d2r&31)|(op.dt2<<6));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_DT: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
op.dt=c.value&7;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_MULT_DT,(op.mult&15)|(dtTable[op.dt&7]<<4));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.dt=c.value2&7;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_MULT_DT,(op.mult&15)|(dtTable[op.dt&7]<<4));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
case DIV_CMD_FM_AM_DEPTH: {
|
case DIV_CMD_FM_AM_DEPTH: {
|
||||||
amDepth=c.value;
|
amDepth=c.value;
|
||||||
immWrite(0x19,amDepth);
|
immWrite(0x19,amDepth);
|
||||||
|
|
|
||||||
|
|
@ -77,6 +77,54 @@ const char* DivPlatformGenesis::getEffectName(unsigned char effect) {
|
||||||
case 0x30:
|
case 0x30:
|
||||||
return "30xx: Toggle hard envelope reset on new notes";
|
return "30xx: Toggle hard envelope reset on new notes";
|
||||||
break;
|
break;
|
||||||
|
case 0x50:
|
||||||
|
return "50xy: Set AM (x: operator from 1 to 4 (0 for all ops); y: AM)";
|
||||||
|
break;
|
||||||
|
case 0x51:
|
||||||
|
return "51xy: Set sustain level (x: operator from 1 to 4 (0 for all ops); y: sustain)";
|
||||||
|
break;
|
||||||
|
case 0x52:
|
||||||
|
return "52xy: Set release (x: operator from 1 to 4 (0 for all ops); y: release)";
|
||||||
|
break;
|
||||||
|
case 0x53:
|
||||||
|
return "53xy: Set detune (x: operator from 1 to 4 (0 for all ops); y: detune where 3 is center)";
|
||||||
|
break;
|
||||||
|
case 0x54:
|
||||||
|
return "54xy: Set envelope scale (x: operator from 1 to 4 (0 for all ops); y: scale from 0 to 3)";
|
||||||
|
break;
|
||||||
|
case 0x55:
|
||||||
|
return "55xy: Set SSG envelope (x: operator from 1 to 4 (0 for all ops); y: 0-7 on, 8 off)";
|
||||||
|
break;
|
||||||
|
case 0x56:
|
||||||
|
return "56xx: Set decay of all operators (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x57:
|
||||||
|
return "57xx: Set decay of operator 1 (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x58:
|
||||||
|
return "58xx: Set decay of operator 2 (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x59:
|
||||||
|
return "59xx: Set decay of operator 3 (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x5a:
|
||||||
|
return "5Axx: Set decay of operator 4 (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x5b:
|
||||||
|
return "5Bxx: Set decay 2 of all operators (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x5c:
|
||||||
|
return "5Cxx: Set decay 2 of operator 1 (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x5d:
|
||||||
|
return "5Dxx: Set decay 2 of operator 2 (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x5e:
|
||||||
|
return "5Exx: Set decay 2 of operator 3 (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x5f:
|
||||||
|
return "5Fxx: Set decay 2 of operator 4 (0 to 1F)";
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
@ -780,7 +828,7 @@ int DivPlatformGenesis::dispatch(DivCommand c) {
|
||||||
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
rWrite(baseAddr+ADDR_RS_AR,(op.ar&31)|(op.rs<<6));
|
rWrite(baseAddr+ADDR_RS_AR,(op.ar&31)|(op.rs<<6));
|
||||||
}
|
}
|
||||||
} else {
|
} else if (c.value<4) {
|
||||||
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
op.ar=c.value2&31;
|
op.ar=c.value2&31;
|
||||||
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
|
@ -788,6 +836,134 @@ int DivPlatformGenesis::dispatch(DivCommand c) {
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
case DIV_CMD_FM_RS: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
op.rs=c.value2&3;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_RS_AR,(op.ar&31)|(op.rs<<6));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.rs=c.value2&3;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_RS_AR,(op.ar&31)|(op.rs<<6));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_AM: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
op.am=c.value2&1;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_AM_DR,(op.dr&31)|(op.am<<7));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.am=c.value2&1;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_AM_DR,(op.dr&31)|(op.am<<7));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_DR: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
op.dr=c.value2&31;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_AM_DR,(op.dr&31)|(op.am<<7));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.dr=c.value2&31;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_AM_DR,(op.dr&31)|(op.am<<7));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_SL: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
op.sl=c.value2&15;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_SL_RR,(op.rr&15)|(op.sl<<4));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.sl=c.value2&15;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_SL_RR,(op.rr&15)|(op.sl<<4));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_RR: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
op.rr=c.value2&15;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_SL_RR,(op.rr&15)|(op.sl<<4));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.rr=c.value2&15;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_SL_RR,(op.rr&15)|(op.sl<<4));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_D2R: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
op.d2r=c.value2&31;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_DT2_D2R,op.d2r&31);
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.d2r=c.value2&31;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_DT2_D2R,op.d2r&31);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_DT: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
op.dt=c.value&7;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_MULT_DT,(op.mult&15)|(dtTable[op.dt&7]<<4));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.dt=c.value2&7;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_MULT_DT,(op.mult&15)|(dtTable[op.dt&7]<<4));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_SSG: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
op.ssgEnv=8^(c.value2&15);
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_SSG,op.ssgEnv&15);
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.ssgEnv=8^(c.value2&15);
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_SSG,op.ssgEnv&15);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
case DIV_CMD_FM_HARD_RESET:
|
case DIV_CMD_FM_HARD_RESET:
|
||||||
chan[c.chan].hardReset=c.value;
|
chan[c.chan].hardReset=c.value;
|
||||||
break;
|
break;
|
||||||
|
|
|
||||||
|
|
@ -235,6 +235,134 @@ int DivPlatformGenesisExt::dispatch(DivCommand c) {
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
case DIV_CMD_FM_RS: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[2].state.op[i];
|
||||||
|
op.rs=c.value2&3;
|
||||||
|
unsigned short baseAddr=chanOffs[2]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_RS_AR,(op.ar&31)|(op.rs<<6));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[2].state.op[orderedOps[c.value]];
|
||||||
|
op.rs=c.value2&3;
|
||||||
|
unsigned short baseAddr=chanOffs[2]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_RS_AR,(op.ar&31)|(op.rs<<6));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_AM: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[2].state.op[i];
|
||||||
|
op.am=c.value2&1;
|
||||||
|
unsigned short baseAddr=chanOffs[2]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_AM_DR,(op.dr&31)|(op.am<<7));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[2].state.op[orderedOps[c.value]];
|
||||||
|
op.am=c.value2&1;
|
||||||
|
unsigned short baseAddr=chanOffs[2]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_AM_DR,(op.dr&31)|(op.am<<7));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_DR: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[2].state.op[i];
|
||||||
|
op.dr=c.value2&31;
|
||||||
|
unsigned short baseAddr=chanOffs[2]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_AM_DR,(op.dr&31)|(op.am<<7));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[2].state.op[orderedOps[c.value]];
|
||||||
|
op.dr=c.value2&31;
|
||||||
|
unsigned short baseAddr=chanOffs[2]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_AM_DR,(op.dr&31)|(op.am<<7));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_SL: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[2].state.op[i];
|
||||||
|
op.sl=c.value2&15;
|
||||||
|
unsigned short baseAddr=chanOffs[2]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_SL_RR,(op.rr&15)|(op.sl<<4));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[2].state.op[orderedOps[c.value]];
|
||||||
|
op.sl=c.value2&15;
|
||||||
|
unsigned short baseAddr=chanOffs[2]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_SL_RR,(op.rr&15)|(op.sl<<4));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_RR: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[2].state.op[i];
|
||||||
|
op.rr=c.value2&15;
|
||||||
|
unsigned short baseAddr=chanOffs[2]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_SL_RR,(op.rr&15)|(op.sl<<4));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[2].state.op[orderedOps[c.value]];
|
||||||
|
op.rr=c.value2&15;
|
||||||
|
unsigned short baseAddr=chanOffs[2]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_SL_RR,(op.rr&15)|(op.sl<<4));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_D2R: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[2].state.op[i];
|
||||||
|
op.d2r=c.value2&31;
|
||||||
|
unsigned short baseAddr=chanOffs[2]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_DT2_D2R,op.d2r&31);
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[2].state.op[orderedOps[c.value]];
|
||||||
|
op.d2r=c.value2&31;
|
||||||
|
unsigned short baseAddr=chanOffs[2]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_DT2_D2R,op.d2r&31);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_DT: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[2].state.op[i];
|
||||||
|
op.dt=c.value&7;
|
||||||
|
unsigned short baseAddr=chanOffs[2]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_MULT_DT,(op.mult&15)|(dtTable[op.dt&7]<<4));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[2].state.op[orderedOps[c.value]];
|
||||||
|
op.dt=c.value2&7;
|
||||||
|
unsigned short baseAddr=chanOffs[2]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_MULT_DT,(op.mult&15)|(dtTable[op.dt&7]<<4));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_SSG: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[2].state.op[i];
|
||||||
|
op.ssgEnv=8^(c.value2&15);
|
||||||
|
unsigned short baseAddr=chanOffs[2]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_SSG,op.ssgEnv&15);
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[2].state.op[orderedOps[c.value]];
|
||||||
|
op.ssgEnv=8^(c.value2&15);
|
||||||
|
unsigned short baseAddr=chanOffs[2]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_SSG,op.ssgEnv&15);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
case DIV_CMD_GET_VOLMAX:
|
case DIV_CMD_GET_VOLMAX:
|
||||||
return 127;
|
return 127;
|
||||||
break;
|
break;
|
||||||
|
|
|
||||||
|
|
@ -304,6 +304,7 @@ int DivPlatformMMC5::dispatch(DivCommand c) {
|
||||||
}
|
}
|
||||||
case DIV_CMD_STD_NOISE_MODE:
|
case DIV_CMD_STD_NOISE_MODE:
|
||||||
chan[c.chan].duty=c.value;
|
chan[c.chan].duty=c.value;
|
||||||
|
rWrite(0x5000+c.chan*4,0x30|chan[c.chan].outVol|((chan[c.chan].duty&3)<<6));
|
||||||
break;
|
break;
|
||||||
case DIV_CMD_SAMPLE_BANK:
|
case DIV_CMD_SAMPLE_BANK:
|
||||||
sampleBank=c.value;
|
sampleBank=c.value;
|
||||||
|
|
|
||||||
|
|
@ -520,6 +520,8 @@ int DivPlatformNES::dispatch(DivCommand c) {
|
||||||
chan[c.chan].duty=c.value;
|
chan[c.chan].duty=c.value;
|
||||||
if (c.chan==3) { // noise
|
if (c.chan==3) { // noise
|
||||||
chan[c.chan].freqChanged=true;
|
chan[c.chan].freqChanged=true;
|
||||||
|
} else if (c.chan<2) {
|
||||||
|
rWrite(0x4000+c.chan*4,0x30|chan[c.chan].outVol|((chan[c.chan].duty&3)<<6));
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case DIV_CMD_NES_SWEEP:
|
case DIV_CMD_NES_SWEEP:
|
||||||
|
|
|
||||||
|
|
@ -197,6 +197,48 @@ const char* DivPlatformOPL::getEffectName(unsigned char effect) {
|
||||||
case 0x1d:
|
case 0x1d:
|
||||||
return "1Dxx: Set attack of operator 4 (0 to F; 4-op only)";
|
return "1Dxx: Set attack of operator 4 (0 to F; 4-op only)";
|
||||||
break;
|
break;
|
||||||
|
case 0x2a:
|
||||||
|
return "2Axy: Set waveform (x: operator from 1 to 4 (0 for all ops); y: waveform from 0 to 3 in OPL2 and 0 to 7 in OPL3)";
|
||||||
|
break;
|
||||||
|
case 0x30:
|
||||||
|
return "30xx: Toggle hard envelope reset on new notes";
|
||||||
|
break;
|
||||||
|
case 0x50:
|
||||||
|
return "50xy: Set AM (x: operator from 1 to 4 (0 for all ops); y: AM)";
|
||||||
|
break;
|
||||||
|
case 0x51:
|
||||||
|
return "51xy: Set sustain level (x: operator from 1 to 4 (0 for all ops); y: sustain)";
|
||||||
|
break;
|
||||||
|
case 0x52:
|
||||||
|
return "52xy: Set release (x: operator from 1 to 4 (0 for all ops); y: release)";
|
||||||
|
break;
|
||||||
|
case 0x53:
|
||||||
|
return "53xy: Set vibrato (x: operator from 1 to 4 (0 for all ops); y: enabled)";
|
||||||
|
break;
|
||||||
|
case 0x54:
|
||||||
|
return "54xy: Set key scale level (x: operator from 1 to 4 (0 for all ops); y: level from 0 to 3)";
|
||||||
|
break;
|
||||||
|
case 0x55:
|
||||||
|
return "55xy: Set envelope sustain (x: operator from 1 to 4 (0 for all ops); y: enabled)";
|
||||||
|
break;
|
||||||
|
case 0x56:
|
||||||
|
return "56xx: Set decay of all operators (0 to F)";
|
||||||
|
break;
|
||||||
|
case 0x57:
|
||||||
|
return "57xx: Set decay of operator 1 (0 to F)";
|
||||||
|
break;
|
||||||
|
case 0x58:
|
||||||
|
return "58xx: Set decay of operator 2 (0 to F)";
|
||||||
|
break;
|
||||||
|
case 0x59:
|
||||||
|
return "59xx: Set decay of operator 3 (0 to F; 4-op only)";
|
||||||
|
break;
|
||||||
|
case 0x5a:
|
||||||
|
return "5Axx: Set decay of operator 4 (0 to F; 4-op only)";
|
||||||
|
break;
|
||||||
|
case 0x5b:
|
||||||
|
return "5Bxy: Set whether key will scale envelope (x: operator from 1 to 4 (0 for all ops); y: enabled)";
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
@ -522,6 +564,9 @@ int DivPlatformOPL::toFreq(int freq) {
|
||||||
|
|
||||||
void DivPlatformOPL::muteChannel(int ch, bool mute) {
|
void DivPlatformOPL::muteChannel(int ch, bool mute) {
|
||||||
isMuted[ch]=mute;
|
isMuted[ch]=mute;
|
||||||
|
if (ch<melodicChans) {
|
||||||
|
fm.channel[outChanMap[ch]].muted=mute;
|
||||||
|
}
|
||||||
int ops=(slots[3][ch]!=255 && chan[ch].state.ops==4 && oplType==3)?4:2;
|
int ops=(slots[3][ch]!=255 && chan[ch].state.ops==4 && oplType==3)?4:2;
|
||||||
chan[ch].fourOp=(ops==4);
|
chan[ch].fourOp=(ops==4);
|
||||||
update4OpMask=true;
|
update4OpMask=true;
|
||||||
|
|
@ -841,6 +886,222 @@ int DivPlatformOPL::dispatch(DivCommand c) {
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
case DIV_CMD_FM_DR: {
|
||||||
|
int ops=(slots[3][c.chan]!=255 && chan[c.chan].state.ops==4 && oplType==3)?4:2;
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<ops; i++) {
|
||||||
|
unsigned char slot=slots[i][c.chan];
|
||||||
|
if (slot==255) continue;
|
||||||
|
unsigned short baseAddr=slotMap[slot];
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[(ops==4)?orderedOpsL[i]:i];
|
||||||
|
op.dr=c.value2&15;
|
||||||
|
rWrite(baseAddr+ADDR_AR_DR,(op.ar<<4)|op.dr);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (c.value>=ops) break;
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[(ops==4)?orderedOpsL[c.value]:c.value];
|
||||||
|
op.dr=c.value2&15;
|
||||||
|
unsigned char slot=slots[c.value][c.chan];
|
||||||
|
if (slot==255) break;
|
||||||
|
unsigned short baseAddr=slotMap[slot];
|
||||||
|
rWrite(baseAddr+ADDR_AR_DR,(op.ar<<4)|op.dr);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_SL: {
|
||||||
|
int ops=(slots[3][c.chan]!=255 && chan[c.chan].state.ops==4 && oplType==3)?4:2;
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<ops; i++) {
|
||||||
|
unsigned char slot=slots[i][c.chan];
|
||||||
|
if (slot==255) continue;
|
||||||
|
unsigned short baseAddr=slotMap[slot];
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[(ops==4)?orderedOpsL[i]:i];
|
||||||
|
op.sl=c.value2&15;
|
||||||
|
rWrite(baseAddr+ADDR_SL_RR,(op.sl<<4)|op.rr);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (c.value>=ops) break;
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[(ops==4)?orderedOpsL[c.value]:c.value];
|
||||||
|
op.sl=c.value2&15;
|
||||||
|
unsigned char slot=slots[c.value][c.chan];
|
||||||
|
if (slot==255) break;
|
||||||
|
unsigned short baseAddr=slotMap[slot];
|
||||||
|
rWrite(baseAddr+ADDR_SL_RR,(op.sl<<4)|op.rr);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_RR: {
|
||||||
|
int ops=(slots[3][c.chan]!=255 && chan[c.chan].state.ops==4 && oplType==3)?4:2;
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<ops; i++) {
|
||||||
|
unsigned char slot=slots[i][c.chan];
|
||||||
|
if (slot==255) continue;
|
||||||
|
unsigned short baseAddr=slotMap[slot];
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[(ops==4)?orderedOpsL[i]:i];
|
||||||
|
op.rr=c.value2&15;
|
||||||
|
rWrite(baseAddr+ADDR_SL_RR,(op.sl<<4)|op.rr);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (c.value>=ops) break;
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[(ops==4)?orderedOpsL[c.value]:c.value];
|
||||||
|
op.rr=c.value2&15;
|
||||||
|
unsigned char slot=slots[c.value][c.chan];
|
||||||
|
if (slot==255) break;
|
||||||
|
unsigned short baseAddr=slotMap[slot];
|
||||||
|
rWrite(baseAddr+ADDR_SL_RR,(op.sl<<4)|op.rr);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_AM: {
|
||||||
|
int ops=(slots[3][c.chan]!=255 && chan[c.chan].state.ops==4 && oplType==3)?4:2;
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<ops; i++) {
|
||||||
|
unsigned char slot=slots[i][c.chan];
|
||||||
|
if (slot==255) continue;
|
||||||
|
unsigned short baseAddr=slotMap[slot];
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[(ops==4)?orderedOpsL[i]:i];
|
||||||
|
op.am=c.value2&1;
|
||||||
|
rWrite(baseAddr+ADDR_AM_VIB_SUS_KSR_MULT,(op.am<<7)|(op.vib<<6)|(op.sus<<5)|(op.ksr<<4)|op.mult);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (c.value>=ops) break;
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[(ops==4)?orderedOpsL[c.value]:c.value];
|
||||||
|
op.am=c.value2&1;
|
||||||
|
unsigned char slot=slots[c.value][c.chan];
|
||||||
|
if (slot==255) break;
|
||||||
|
unsigned short baseAddr=slotMap[slot];
|
||||||
|
rWrite(baseAddr+ADDR_AM_VIB_SUS_KSR_MULT,(op.am<<7)|(op.vib<<6)|(op.sus<<5)|(op.ksr<<4)|op.mult);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_VIB: {
|
||||||
|
int ops=(slots[3][c.chan]!=255 && chan[c.chan].state.ops==4 && oplType==3)?4:2;
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<ops; i++) {
|
||||||
|
unsigned char slot=slots[i][c.chan];
|
||||||
|
if (slot==255) continue;
|
||||||
|
unsigned short baseAddr=slotMap[slot];
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[(ops==4)?orderedOpsL[i]:i];
|
||||||
|
op.vib=c.value2&1;
|
||||||
|
rWrite(baseAddr+ADDR_AM_VIB_SUS_KSR_MULT,(op.am<<7)|(op.vib<<6)|(op.sus<<5)|(op.ksr<<4)|op.mult);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (c.value>=ops) break;
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[(ops==4)?orderedOpsL[c.value]:c.value];
|
||||||
|
op.vib=c.value2&1;
|
||||||
|
unsigned char slot=slots[c.value][c.chan];
|
||||||
|
if (slot==255) break;
|
||||||
|
unsigned short baseAddr=slotMap[slot];
|
||||||
|
rWrite(baseAddr+ADDR_AM_VIB_SUS_KSR_MULT,(op.am<<7)|(op.vib<<6)|(op.sus<<5)|(op.ksr<<4)|op.mult);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_SUS: {
|
||||||
|
int ops=(slots[3][c.chan]!=255 && chan[c.chan].state.ops==4 && oplType==3)?4:2;
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<ops; i++) {
|
||||||
|
unsigned char slot=slots[i][c.chan];
|
||||||
|
if (slot==255) continue;
|
||||||
|
unsigned short baseAddr=slotMap[slot];
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[(ops==4)?orderedOpsL[i]:i];
|
||||||
|
op.sus=c.value2&1;
|
||||||
|
rWrite(baseAddr+ADDR_AM_VIB_SUS_KSR_MULT,(op.am<<7)|(op.vib<<6)|(op.sus<<5)|(op.ksr<<4)|op.mult);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (c.value>=ops) break;
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[(ops==4)?orderedOpsL[c.value]:c.value];
|
||||||
|
op.sus=c.value2&1;
|
||||||
|
unsigned char slot=slots[c.value][c.chan];
|
||||||
|
if (slot==255) break;
|
||||||
|
unsigned short baseAddr=slotMap[slot];
|
||||||
|
rWrite(baseAddr+ADDR_AM_VIB_SUS_KSR_MULT,(op.am<<7)|(op.vib<<6)|(op.sus<<5)|(op.ksr<<4)|op.mult);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_KSR: {
|
||||||
|
int ops=(slots[3][c.chan]!=255 && chan[c.chan].state.ops==4 && oplType==3)?4:2;
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<ops; i++) {
|
||||||
|
unsigned char slot=slots[i][c.chan];
|
||||||
|
if (slot==255) continue;
|
||||||
|
unsigned short baseAddr=slotMap[slot];
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[(ops==4)?orderedOpsL[i]:i];
|
||||||
|
op.ksr=c.value2&1;
|
||||||
|
rWrite(baseAddr+ADDR_AM_VIB_SUS_KSR_MULT,(op.am<<7)|(op.vib<<6)|(op.sus<<5)|(op.ksr<<4)|op.mult);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (c.value>=ops) break;
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[(ops==4)?orderedOpsL[c.value]:c.value];
|
||||||
|
op.ksr=c.value2&1;
|
||||||
|
unsigned char slot=slots[c.value][c.chan];
|
||||||
|
if (slot==255) break;
|
||||||
|
unsigned short baseAddr=slotMap[slot];
|
||||||
|
rWrite(baseAddr+ADDR_AM_VIB_SUS_KSR_MULT,(op.am<<7)|(op.vib<<6)|(op.sus<<5)|(op.ksr<<4)|op.mult);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_WS: {
|
||||||
|
if (oplType<2) break;
|
||||||
|
int ops=(slots[3][c.chan]!=255 && chan[c.chan].state.ops==4 && oplType==3)?4:2;
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<ops; i++) {
|
||||||
|
unsigned char slot=slots[i][c.chan];
|
||||||
|
if (slot==255) continue;
|
||||||
|
unsigned short baseAddr=slotMap[slot];
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[(ops==4)?orderedOpsL[i]:i];
|
||||||
|
op.ws=c.value2&7;
|
||||||
|
rWrite(baseAddr+ADDR_WS,op.ws&((oplType==3)?7:3));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (c.value>=ops) break;
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[(ops==4)?orderedOpsL[c.value]:c.value];
|
||||||
|
op.ws=c.value2&7;
|
||||||
|
unsigned char slot=slots[c.value][c.chan];
|
||||||
|
if (slot==255) break;
|
||||||
|
unsigned short baseAddr=slotMap[slot];
|
||||||
|
rWrite(baseAddr+ADDR_WS,op.ws&((oplType==3)?7:3));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_RS: {
|
||||||
|
if (oplType<2) break;
|
||||||
|
int ops=(slots[3][c.chan]!=255 && chan[c.chan].state.ops==4 && oplType==3)?4:2;
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<ops; i++) {
|
||||||
|
unsigned char slot=slots[i][c.chan];
|
||||||
|
if (slot==255) continue;
|
||||||
|
unsigned short baseAddr=slotMap[slot];
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[(ops==4)?orderedOpsL[i]:i];
|
||||||
|
op.ksl=c.value2&3;
|
||||||
|
if (isMuted[c.chan]) {
|
||||||
|
rWrite(baseAddr+ADDR_KSL_TL,63|(op.ksl<<6));
|
||||||
|
} else {
|
||||||
|
if (isOutputL[ops==4][chan[c.chan].state.alg][i]) {
|
||||||
|
rWrite(baseAddr+ADDR_KSL_TL,(63-(((63-op.tl)*(chan[c.chan].outVol&0x3f))/63))|(op.ksl<<6));
|
||||||
|
} else {
|
||||||
|
rWrite(baseAddr+ADDR_KSL_TL,op.tl|(op.ksl<<6));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (c.value>=ops) break;
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[(ops==4)?orderedOpsL[c.value]:c.value];
|
||||||
|
op.ksl=c.value2&3;
|
||||||
|
unsigned char slot=slots[c.value][c.chan];
|
||||||
|
if (slot==255) break;
|
||||||
|
unsigned short baseAddr=slotMap[slot];
|
||||||
|
if (isMuted[c.chan]) {
|
||||||
|
rWrite(baseAddr+ADDR_KSL_TL,63|(op.ksl<<6));
|
||||||
|
} else {
|
||||||
|
if (isOutputL[ops==4][chan[c.chan].state.alg][c.value]) {
|
||||||
|
rWrite(baseAddr+ADDR_KSL_TL,(63-(((63-op.tl)*(chan[c.chan].outVol&0x3f))/63))|(op.ksl<<6));
|
||||||
|
} else {
|
||||||
|
rWrite(baseAddr+ADDR_KSL_TL,op.tl|(op.ksl<<6));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
case DIV_CMD_FM_EXTCH: {
|
case DIV_CMD_FM_EXTCH: {
|
||||||
if (!properDrumsSys) break;
|
if (!properDrumsSys) break;
|
||||||
properDrums=c.value;
|
properDrums=c.value;
|
||||||
|
|
@ -968,10 +1229,12 @@ void DivPlatformOPL::reset() {
|
||||||
properDrums=properDrumsSys;
|
properDrums=properDrumsSys;
|
||||||
if (oplType==3) {
|
if (oplType==3) {
|
||||||
chanMap=properDrums?chanMapOPL3Drums:chanMapOPL3;
|
chanMap=properDrums?chanMapOPL3Drums:chanMapOPL3;
|
||||||
|
outChanMap=outChanMapOPL3;
|
||||||
melodicChans=properDrums?15:18;
|
melodicChans=properDrums?15:18;
|
||||||
totalChans=properDrums?20:18;
|
totalChans=properDrums?20:18;
|
||||||
} else {
|
} else {
|
||||||
chanMap=properDrums?chanMapOPL2Drums:chanMapOPL2;
|
chanMap=properDrums?chanMapOPL2Drums:chanMapOPL2;
|
||||||
|
outChanMap=outChanMapOPL2;
|
||||||
melodicChans=properDrums?6:9;
|
melodicChans=properDrums?6:9;
|
||||||
totalChans=properDrums?11:9;
|
totalChans=properDrums?11:9;
|
||||||
}
|
}
|
||||||
|
|
@ -982,6 +1245,10 @@ void DivPlatformOPL::reset() {
|
||||||
chan[i].vol=0x3f;
|
chan[i].vol=0x3f;
|
||||||
chan[i].outVol=0x3f;
|
chan[i].outVol=0x3f;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for (int i=0; i<melodicChans; i++) {
|
||||||
|
fm.channel[outChanMap[i]].muted=isMuted[i];
|
||||||
|
}
|
||||||
|
|
||||||
for (int i=0; i<512; i++) {
|
for (int i=0; i<512; i++) {
|
||||||
oldWrites[i]=-1;
|
oldWrites[i]=-1;
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@
|
||||||
#include "../dispatch.h"
|
#include "../dispatch.h"
|
||||||
#include "../macroInt.h"
|
#include "../macroInt.h"
|
||||||
#include <queue>
|
#include <queue>
|
||||||
#include "../../../extern/Nuked-OPL3/opl3.h"
|
#include "../../../extern/opl/opl3.h"
|
||||||
|
|
||||||
class DivPlatformOPL: public DivDispatch {
|
class DivPlatformOPL: public DivDispatch {
|
||||||
protected:
|
protected:
|
||||||
|
|
|
||||||
|
|
@ -55,6 +55,36 @@ const char* DivPlatformOPLL::getEffectName(unsigned char effect) {
|
||||||
case 0x1b:
|
case 0x1b:
|
||||||
return "1Bxx: Set attack of operator 2 (0 to F)";
|
return "1Bxx: Set attack of operator 2 (0 to F)";
|
||||||
break;
|
break;
|
||||||
|
case 0x50:
|
||||||
|
return "50xy: Set AM (x: operator from 1 to 2 (0 for all ops); y: AM)";
|
||||||
|
break;
|
||||||
|
case 0x51:
|
||||||
|
return "51xy: Set sustain level (x: operator from 1 to 2 (0 for all ops); y: sustain)";
|
||||||
|
break;
|
||||||
|
case 0x52:
|
||||||
|
return "52xy: Set release (x: operator from 1 to 2 (0 for all ops); y: release)";
|
||||||
|
break;
|
||||||
|
case 0x53:
|
||||||
|
return "53xy: Set vibrato (x: operator from 1 to 2 (0 for all ops); y: enabled)";
|
||||||
|
break;
|
||||||
|
case 0x54:
|
||||||
|
return "54xy: Set key scale level (x: operator from 1 to 2 (0 for all ops); y: level from 0 to 3)";
|
||||||
|
break;
|
||||||
|
case 0x55:
|
||||||
|
return "55xy: Set envelope sustain (x: operator from 1 to 2 (0 for all ops); y: enabled)";
|
||||||
|
break;
|
||||||
|
case 0x56:
|
||||||
|
return "56xx: Set decay of all operators (0 to F)";
|
||||||
|
break;
|
||||||
|
case 0x57:
|
||||||
|
return "57xx: Set decay of operator 1 (0 to F)";
|
||||||
|
break;
|
||||||
|
case 0x58:
|
||||||
|
return "58xx: Set decay of operator 2 (0 to F)";
|
||||||
|
break;
|
||||||
|
case 0x5b:
|
||||||
|
return "5Bxy: Set whether key will scale envelope (x: operator from 1 to 2 (0 for all ops); y: enabled)";
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
@ -447,6 +477,7 @@ int DivPlatformOPLL::dispatch(DivCommand c) {
|
||||||
if (drums) {
|
if (drums) {
|
||||||
drums=false;
|
drums=false;
|
||||||
immWrite(0x0e,0);
|
immWrite(0x0e,0);
|
||||||
|
drumState=0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (c.chan<9) {
|
if (c.chan<9) {
|
||||||
|
|
@ -637,6 +668,150 @@ int DivPlatformOPLL::dispatch(DivCommand c) {
|
||||||
rWrite(0x05,(car.ar<<4)|(car.dr));
|
rWrite(0x05,(car.ar<<4)|(car.dr));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
case DIV_CMD_FM_DR: {
|
||||||
|
if (c.chan>=9 && !properDrums) return 0;
|
||||||
|
DivInstrumentFM::Operator& mod=chan[c.chan].state.op[0];
|
||||||
|
DivInstrumentFM::Operator& car=chan[c.chan].state.op[1];
|
||||||
|
if (c.value<0) {
|
||||||
|
mod.dr=c.value2&15;
|
||||||
|
car.dr=c.value2&15;
|
||||||
|
} else {
|
||||||
|
if (c.value==0) {
|
||||||
|
mod.dr=c.value2&15;
|
||||||
|
} else {
|
||||||
|
car.dr=c.value2&15;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
rWrite(0x04,(mod.ar<<4)|(mod.dr));
|
||||||
|
rWrite(0x05,(car.ar<<4)|(car.dr));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_SL: {
|
||||||
|
if (c.chan>=9 && !properDrums) return 0;
|
||||||
|
DivInstrumentFM::Operator& mod=chan[c.chan].state.op[0];
|
||||||
|
DivInstrumentFM::Operator& car=chan[c.chan].state.op[1];
|
||||||
|
if (c.value<0) {
|
||||||
|
mod.sl=c.value2&15;
|
||||||
|
car.sl=c.value2&15;
|
||||||
|
} else {
|
||||||
|
if (c.value==0) {
|
||||||
|
mod.sl=c.value2&15;
|
||||||
|
} else {
|
||||||
|
car.sl=c.value2&15;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
rWrite(0x06,(mod.sl<<4)|(mod.rr));
|
||||||
|
rWrite(0x07,(car.sl<<4)|(car.rr));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_RR: {
|
||||||
|
if (c.chan>=9 && !properDrums) return 0;
|
||||||
|
DivInstrumentFM::Operator& mod=chan[c.chan].state.op[0];
|
||||||
|
DivInstrumentFM::Operator& car=chan[c.chan].state.op[1];
|
||||||
|
if (c.value<0) {
|
||||||
|
mod.rr=c.value2&15;
|
||||||
|
car.rr=c.value2&15;
|
||||||
|
} else {
|
||||||
|
if (c.value==0) {
|
||||||
|
mod.rr=c.value2&15;
|
||||||
|
} else {
|
||||||
|
car.rr=c.value2&15;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
rWrite(0x06,(mod.sl<<4)|(mod.rr));
|
||||||
|
rWrite(0x07,(car.sl<<4)|(car.rr));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_AM: {
|
||||||
|
if (c.chan>=9 && !properDrums) return 0;
|
||||||
|
DivInstrumentFM::Operator& mod=chan[c.chan].state.op[0];
|
||||||
|
DivInstrumentFM::Operator& car=chan[c.chan].state.op[1];
|
||||||
|
if (c.value<0) {
|
||||||
|
mod.am=c.value2&1;
|
||||||
|
car.am=c.value2&1;
|
||||||
|
} else {
|
||||||
|
if (c.value==0) {
|
||||||
|
mod.am=c.value2&1;
|
||||||
|
} else {
|
||||||
|
car.am=c.value2&1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
rWrite(0x00,(mod.am<<7)|(mod.vib<<6)|((mod.ssgEnv&8)<<2)|(mod.ksr<<4)|(mod.mult));
|
||||||
|
rWrite(0x01,(car.am<<7)|(car.vib<<6)|((car.ssgEnv&8)<<2)|(car.ksr<<4)|(car.mult));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_VIB: {
|
||||||
|
if (c.chan>=9 && !properDrums) return 0;
|
||||||
|
DivInstrumentFM::Operator& mod=chan[c.chan].state.op[0];
|
||||||
|
DivInstrumentFM::Operator& car=chan[c.chan].state.op[1];
|
||||||
|
if (c.value<0) {
|
||||||
|
mod.vib=c.value2&1;
|
||||||
|
car.vib=c.value2&1;
|
||||||
|
} else {
|
||||||
|
if (c.value==0) {
|
||||||
|
mod.vib=c.value2&1;
|
||||||
|
} else {
|
||||||
|
car.vib=c.value2&1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
rWrite(0x00,(mod.am<<7)|(mod.vib<<6)|((mod.ssgEnv&8)<<2)|(mod.ksr<<4)|(mod.mult));
|
||||||
|
rWrite(0x01,(car.am<<7)|(car.vib<<6)|((car.ssgEnv&8)<<2)|(car.ksr<<4)|(car.mult));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_KSR: {
|
||||||
|
if (c.chan>=9 && !properDrums) return 0;
|
||||||
|
DivInstrumentFM::Operator& mod=chan[c.chan].state.op[0];
|
||||||
|
DivInstrumentFM::Operator& car=chan[c.chan].state.op[1];
|
||||||
|
if (c.value<0) {
|
||||||
|
mod.ksr=c.value2&1;
|
||||||
|
car.ksr=c.value2&1;
|
||||||
|
} else {
|
||||||
|
if (c.value==0) {
|
||||||
|
mod.ksr=c.value2&1;
|
||||||
|
} else {
|
||||||
|
car.ksr=c.value2&1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
rWrite(0x00,(mod.am<<7)|(mod.vib<<6)|((mod.ssgEnv&8)<<2)|(mod.ksr<<4)|(mod.mult));
|
||||||
|
rWrite(0x01,(car.am<<7)|(car.vib<<6)|((car.ssgEnv&8)<<2)|(car.ksr<<4)|(car.mult));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_SUS: {
|
||||||
|
if (c.chan>=9 && !properDrums) return 0;
|
||||||
|
DivInstrumentFM::Operator& mod=chan[c.chan].state.op[0];
|
||||||
|
DivInstrumentFM::Operator& car=chan[c.chan].state.op[1];
|
||||||
|
if (c.value<0) {
|
||||||
|
mod.ssgEnv=c.value2?8:0;
|
||||||
|
car.ssgEnv=c.value2?8:0;
|
||||||
|
} else {
|
||||||
|
if (c.value==0) {
|
||||||
|
mod.ssgEnv=c.value2?8:0;
|
||||||
|
} else {
|
||||||
|
car.ssgEnv=c.value2?8:0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
rWrite(0x00,(mod.am<<7)|(mod.vib<<6)|((mod.ssgEnv&8)<<2)|(mod.ksr<<4)|(mod.mult));
|
||||||
|
rWrite(0x01,(car.am<<7)|(car.vib<<6)|((car.ssgEnv&8)<<2)|(car.ksr<<4)|(car.mult));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_RS: {
|
||||||
|
if (c.chan>=9 && !properDrums) return 0;
|
||||||
|
DivInstrumentFM::Operator& mod=chan[c.chan].state.op[0];
|
||||||
|
DivInstrumentFM::Operator& car=chan[c.chan].state.op[1];
|
||||||
|
if (c.value<0) {
|
||||||
|
mod.ksl=c.value2&3;
|
||||||
|
car.ksl=c.value2&3;
|
||||||
|
} else {
|
||||||
|
if (c.value==0) {
|
||||||
|
mod.ksl=c.value2&3;
|
||||||
|
} else {
|
||||||
|
car.ksl=c.value2&3;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
rWrite(0x02,(mod.ksl<<6)|(mod.tl&63));
|
||||||
|
rWrite(0x03,(car.ksl<<6)|((chan[c.chan].state.fms&1)<<4)|((chan[c.chan].state.ams&1)<<3)|chan[c.chan].state.fb);
|
||||||
|
break;
|
||||||
|
}
|
||||||
case DIV_CMD_FM_EXTCH:
|
case DIV_CMD_FM_EXTCH:
|
||||||
if (!properDrumsSys) break;
|
if (!properDrumsSys) break;
|
||||||
if ((int)properDrums==c.value) break;
|
if ((int)properDrums==c.value) break;
|
||||||
|
|
|
||||||
|
|
@ -137,8 +137,84 @@ const char* DivPlatformTX81Z::getEffectName(unsigned char effect) {
|
||||||
case 0x1f:
|
case 0x1f:
|
||||||
return "1Fxx: Set PM depth (0 to 7F)";
|
return "1Fxx: Set PM depth (0 to 7F)";
|
||||||
break;
|
break;
|
||||||
case 0x30:
|
case 0x28:
|
||||||
return "30xx: Toggle hard envelope reset on new notes";
|
return "28xy: Set reverb (x: operator from 1 to 4 (0 for all ops); y: reverb from 0 to 7)";
|
||||||
|
break;
|
||||||
|
case 0x2a:
|
||||||
|
return "2Axy: Set waveform (x: operator from 1 to 4 (0 for all ops); y: waveform from 0 to 7)";
|
||||||
|
break;
|
||||||
|
case 0x2b:
|
||||||
|
return "2Bxy: Set envelope generator shift (x: operator from 1 to 4 (0 for all ops); y: shift from 0 to 3)";
|
||||||
|
break;
|
||||||
|
case 0x2c:
|
||||||
|
return "2Cxy: Set fine multiplier (x: operator from 1 to 4 (0 for all ops); y: fine)";
|
||||||
|
break;
|
||||||
|
case 0x2f:
|
||||||
|
return "2Fxx: Toggle hard envelope reset on new notes";
|
||||||
|
break;
|
||||||
|
case 0x30: case 0x31: case 0x32: case 0x33:
|
||||||
|
case 0x34: case 0x35: case 0x36: case 0x37:
|
||||||
|
return "3xyy: Set fixed frequency of operator 1 (x: octave from 0 to 7; y: frequency)";
|
||||||
|
break;
|
||||||
|
case 0x38: case 0x39: case 0x3a: case 0x3b:
|
||||||
|
case 0x3c: case 0x3d: case 0x3e: case 0x3f:
|
||||||
|
return "3xyy: Set fixed frequency of operator 2 (x: octave from 8 to F; y: frequency)";
|
||||||
|
break;
|
||||||
|
case 0x40: case 0x41: case 0x42: case 0x43:
|
||||||
|
case 0x44: case 0x45: case 0x46: case 0x47:
|
||||||
|
return "4xyy: Set fixed frequency of operator 3 (x: octave from 0 to 7; y: frequency)";
|
||||||
|
break;
|
||||||
|
case 0x48: case 0x49: case 0x4a: case 0x4b:
|
||||||
|
case 0x4c: case 0x4d: case 0x4e: case 0x4f:
|
||||||
|
return "4xyy: Set fixed frequency of operator 4 (x: octave from 8 to F; y: frequency)";
|
||||||
|
break;
|
||||||
|
case 0x50:
|
||||||
|
return "50xy: Set AM (x: operator from 1 to 4 (0 for all ops); y: AM)";
|
||||||
|
break;
|
||||||
|
case 0x51:
|
||||||
|
return "51xy: Set sustain level (x: operator from 1 to 4 (0 for all ops); y: sustain)";
|
||||||
|
break;
|
||||||
|
case 0x52:
|
||||||
|
return "52xy: Set release (x: operator from 1 to 4 (0 for all ops); y: release)";
|
||||||
|
break;
|
||||||
|
case 0x53:
|
||||||
|
return "53xy: Set detune (x: operator from 1 to 4 (0 for all ops); y: detune where 3 is center)";
|
||||||
|
break;
|
||||||
|
case 0x54:
|
||||||
|
return "54xy: Set envelope scale (x: operator from 1 to 4 (0 for all ops); y: scale from 0 to 3)";
|
||||||
|
break;
|
||||||
|
case 0x55:
|
||||||
|
return "55xy: Set detune 2 (x: operator from 1 to 4 (0 for all ops); y: detune from 0 to 3)";
|
||||||
|
break;
|
||||||
|
case 0x56:
|
||||||
|
return "56xx: Set decay of all operators (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x57:
|
||||||
|
return "57xx: Set decay of operator 1 (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x58:
|
||||||
|
return "58xx: Set decay of operator 2 (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x59:
|
||||||
|
return "59xx: Set decay of operator 3 (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x5a:
|
||||||
|
return "5Axx: Set decay of operator 4 (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x5b:
|
||||||
|
return "5Bxx: Set decay 2 of all operators (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x5c:
|
||||||
|
return "5Cxx: Set decay 2 of operator 1 (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x5d:
|
||||||
|
return "5Dxx: Set decay 2 of operator 2 (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x5e:
|
||||||
|
return "5Exx: Set decay 2 of operator 3 (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x5f:
|
||||||
|
return "5Fxx: Set decay 2 of operator 4 (0 to 1F)";
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
@ -604,8 +680,10 @@ int DivPlatformTX81Z::dispatch(DivCommand c) {
|
||||||
case DIV_CMD_FM_MULT: {
|
case DIV_CMD_FM_MULT: {
|
||||||
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
op.mult=c.value2&15;
|
if (!op.egt) {
|
||||||
rWrite(baseAddr+ADDR_MULT_DT,(op.mult&15)|((op.egt?(op.dt&7):dtTable[op.dt&7])<<4));
|
op.mult=c.value2&15;
|
||||||
|
rWrite(baseAddr+ADDR_MULT_DT,(op.mult&15)|((op.egt?(op.dt&7):dtTable[op.dt&7])<<4));
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case DIV_CMD_FM_TL: {
|
case DIV_CMD_FM_TL: {
|
||||||
|
|
@ -639,6 +717,221 @@ int DivPlatformTX81Z::dispatch(DivCommand c) {
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
case DIV_CMD_FM_RS: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
op.rs=c.value2&3;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_RS_AR,(op.ar&31)|(op.egt<<5)|(op.rs<<6));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.rs=c.value2&3;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_RS_AR,(op.ar&31)|(op.egt<<5)|(op.rs<<6));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_AM: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
op.am=c.value2&1;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_AM_DR,(op.dr&31)|(op.am<<7));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.am=c.value2&1;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_AM_DR,(op.dr&31)|(op.am<<7));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_DR: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
op.dr=c.value2&31;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_AM_DR,(op.dr&31)|(op.am<<7));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.dr=c.value2&31;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_AM_DR,(op.dr&31)|(op.am<<7));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_SL: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
op.sl=c.value2&15;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_SL_RR,(op.rr&15)|(op.sl<<4));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.sl=c.value2&15;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_SL_RR,(op.rr&15)|(op.sl<<4));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_RR: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
op.rr=c.value2&15;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_SL_RR,(op.rr&15)|(op.sl<<4));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.rr=c.value2&15;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_SL_RR,(op.rr&15)|(op.sl<<4));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_DT2: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
op.dt2=c.value2&3;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_DT2_D2R,(op.d2r&31)|(op.dt2<<6));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.dt2=c.value2&3;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_DT2_D2R,(op.d2r&31)|(op.dt2<<6));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_D2R: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
op.d2r=c.value2&31;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_DT2_D2R,(op.d2r&31)|(op.dt2<<6));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.d2r=c.value2&31;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_DT2_D2R,(op.d2r&31)|(op.dt2<<6));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_DT: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
if (!op.egt) {
|
||||||
|
op.dt=c.value&7;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_MULT_DT,(op.mult&15)|((op.egt?(op.dt&7):dtTable[op.dt&7])<<4));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
if (!op.egt) {
|
||||||
|
op.dt=c.value2&7;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_MULT_DT,(op.mult&15)|((op.egt?(op.dt&7):dtTable[op.dt&7])<<4));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_EG_SHIFT: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
op.ksl=c.value2&3;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_EGS_REV,(op.dam&7)|(op.ksl<<6));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.ksl=c.value2&3;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_EGS_REV,(op.dam&7)|(op.ksl<<6));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_REV: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
op.dam=c.value2&7;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_EGS_REV,(op.dam&7)|(op.ksl<<6));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.dam=c.value2&7;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_EGS_REV,(op.dam&7)|(op.ksl<<6));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_WS: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
op.ws=c.value2&7;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_WS_FINE,(op.dvb&15)|(op.ws<<4));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.ws=c.value2&7;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_WS_FINE,(op.dvb&15)|(op.ws<<4));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_FINE: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
if (!op.egt) {
|
||||||
|
op.dvb=c.value2&15;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_WS_FINE,(op.dvb&15)|(op.ws<<4));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
if (!op.egt) {
|
||||||
|
op.dvb=c.value2&15;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_WS_FINE,(op.dvb&15)|(op.ws<<4));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_FIXFREQ: {
|
||||||
|
if (c.value<0 || c.value>3) break;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.egt=(c.value2>0);
|
||||||
|
rWrite(baseAddr+ADDR_RS_AR,(op.ar&31)|(op.egt<<5)|(op.rs<<6));
|
||||||
|
if (op.egt) {
|
||||||
|
rWrite(baseAddr+ADDR_MULT_DT,((c.value2>>4)&15)|((c.value2>>8)&7));
|
||||||
|
rWrite(baseAddr+ADDR_WS_FINE,(c.value2&15)|(op.ws<<4));
|
||||||
|
} else {
|
||||||
|
rWrite(baseAddr+ADDR_MULT_DT,(op.mult&15)|((op.egt?(op.dt&7):dtTable[op.dt&7])<<4));
|
||||||
|
rWrite(baseAddr+ADDR_WS_FINE,(op.dvb&15)|(op.ws<<4));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
case DIV_CMD_FM_AM_DEPTH: {
|
case DIV_CMD_FM_AM_DEPTH: {
|
||||||
amDepth=c.value;
|
amDepth=c.value;
|
||||||
immWrite(0x19,amDepth);
|
immWrite(0x19,amDepth);
|
||||||
|
|
|
||||||
|
|
@ -397,6 +397,54 @@ const char* DivPlatformYM2610::getEffectName(unsigned char effect) {
|
||||||
case 0x30:
|
case 0x30:
|
||||||
return "30xx: Toggle hard envelope reset on new notes";
|
return "30xx: Toggle hard envelope reset on new notes";
|
||||||
break;
|
break;
|
||||||
|
case 0x50:
|
||||||
|
return "50xy: Set AM (x: operator from 1 to 4 (0 for all ops); y: AM)";
|
||||||
|
break;
|
||||||
|
case 0x51:
|
||||||
|
return "51xy: Set sustain level (x: operator from 1 to 4 (0 for all ops); y: sustain)";
|
||||||
|
break;
|
||||||
|
case 0x52:
|
||||||
|
return "52xy: Set release (x: operator from 1 to 4 (0 for all ops); y: release)";
|
||||||
|
break;
|
||||||
|
case 0x53:
|
||||||
|
return "53xy: Set detune (x: operator from 1 to 4 (0 for all ops); y: detune where 3 is center)";
|
||||||
|
break;
|
||||||
|
case 0x54:
|
||||||
|
return "54xy: Set envelope scale (x: operator from 1 to 4 (0 for all ops); y: scale from 0 to 3)";
|
||||||
|
break;
|
||||||
|
case 0x55:
|
||||||
|
return "55xy: Set SSG envelope (x: operator from 1 to 4 (0 for all ops); y: 0-7 on, 8 off)";
|
||||||
|
break;
|
||||||
|
case 0x56:
|
||||||
|
return "56xx: Set decay of all operators (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x57:
|
||||||
|
return "57xx: Set decay of operator 1 (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x58:
|
||||||
|
return "58xx: Set decay of operator 2 (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x59:
|
||||||
|
return "59xx: Set decay of operator 3 (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x5a:
|
||||||
|
return "5Axx: Set decay of operator 4 (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x5b:
|
||||||
|
return "5Bxx: Set decay 2 of all operators (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x5c:
|
||||||
|
return "5Cxx: Set decay 2 of operator 1 (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x5d:
|
||||||
|
return "5Dxx: Set decay 2 of operator 2 (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x5e:
|
||||||
|
return "5Exx: Set decay 2 of operator 3 (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x5f:
|
||||||
|
return "5Fxx: Set decay 2 of operator 4 (0 to 1F)";
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
@ -1088,6 +1136,134 @@ int DivPlatformYM2610::dispatch(DivCommand c) {
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
case DIV_CMD_FM_RS: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
op.rs=c.value2&3;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_RS_AR,(op.ar&31)|(op.rs<<6));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.rs=c.value2&3;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_RS_AR,(op.ar&31)|(op.rs<<6));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_AM: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
op.am=c.value2&1;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_AM_DR,(op.dr&31)|(op.am<<7));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.am=c.value2&1;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_AM_DR,(op.dr&31)|(op.am<<7));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_DR: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
op.dr=c.value2&31;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_AM_DR,(op.dr&31)|(op.am<<7));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.dr=c.value2&31;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_AM_DR,(op.dr&31)|(op.am<<7));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_SL: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
op.sl=c.value2&15;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_SL_RR,(op.rr&15)|(op.sl<<4));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.sl=c.value2&15;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_SL_RR,(op.rr&15)|(op.sl<<4));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_RR: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
op.rr=c.value2&15;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_SL_RR,(op.rr&15)|(op.sl<<4));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.rr=c.value2&15;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_SL_RR,(op.rr&15)|(op.sl<<4));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_D2R: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
op.d2r=c.value2&31;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_DT2_D2R,op.d2r&31);
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.d2r=c.value2&31;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_DT2_D2R,op.d2r&31);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_DT: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
op.dt=c.value&7;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_MULT_DT,(op.mult&15)|(dtTable[op.dt&7]<<4));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.dt=c.value2&7;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_MULT_DT,(op.mult&15)|(dtTable[op.dt&7]<<4));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_SSG: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
op.ssgEnv=8^(c.value2&15);
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_SSG,op.ssgEnv&15);
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.ssgEnv=8^(c.value2&15);
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_SSG,op.ssgEnv&15);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
case DIV_CMD_FM_HARD_RESET:
|
case DIV_CMD_FM_HARD_RESET:
|
||||||
chan[c.chan].hardReset=c.value;
|
chan[c.chan].hardReset=c.value;
|
||||||
break;
|
break;
|
||||||
|
|
|
||||||
|
|
@ -377,6 +377,54 @@ const char* DivPlatformYM2610B::getEffectName(unsigned char effect) {
|
||||||
case 0x30:
|
case 0x30:
|
||||||
return "30xx: Toggle hard envelope reset on new notes";
|
return "30xx: Toggle hard envelope reset on new notes";
|
||||||
break;
|
break;
|
||||||
|
case 0x50:
|
||||||
|
return "50xy: Set AM (x: operator from 1 to 4 (0 for all ops); y: AM)";
|
||||||
|
break;
|
||||||
|
case 0x51:
|
||||||
|
return "51xy: Set sustain level (x: operator from 1 to 4 (0 for all ops); y: sustain)";
|
||||||
|
break;
|
||||||
|
case 0x52:
|
||||||
|
return "52xy: Set release (x: operator from 1 to 4 (0 for all ops); y: release)";
|
||||||
|
break;
|
||||||
|
case 0x53:
|
||||||
|
return "53xy: Set detune (x: operator from 1 to 4 (0 for all ops); y: detune where 3 is center)";
|
||||||
|
break;
|
||||||
|
case 0x54:
|
||||||
|
return "54xy: Set envelope scale (x: operator from 1 to 4 (0 for all ops); y: scale from 0 to 3)";
|
||||||
|
break;
|
||||||
|
case 0x55:
|
||||||
|
return "55xy: Set SSG envelope (x: operator from 1 to 4 (0 for all ops); y: 0-7 on, 8 off)";
|
||||||
|
break;
|
||||||
|
case 0x56:
|
||||||
|
return "56xx: Set decay of all operators (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x57:
|
||||||
|
return "57xx: Set decay of operator 1 (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x58:
|
||||||
|
return "58xx: Set decay of operator 2 (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x59:
|
||||||
|
return "59xx: Set decay of operator 3 (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x5a:
|
||||||
|
return "5Axx: Set decay of operator 4 (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x5b:
|
||||||
|
return "5Bxx: Set decay 2 of all operators (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x5c:
|
||||||
|
return "5Cxx: Set decay 2 of operator 1 (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x5d:
|
||||||
|
return "5Dxx: Set decay 2 of operator 2 (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x5e:
|
||||||
|
return "5Exx: Set decay 2 of operator 3 (0 to 1F)";
|
||||||
|
break;
|
||||||
|
case 0x5f:
|
||||||
|
return "5Fxx: Set decay 2 of operator 4 (0 to 1F)";
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
@ -1066,6 +1114,134 @@ int DivPlatformYM2610B::dispatch(DivCommand c) {
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
case DIV_CMD_FM_RS: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
op.rs=c.value2&3;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_RS_AR,(op.ar&31)|(op.rs<<6));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.rs=c.value2&3;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_RS_AR,(op.ar&31)|(op.rs<<6));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_AM: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
op.am=c.value2&1;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_AM_DR,(op.dr&31)|(op.am<<7));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.am=c.value2&1;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_AM_DR,(op.dr&31)|(op.am<<7));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_DR: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
op.dr=c.value2&31;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_AM_DR,(op.dr&31)|(op.am<<7));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.dr=c.value2&31;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_AM_DR,(op.dr&31)|(op.am<<7));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_SL: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
op.sl=c.value2&15;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_SL_RR,(op.rr&15)|(op.sl<<4));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.sl=c.value2&15;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_SL_RR,(op.rr&15)|(op.sl<<4));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_RR: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
op.rr=c.value2&15;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_SL_RR,(op.rr&15)|(op.sl<<4));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.rr=c.value2&15;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_SL_RR,(op.rr&15)|(op.sl<<4));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_D2R: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
op.d2r=c.value2&31;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_DT2_D2R,op.d2r&31);
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.d2r=c.value2&31;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_DT2_D2R,op.d2r&31);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_DT: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
op.dt=c.value&7;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_MULT_DT,(op.mult&15)|(dtTable[op.dt&7]<<4));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.dt=c.value2&7;
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_MULT_DT,(op.mult&15)|(dtTable[op.dt&7]<<4));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_SSG: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
|
||||||
|
op.ssgEnv=8^(c.value2&15);
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_SSG,op.ssgEnv&15);
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[c.chan].state.op[orderedOps[c.value]];
|
||||||
|
op.ssgEnv=8^(c.value2&15);
|
||||||
|
unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_SSG,op.ssgEnv&15);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
case DIV_CMD_FM_HARD_RESET:
|
case DIV_CMD_FM_HARD_RESET:
|
||||||
chan[c.chan].hardReset=c.value;
|
chan[c.chan].hardReset=c.value;
|
||||||
break;
|
break;
|
||||||
|
|
|
||||||
|
|
@ -175,17 +175,146 @@ int DivPlatformYM2610BExt::dispatch(DivCommand c) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case DIV_CMD_FM_AR: {
|
case DIV_CMD_FM_AR: {
|
||||||
DivInstrument* ins=parent->getIns(opChan[ch].ins,DIV_INS_FM);
|
|
||||||
if (c.value<0) {
|
if (c.value<0) {
|
||||||
for (int i=0; i<4; i++) {
|
for (int i=0; i<4; i++) {
|
||||||
DivInstrumentFM::Operator op=ins->fm.op[i];
|
DivInstrumentFM::Operator& op=chan[2].state.op[i];
|
||||||
|
op.ar=c.value2&31;
|
||||||
unsigned short baseAddr=chanOffs[2]|opOffs[i];
|
unsigned short baseAddr=chanOffs[2]|opOffs[i];
|
||||||
rWrite(baseAddr+0x50,(c.value2&31)|(op.rs<<6));
|
rWrite(baseAddr+0x50,(op.ar&31)|(op.rs<<6));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
DivInstrumentFM::Operator op=ins->fm.op[orderedOps[c.value]];
|
DivInstrumentFM::Operator& op=chan[2].state.op[orderedOps[c.value]];
|
||||||
|
op.ar=c.value2&31;
|
||||||
unsigned short baseAddr=chanOffs[2]|opOffs[orderedOps[c.value]];
|
unsigned short baseAddr=chanOffs[2]|opOffs[orderedOps[c.value]];
|
||||||
rWrite(baseAddr+0x50,(c.value2&31)|(op.rs<<6));
|
rWrite(baseAddr+0x50,(op.ar&31)|(op.rs<<6));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_RS: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[2].state.op[i];
|
||||||
|
op.rs=c.value2&3;
|
||||||
|
unsigned short baseAddr=chanOffs[2]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_RS_AR,(op.ar&31)|(op.rs<<6));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[2].state.op[orderedOps[c.value]];
|
||||||
|
op.rs=c.value2&3;
|
||||||
|
unsigned short baseAddr=chanOffs[2]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_RS_AR,(op.ar&31)|(op.rs<<6));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_AM: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[2].state.op[i];
|
||||||
|
op.am=c.value2&1;
|
||||||
|
unsigned short baseAddr=chanOffs[2]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_AM_DR,(op.dr&31)|(op.am<<7));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[2].state.op[orderedOps[c.value]];
|
||||||
|
op.am=c.value2&1;
|
||||||
|
unsigned short baseAddr=chanOffs[2]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_AM_DR,(op.dr&31)|(op.am<<7));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_DR: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[2].state.op[i];
|
||||||
|
op.dr=c.value2&31;
|
||||||
|
unsigned short baseAddr=chanOffs[2]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_AM_DR,(op.dr&31)|(op.am<<7));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[2].state.op[orderedOps[c.value]];
|
||||||
|
op.dr=c.value2&31;
|
||||||
|
unsigned short baseAddr=chanOffs[2]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_AM_DR,(op.dr&31)|(op.am<<7));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_SL: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[2].state.op[i];
|
||||||
|
op.sl=c.value2&15;
|
||||||
|
unsigned short baseAddr=chanOffs[2]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_SL_RR,(op.rr&15)|(op.sl<<4));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[2].state.op[orderedOps[c.value]];
|
||||||
|
op.sl=c.value2&15;
|
||||||
|
unsigned short baseAddr=chanOffs[2]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_SL_RR,(op.rr&15)|(op.sl<<4));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_RR: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[2].state.op[i];
|
||||||
|
op.rr=c.value2&15;
|
||||||
|
unsigned short baseAddr=chanOffs[2]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_SL_RR,(op.rr&15)|(op.sl<<4));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[2].state.op[orderedOps[c.value]];
|
||||||
|
op.rr=c.value2&15;
|
||||||
|
unsigned short baseAddr=chanOffs[2]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_SL_RR,(op.rr&15)|(op.sl<<4));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_D2R: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[2].state.op[i];
|
||||||
|
op.d2r=c.value2&31;
|
||||||
|
unsigned short baseAddr=chanOffs[2]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_DT2_D2R,op.d2r&31);
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[2].state.op[orderedOps[c.value]];
|
||||||
|
op.d2r=c.value2&31;
|
||||||
|
unsigned short baseAddr=chanOffs[2]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_DT2_D2R,op.d2r&31);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_DT: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[2].state.op[i];
|
||||||
|
op.dt=c.value&7;
|
||||||
|
unsigned short baseAddr=chanOffs[2]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_MULT_DT,(op.mult&15)|(dtTable[op.dt&7]<<4));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[2].state.op[orderedOps[c.value]];
|
||||||
|
op.dt=c.value2&7;
|
||||||
|
unsigned short baseAddr=chanOffs[2]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_MULT_DT,(op.mult&15)|(dtTable[op.dt&7]<<4));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_SSG: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[2].state.op[i];
|
||||||
|
op.ssgEnv=8^(c.value2&15);
|
||||||
|
unsigned short baseAddr=chanOffs[2]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_SSG,op.ssgEnv&15);
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[2].state.op[orderedOps[c.value]];
|
||||||
|
op.ssgEnv=8^(c.value2&15);
|
||||||
|
unsigned short baseAddr=chanOffs[2]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_SSG,op.ssgEnv&15);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -175,17 +175,146 @@ int DivPlatformYM2610Ext::dispatch(DivCommand c) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case DIV_CMD_FM_AR: {
|
case DIV_CMD_FM_AR: {
|
||||||
DivInstrument* ins=parent->getIns(opChan[ch].ins,DIV_INS_FM);
|
|
||||||
if (c.value<0) {
|
if (c.value<0) {
|
||||||
for (int i=0; i<4; i++) {
|
for (int i=0; i<4; i++) {
|
||||||
DivInstrumentFM::Operator op=ins->fm.op[i];
|
DivInstrumentFM::Operator& op=chan[1].state.op[i];
|
||||||
|
op.ar=c.value2&31;
|
||||||
unsigned short baseAddr=chanOffs[1]|opOffs[i];
|
unsigned short baseAddr=chanOffs[1]|opOffs[i];
|
||||||
rWrite(baseAddr+0x50,(c.value2&31)|(op.rs<<6));
|
rWrite(baseAddr+0x50,(op.ar&31)|(op.rs<<6));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
DivInstrumentFM::Operator op=ins->fm.op[orderedOps[c.value]];
|
DivInstrumentFM::Operator& op=chan[1].state.op[orderedOps[c.value]];
|
||||||
|
op.ar=c.value2&31;
|
||||||
unsigned short baseAddr=chanOffs[1]|opOffs[orderedOps[c.value]];
|
unsigned short baseAddr=chanOffs[1]|opOffs[orderedOps[c.value]];
|
||||||
rWrite(baseAddr+0x50,(c.value2&31)|(op.rs<<6));
|
rWrite(baseAddr+0x50,(op.ar&31)|(op.rs<<6));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_RS: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[1].state.op[i];
|
||||||
|
op.rs=c.value2&3;
|
||||||
|
unsigned short baseAddr=chanOffs[1]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_RS_AR,(op.ar&31)|(op.rs<<6));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[1].state.op[orderedOps[c.value]];
|
||||||
|
op.rs=c.value2&3;
|
||||||
|
unsigned short baseAddr=chanOffs[1]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_RS_AR,(op.ar&31)|(op.rs<<6));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_AM: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[1].state.op[i];
|
||||||
|
op.am=c.value2&1;
|
||||||
|
unsigned short baseAddr=chanOffs[1]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_AM_DR,(op.dr&31)|(op.am<<7));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[1].state.op[orderedOps[c.value]];
|
||||||
|
op.am=c.value2&1;
|
||||||
|
unsigned short baseAddr=chanOffs[1]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_AM_DR,(op.dr&31)|(op.am<<7));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_DR: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[1].state.op[i];
|
||||||
|
op.dr=c.value2&31;
|
||||||
|
unsigned short baseAddr=chanOffs[1]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_AM_DR,(op.dr&31)|(op.am<<7));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[1].state.op[orderedOps[c.value]];
|
||||||
|
op.dr=c.value2&31;
|
||||||
|
unsigned short baseAddr=chanOffs[1]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_AM_DR,(op.dr&31)|(op.am<<7));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_SL: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[1].state.op[i];
|
||||||
|
op.sl=c.value2&15;
|
||||||
|
unsigned short baseAddr=chanOffs[1]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_SL_RR,(op.rr&15)|(op.sl<<4));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[1].state.op[orderedOps[c.value]];
|
||||||
|
op.sl=c.value2&15;
|
||||||
|
unsigned short baseAddr=chanOffs[1]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_SL_RR,(op.rr&15)|(op.sl<<4));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_RR: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[1].state.op[i];
|
||||||
|
op.rr=c.value2&15;
|
||||||
|
unsigned short baseAddr=chanOffs[1]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_SL_RR,(op.rr&15)|(op.sl<<4));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[1].state.op[orderedOps[c.value]];
|
||||||
|
op.rr=c.value2&15;
|
||||||
|
unsigned short baseAddr=chanOffs[1]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_SL_RR,(op.rr&15)|(op.sl<<4));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_D2R: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[1].state.op[i];
|
||||||
|
op.d2r=c.value2&31;
|
||||||
|
unsigned short baseAddr=chanOffs[1]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_DT2_D2R,op.d2r&31);
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[1].state.op[orderedOps[c.value]];
|
||||||
|
op.d2r=c.value2&31;
|
||||||
|
unsigned short baseAddr=chanOffs[1]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_DT2_D2R,op.d2r&31);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_DT: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[1].state.op[i];
|
||||||
|
op.dt=c.value&7;
|
||||||
|
unsigned short baseAddr=chanOffs[1]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_MULT_DT,(op.mult&15)|(dtTable[op.dt&7]<<4));
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[1].state.op[orderedOps[c.value]];
|
||||||
|
op.dt=c.value2&7;
|
||||||
|
unsigned short baseAddr=chanOffs[1]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_MULT_DT,(op.mult&15)|(dtTable[op.dt&7]<<4));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case DIV_CMD_FM_SSG: {
|
||||||
|
if (c.value<0) {
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[1].state.op[i];
|
||||||
|
op.ssgEnv=8^(c.value2&15);
|
||||||
|
unsigned short baseAddr=chanOffs[1]|opOffs[i];
|
||||||
|
rWrite(baseAddr+ADDR_SSG,op.ssgEnv&15);
|
||||||
|
}
|
||||||
|
} else if (c.value<4) {
|
||||||
|
DivInstrumentFM::Operator& op=chan[1].state.op[orderedOps[c.value]];
|
||||||
|
op.ssgEnv=8^(c.value2&15);
|
||||||
|
unsigned short baseAddr=chanOffs[1]|opOffs[orderedOps[c.value]];
|
||||||
|
rWrite(baseAddr+ADDR_SSG,op.ssgEnv&15);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -351,7 +351,7 @@ struct DivSong {
|
||||||
std::vector<DivSample*> sample;
|
std::vector<DivSample*> sample;
|
||||||
|
|
||||||
bool chanShow[DIV_MAX_CHANS];
|
bool chanShow[DIV_MAX_CHANS];
|
||||||
bool chanCollapse[DIV_MAX_CHANS];
|
unsigned char chanCollapse[DIV_MAX_CHANS];
|
||||||
|
|
||||||
DivInstrument nullIns, nullInsOPLL, nullInsOPL, nullInsQSound;
|
DivInstrument nullIns, nullInsOPLL, nullInsOPL, nullInsQSound;
|
||||||
DivWavetable nullWave;
|
DivWavetable nullWave;
|
||||||
|
|
@ -458,13 +458,39 @@ struct DivSong {
|
||||||
}
|
}
|
||||||
for (int i=0; i<DIV_MAX_CHANS; i++) {
|
for (int i=0; i<DIV_MAX_CHANS; i++) {
|
||||||
chanShow[i]=true;
|
chanShow[i]=true;
|
||||||
chanCollapse[i]=false;
|
chanCollapse[i]=0;
|
||||||
}
|
}
|
||||||
system[0]=DIV_SYSTEM_YM2612;
|
system[0]=DIV_SYSTEM_YM2612;
|
||||||
system[1]=DIV_SYSTEM_SMS;
|
system[1]=DIV_SYSTEM_SMS;
|
||||||
|
|
||||||
|
// OPLL default instrument contest winner - piano_guitar_idk by Weeppiko
|
||||||
nullInsOPLL.fm.opllPreset=0;
|
nullInsOPLL.fm.opllPreset=0;
|
||||||
|
nullInsOPLL.fm.alg=0;
|
||||||
|
nullInsOPLL.fm.fb=7;
|
||||||
|
nullInsOPLL.fm.fms=1;
|
||||||
|
nullInsOPLL.fm.ams=0;
|
||||||
|
nullInsOPLL.fm.op[0].ar=15;
|
||||||
|
nullInsOPLL.fm.op[0].dr=5;
|
||||||
|
nullInsOPLL.fm.op[0].sl=3;
|
||||||
|
nullInsOPLL.fm.op[0].rr=3;
|
||||||
|
nullInsOPLL.fm.op[0].tl=40;
|
||||||
|
nullInsOPLL.fm.op[0].ksl=0;
|
||||||
|
nullInsOPLL.fm.op[0].mult=5;
|
||||||
|
nullInsOPLL.fm.op[0].am=0;
|
||||||
|
nullInsOPLL.fm.op[0].vib=1;
|
||||||
|
nullInsOPLL.fm.op[0].ksr=0;
|
||||||
|
nullInsOPLL.fm.op[0].ssgEnv=8;
|
||||||
|
nullInsOPLL.fm.op[1].ar=15;
|
||||||
|
nullInsOPLL.fm.op[1].dr=1;
|
||||||
|
nullInsOPLL.fm.op[1].sl=11;
|
||||||
|
nullInsOPLL.fm.op[1].rr=6;
|
||||||
nullInsOPLL.fm.op[1].tl=0;
|
nullInsOPLL.fm.op[1].tl=0;
|
||||||
|
nullInsOPLL.fm.op[1].ksl=0;
|
||||||
|
nullInsOPLL.fm.op[1].mult=1;
|
||||||
|
nullInsOPLL.fm.op[1].am=0;
|
||||||
|
nullInsOPLL.fm.op[1].vib=0;
|
||||||
|
nullInsOPLL.fm.op[1].ksr=0;
|
||||||
|
nullInsOPLL.fm.op[1].ssgEnv=8;
|
||||||
nullInsOPLL.name="This is a bug! Report!";
|
nullInsOPLL.name="This is a bug! Report!";
|
||||||
|
|
||||||
nullInsOPL.fm.alg=0;
|
nullInsOPL.fm.alg=0;
|
||||||
|
|
|
||||||
|
|
@ -496,6 +496,7 @@ void DivEngine::registerSystems() {
|
||||||
OP_EFFECT_SINGLE(0x28,DIV_CMD_FM_REV,4,7);
|
OP_EFFECT_SINGLE(0x28,DIV_CMD_FM_REV,4,7);
|
||||||
OP_EFFECT_SINGLE(0x2a,DIV_CMD_FM_WS,4,7);
|
OP_EFFECT_SINGLE(0x2a,DIV_CMD_FM_WS,4,7);
|
||||||
OP_EFFECT_SINGLE(0x2b,DIV_CMD_FM_EG_SHIFT,4,3);
|
OP_EFFECT_SINGLE(0x2b,DIV_CMD_FM_EG_SHIFT,4,3);
|
||||||
|
OP_EFFECT_SINGLE(0x2c,DIV_CMD_FM_FINE,4,15);
|
||||||
default:
|
default:
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
@ -541,7 +542,6 @@ void DivEngine::registerSystems() {
|
||||||
OP_EFFECT_MULTI(0x58,DIV_CMD_FM_DR,1,15);
|
OP_EFFECT_MULTI(0x58,DIV_CMD_FM_DR,1,15);
|
||||||
|
|
||||||
OP_EFFECT_SINGLE(0x5b,DIV_CMD_FM_KSR,2,1);
|
OP_EFFECT_SINGLE(0x5b,DIV_CMD_FM_KSR,2,1);
|
||||||
OP_EFFECT_SINGLE(0x2a,DIV_CMD_FM_WS,4,7);
|
|
||||||
default:
|
default:
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
@ -607,6 +607,7 @@ void DivEngine::registerSystems() {
|
||||||
OP_EFFECT_MULTI(0x5a,DIV_CMD_FM_DR,3,15);
|
OP_EFFECT_MULTI(0x5a,DIV_CMD_FM_DR,3,15);
|
||||||
|
|
||||||
OP_EFFECT_SINGLE(0x5b,DIV_CMD_FM_KSR,4,1);
|
OP_EFFECT_SINGLE(0x5b,DIV_CMD_FM_KSR,4,1);
|
||||||
|
OP_EFFECT_SINGLE(0x2a,DIV_CMD_FM_WS,4,7);
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return false;
|
return false;
|
||||||
|
|
|
||||||
|
|
@ -83,10 +83,10 @@ void FurnaceGUI::finishSelection() {
|
||||||
if (cursor.y<0) cursor.y=0;
|
if (cursor.y<0) cursor.y=0;
|
||||||
if (cursor.y>=e->song.patLen) cursor.y=e->song.patLen-1;
|
if (cursor.y>=e->song.patLen) cursor.y=e->song.patLen-1;
|
||||||
|
|
||||||
if (e->song.chanCollapse[selEnd.xCoarse]) {
|
if (e->song.chanCollapse[selStart.xCoarse]==3) {
|
||||||
selStart.xFine=0;
|
selStart.xFine=0;
|
||||||
}
|
}
|
||||||
if (e->song.chanCollapse[selEnd.xCoarse]) {
|
if (e->song.chanCollapse[selEnd.xCoarse] && selEnd.xFine>=(3-e->song.chanCollapse[selEnd.xCoarse])) {
|
||||||
selEnd.xFine=2+e->song.pat[cursor.xCoarse].effectCols*2;
|
selEnd.xFine=2+e->song.pat[cursor.xCoarse].effectCols*2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -105,7 +105,7 @@ void FurnaceGUI::moveCursor(int x, int y, bool select) {
|
||||||
demandScrollX=true;
|
demandScrollX=true;
|
||||||
if (x>0) {
|
if (x>0) {
|
||||||
for (int i=0; i<x; i++) {
|
for (int i=0; i<x; i++) {
|
||||||
if (++cursor.xFine>=(e->song.chanCollapse[cursor.xCoarse]?1:(3+e->song.pat[cursor.xCoarse].effectCols*2))) {
|
if (++cursor.xFine>=(e->song.chanCollapse[cursor.xCoarse]?(4-e->song.chanCollapse[cursor.xCoarse]):(3+e->song.pat[cursor.xCoarse].effectCols*2))) {
|
||||||
cursor.xFine=0;
|
cursor.xFine=0;
|
||||||
if (++cursor.xCoarse>=lastChannel) {
|
if (++cursor.xCoarse>=lastChannel) {
|
||||||
if (settings.wrapHorizontal!=0 && !select) {
|
if (settings.wrapHorizontal!=0 && !select) {
|
||||||
|
|
@ -113,7 +113,7 @@ void FurnaceGUI::moveCursor(int x, int y, bool select) {
|
||||||
if (settings.wrapHorizontal==2) y++;
|
if (settings.wrapHorizontal==2) y++;
|
||||||
} else {
|
} else {
|
||||||
cursor.xCoarse=lastChannel-1;
|
cursor.xCoarse=lastChannel-1;
|
||||||
cursor.xFine=e->song.chanCollapse[cursor.xCoarse]?0:(2+e->song.pat[cursor.xCoarse].effectCols*2);
|
cursor.xFine=e->song.chanCollapse[cursor.xCoarse]?(3-e->song.chanCollapse[cursor.xCoarse]):(2+e->song.pat[cursor.xCoarse].effectCols*2);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
while (!e->song.chanShow[cursor.xCoarse]) {
|
while (!e->song.chanShow[cursor.xCoarse]) {
|
||||||
|
|
@ -141,7 +141,7 @@ void FurnaceGUI::moveCursor(int x, int y, bool select) {
|
||||||
if (cursor.xCoarse<0) break;
|
if (cursor.xCoarse<0) break;
|
||||||
}
|
}
|
||||||
if (e->song.chanCollapse[cursor.xCoarse]) {
|
if (e->song.chanCollapse[cursor.xCoarse]) {
|
||||||
cursor.xFine=0;
|
cursor.xFine=3-e->song.chanCollapse[cursor.xCoarse];
|
||||||
} else {
|
} else {
|
||||||
cursor.xFine=2+e->song.pat[cursor.xCoarse].effectCols*2;
|
cursor.xFine=2+e->song.pat[cursor.xCoarse].effectCols*2;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,7 @@ void FurnaceGUI::drawInsList() {
|
||||||
}
|
}
|
||||||
ImGui::SameLine();
|
ImGui::SameLine();
|
||||||
if (ImGui::Button(ICON_FA_FOLDER_OPEN "##InsLoad")) {
|
if (ImGui::Button(ICON_FA_FOLDER_OPEN "##InsLoad")) {
|
||||||
doAction(GUI_ACTION_INS_LIST_OPEN);
|
doAction((settings.insLoadAlwaysReplace && curIns>=0 && curIns<=(int)e->song.ins.size())?GUI_ACTION_INS_LIST_OPEN_REPLACE:GUI_ACTION_INS_LIST_OPEN);
|
||||||
}
|
}
|
||||||
ImGui::SameLine();
|
ImGui::SameLine();
|
||||||
if (ImGui::Button(ICON_FA_FLOPPY_O "##InsSave")) {
|
if (ImGui::Button(ICON_FA_FLOPPY_O "##InsSave")) {
|
||||||
|
|
|
||||||
|
|
@ -518,6 +518,9 @@ void FurnaceGUI::doAction(int what) {
|
||||||
case GUI_ACTION_INS_LIST_OPEN:
|
case GUI_ACTION_INS_LIST_OPEN:
|
||||||
openFileDialog(GUI_FILE_INS_OPEN);
|
openFileDialog(GUI_FILE_INS_OPEN);
|
||||||
break;
|
break;
|
||||||
|
case GUI_ACTION_INS_LIST_OPEN_REPLACE:
|
||||||
|
openFileDialog(GUI_FILE_INS_OPEN_REPLACE);
|
||||||
|
break;
|
||||||
case GUI_ACTION_INS_LIST_SAVE:
|
case GUI_ACTION_INS_LIST_SAVE:
|
||||||
if (curIns>=0 && curIns<(int)e->song.ins.size()) openFileDialog(GUI_FILE_INS_SAVE);
|
if (curIns>=0 && curIns<(int)e->song.ins.size()) openFileDialog(GUI_FILE_INS_SAVE);
|
||||||
break;
|
break;
|
||||||
|
|
|
||||||
|
|
@ -1259,9 +1259,9 @@ void FurnaceGUI::openFileDialog(FurnaceGUIFileDialogs type) {
|
||||||
if (!dirExists(workingDirSong)) workingDirSong=getHomeDir();
|
if (!dirExists(workingDirSong)) workingDirSong=getHomeDir();
|
||||||
hasOpened=fileDialog->openLoad(
|
hasOpened=fileDialog->openLoad(
|
||||||
"Open File",
|
"Open File",
|
||||||
{"compatible files", "*.fur *.dmf *.mod",
|
{"compatible files", "*.fur *.dmf *.mod *.ftm",
|
||||||
"all files", ".*"},
|
"all files", ".*"},
|
||||||
"compatible files{.fur,.dmf,.mod},.*",
|
"compatible files{.fur,.dmf,.mod,.ftm},.*",
|
||||||
workingDirSong,
|
workingDirSong,
|
||||||
dpiScale
|
dpiScale
|
||||||
);
|
);
|
||||||
|
|
@ -1288,7 +1288,14 @@ void FurnaceGUI::openFileDialog(FurnaceGUIFileDialogs type) {
|
||||||
);
|
);
|
||||||
break;
|
break;
|
||||||
case GUI_FILE_INS_OPEN:
|
case GUI_FILE_INS_OPEN:
|
||||||
|
case GUI_FILE_INS_OPEN_REPLACE:
|
||||||
prevIns=-3;
|
prevIns=-3;
|
||||||
|
if (prevInsData!=NULL) {
|
||||||
|
delete prevInsData;
|
||||||
|
prevInsData=NULL;
|
||||||
|
}
|
||||||
|
prevInsData=new DivInstrument;
|
||||||
|
*prevInsData=*e->getIns(curIns);
|
||||||
if (!dirExists(workingDirIns)) workingDirIns=getHomeDir();
|
if (!dirExists(workingDirIns)) workingDirIns=getHomeDir();
|
||||||
hasOpened=fileDialog->openLoad(
|
hasOpened=fileDialog->openLoad(
|
||||||
"Load Instrument",
|
"Load Instrument",
|
||||||
|
|
@ -1300,11 +1307,20 @@ void FurnaceGUI::openFileDialog(FurnaceGUIFileDialogs type) {
|
||||||
[this](const char* path) {
|
[this](const char* path) {
|
||||||
std::vector<DivInstrument*> instruments=e->instrumentFromFile(path);
|
std::vector<DivInstrument*> instruments=e->instrumentFromFile(path);
|
||||||
if (!instruments.empty()) {
|
if (!instruments.empty()) {
|
||||||
e->loadTempIns(instruments[0]);
|
if (curFileDialog==GUI_FILE_INS_OPEN_REPLACE) {
|
||||||
if (curIns!=-2) {
|
if (prevIns==-3) {
|
||||||
prevIns=curIns;
|
prevIns=curIns;
|
||||||
|
}
|
||||||
|
if (prevIns>=0 && prevIns<=(int)e->song.ins.size()) {
|
||||||
|
*e->song.ins[prevIns]=*instruments[0];
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
e->loadTempIns(instruments[0]);
|
||||||
|
if (curIns!=-2) {
|
||||||
|
prevIns=curIns;
|
||||||
|
}
|
||||||
|
curIns=-2;
|
||||||
}
|
}
|
||||||
curIns=-2;
|
|
||||||
}
|
}
|
||||||
for (DivInstrument* i: instruments) delete i;
|
for (DivInstrument* i: instruments) delete i;
|
||||||
}
|
}
|
||||||
|
|
@ -1750,8 +1766,11 @@ void FurnaceGUI::processDrags(int dragX, int dragY) {
|
||||||
if (macroLoopDragLen>0) {
|
if (macroLoopDragLen>0) {
|
||||||
int x=(dragX-macroLoopDragStart.x)*macroLoopDragLen/MAX(1,macroLoopDragAreaSize.x);
|
int x=(dragX-macroLoopDragStart.x)*macroLoopDragLen/MAX(1,macroLoopDragAreaSize.x);
|
||||||
if (x<0) x=0;
|
if (x<0) x=0;
|
||||||
if (x>=macroLoopDragLen) x=-1;
|
if (x>=macroLoopDragLen) {
|
||||||
x+=macroDragScroll;
|
x=-1;
|
||||||
|
} else {
|
||||||
|
x+=macroDragScroll;
|
||||||
|
}
|
||||||
*macroLoopDragTarget=x;
|
*macroLoopDragTarget=x;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -2416,6 +2435,13 @@ bool FurnaceGUI::loop() {
|
||||||
}
|
}
|
||||||
|
|
||||||
wantCaptureKeyboard=ImGui::GetIO().WantTextInput;
|
wantCaptureKeyboard=ImGui::GetIO().WantTextInput;
|
||||||
|
|
||||||
|
if (wantCaptureKeyboard) {
|
||||||
|
WAKE_UP;
|
||||||
|
}
|
||||||
|
if (ImGui::GetIO().MouseDown[0] || ImGui::GetIO().MouseDown[1] || ImGui::GetIO().MouseDown[2] || ImGui::GetIO().MouseDown[3] || ImGui::GetIO().MouseDown[4]) {
|
||||||
|
WAKE_UP;
|
||||||
|
}
|
||||||
|
|
||||||
while (true) {
|
while (true) {
|
||||||
midiLock.lock();
|
midiLock.lock();
|
||||||
|
|
@ -2559,6 +2585,7 @@ bool FurnaceGUI::loop() {
|
||||||
ImGui_ImplSDL2_NewFrame(sdlWin);
|
ImGui_ImplSDL2_NewFrame(sdlWin);
|
||||||
ImGui::NewFrame();
|
ImGui::NewFrame();
|
||||||
|
|
||||||
|
curWindowLast=curWindow;
|
||||||
curWindow=GUI_WINDOW_NOTHING;
|
curWindow=GUI_WINDOW_NOTHING;
|
||||||
editOptsVisible=false;
|
editOptsVisible=false;
|
||||||
|
|
||||||
|
|
@ -2900,8 +2927,16 @@ bool FurnaceGUI::loop() {
|
||||||
if (fileDialog->render(ImVec2(600.0f*dpiScale,400.0f*dpiScale),ImVec2(scrW*dpiScale,scrH*dpiScale))) {
|
if (fileDialog->render(ImVec2(600.0f*dpiScale,400.0f*dpiScale),ImVec2(scrW*dpiScale,scrH*dpiScale))) {
|
||||||
bool openOpen=false;
|
bool openOpen=false;
|
||||||
//ImGui::GetIO().ConfigFlags&=~ImGuiConfigFlags_NavEnableKeyboard;
|
//ImGui::GetIO().ConfigFlags&=~ImGuiConfigFlags_NavEnableKeyboard;
|
||||||
if (curFileDialog==GUI_FILE_INS_OPEN && prevIns!=-3) {
|
if ((curFileDialog==GUI_FILE_INS_OPEN || curFileDialog==GUI_FILE_INS_OPEN_REPLACE) && prevIns!=-3) {
|
||||||
curIns=prevIns;
|
if (curFileDialog==GUI_FILE_INS_OPEN_REPLACE) {
|
||||||
|
if (prevInsData!=NULL) {
|
||||||
|
if (prevIns>=0 && prevIns<(int)e->song.ins.size()) {
|
||||||
|
*e->song.ins[prevIns]=*prevInsData;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
curIns=prevIns;
|
||||||
|
}
|
||||||
prevIns=-3;
|
prevIns=-3;
|
||||||
}
|
}
|
||||||
switch (curFileDialog) {
|
switch (curFileDialog) {
|
||||||
|
|
@ -2911,6 +2946,7 @@ bool FurnaceGUI::loop() {
|
||||||
workingDirSong=fileDialog->getPath()+DIR_SEPARATOR_STR;
|
workingDirSong=fileDialog->getPath()+DIR_SEPARATOR_STR;
|
||||||
break;
|
break;
|
||||||
case GUI_FILE_INS_OPEN:
|
case GUI_FILE_INS_OPEN:
|
||||||
|
case GUI_FILE_INS_OPEN_REPLACE:
|
||||||
case GUI_FILE_INS_SAVE:
|
case GUI_FILE_INS_SAVE:
|
||||||
workingDirIns=fileDialog->getPath()+DIR_SEPARATOR_STR;
|
workingDirIns=fileDialog->getPath()+DIR_SEPARATOR_STR;
|
||||||
break;
|
break;
|
||||||
|
|
@ -3090,6 +3126,25 @@ bool FurnaceGUI::loop() {
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
case GUI_FILE_INS_OPEN_REPLACE: {
|
||||||
|
std::vector<DivInstrument*> instruments=e->instrumentFromFile(copyOfName.c_str());
|
||||||
|
if (!instruments.empty()) {
|
||||||
|
if (!e->getWarnings().empty()) {
|
||||||
|
showWarning(e->getWarnings(),GUI_WARN_GENERIC);
|
||||||
|
}
|
||||||
|
if (curIns>=0 && curIns<(int)e->song.ins.size()) {
|
||||||
|
*e->song.ins[curIns]=*instruments[curIns];
|
||||||
|
} else {
|
||||||
|
showError("...but you haven't selected an instrument!");
|
||||||
|
}
|
||||||
|
for (DivInstrument* i: instruments) {
|
||||||
|
delete i;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
showError("cannot load instrument! ("+e->getLastError()+")");
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
case GUI_FILE_WAVE_OPEN:
|
case GUI_FILE_WAVE_OPEN:
|
||||||
e->addWaveFromFile(copyOfName.c_str());
|
e->addWaveFromFile(copyOfName.c_str());
|
||||||
MARK_MODIFIED;
|
MARK_MODIFIED;
|
||||||
|
|
@ -3805,6 +3860,7 @@ FurnaceGUI::FurnaceGUI():
|
||||||
patFont(NULL),
|
patFont(NULL),
|
||||||
bigFont(NULL),
|
bigFont(NULL),
|
||||||
fontRange(NULL),
|
fontRange(NULL),
|
||||||
|
prevInsData(NULL),
|
||||||
curIns(0),
|
curIns(0),
|
||||||
curWave(0),
|
curWave(0),
|
||||||
curSample(0),
|
curSample(0),
|
||||||
|
|
@ -3903,6 +3959,7 @@ FurnaceGUI::FurnaceGUI():
|
||||||
nonLatchNibble(false),
|
nonLatchNibble(false),
|
||||||
curWindow(GUI_WINDOW_NOTHING),
|
curWindow(GUI_WINDOW_NOTHING),
|
||||||
nextWindow(GUI_WINDOW_NOTHING),
|
nextWindow(GUI_WINDOW_NOTHING),
|
||||||
|
curWindowLast(GUI_WINDOW_NOTHING),
|
||||||
nextDesc(NULL),
|
nextDesc(NULL),
|
||||||
latchNote(-1),
|
latchNote(-1),
|
||||||
latchIns(-2),
|
latchIns(-2),
|
||||||
|
|
|
||||||
|
|
@ -239,6 +239,7 @@ enum FurnaceGUIFileDialogs {
|
||||||
GUI_FILE_SAVE,
|
GUI_FILE_SAVE,
|
||||||
GUI_FILE_SAVE_DMF_LEGACY,
|
GUI_FILE_SAVE_DMF_LEGACY,
|
||||||
GUI_FILE_INS_OPEN,
|
GUI_FILE_INS_OPEN,
|
||||||
|
GUI_FILE_INS_OPEN_REPLACE,
|
||||||
GUI_FILE_INS_SAVE,
|
GUI_FILE_INS_SAVE,
|
||||||
GUI_FILE_WAVE_OPEN,
|
GUI_FILE_WAVE_OPEN,
|
||||||
GUI_FILE_WAVE_SAVE,
|
GUI_FILE_WAVE_SAVE,
|
||||||
|
|
@ -406,6 +407,7 @@ enum FurnaceGUIActions {
|
||||||
GUI_ACTION_INS_LIST_ADD,
|
GUI_ACTION_INS_LIST_ADD,
|
||||||
GUI_ACTION_INS_LIST_DUPLICATE,
|
GUI_ACTION_INS_LIST_DUPLICATE,
|
||||||
GUI_ACTION_INS_LIST_OPEN,
|
GUI_ACTION_INS_LIST_OPEN,
|
||||||
|
GUI_ACTION_INS_LIST_OPEN_REPLACE,
|
||||||
GUI_ACTION_INS_LIST_SAVE,
|
GUI_ACTION_INS_LIST_SAVE,
|
||||||
GUI_ACTION_INS_LIST_MOVE_UP,
|
GUI_ACTION_INS_LIST_MOVE_UP,
|
||||||
GUI_ACTION_INS_LIST_MOVE_DOWN,
|
GUI_ACTION_INS_LIST_MOVE_DOWN,
|
||||||
|
|
@ -855,6 +857,7 @@ class FurnaceGUI {
|
||||||
int eventDelay;
|
int eventDelay;
|
||||||
int moveWindowTitle;
|
int moveWindowTitle;
|
||||||
int hiddenSystems;
|
int hiddenSystems;
|
||||||
|
int insLoadAlwaysReplace;
|
||||||
unsigned int maxUndoSteps;
|
unsigned int maxUndoSteps;
|
||||||
String mainFontPath;
|
String mainFontPath;
|
||||||
String patFontPath;
|
String patFontPath;
|
||||||
|
|
@ -937,6 +940,7 @@ class FurnaceGUI {
|
||||||
eventDelay(0),
|
eventDelay(0),
|
||||||
moveWindowTitle(0),
|
moveWindowTitle(0),
|
||||||
hiddenSystems(0),
|
hiddenSystems(0),
|
||||||
|
insLoadAlwaysReplace(1),
|
||||||
maxUndoSteps(100),
|
maxUndoSteps(100),
|
||||||
mainFontPath(""),
|
mainFontPath(""),
|
||||||
patFontPath(""),
|
patFontPath(""),
|
||||||
|
|
@ -947,6 +951,8 @@ class FurnaceGUI {
|
||||||
|
|
||||||
char finalLayoutPath[4096];
|
char finalLayoutPath[4096];
|
||||||
|
|
||||||
|
DivInstrument* prevInsData;
|
||||||
|
|
||||||
int curIns, curWave, curSample, curOctave, curOrder, prevIns, oldRow, oldOrder, oldOrder1, editStep, exportLoops, soloChan, soloTimeout, orderEditMode, orderCursor;
|
int curIns, curWave, curSample, curOctave, curOrder, prevIns, oldRow, oldOrder, oldOrder1, editStep, exportLoops, soloChan, soloTimeout, orderEditMode, orderCursor;
|
||||||
int loopOrder, loopRow, loopEnd, isClipping, extraChannelButtons, patNameTarget, newSongCategory, latchTarget;
|
int loopOrder, loopRow, loopEnd, isClipping, extraChannelButtons, patNameTarget, newSongCategory, latchTarget;
|
||||||
int wheelX, wheelY;
|
int wheelX, wheelY;
|
||||||
|
|
@ -966,7 +972,7 @@ class FurnaceGUI {
|
||||||
SelectionPoint selStart, selEnd, cursor;
|
SelectionPoint selStart, selEnd, cursor;
|
||||||
bool selecting, curNibble, orderNibble, followOrders, followPattern, changeAllOrders;
|
bool selecting, curNibble, orderNibble, followOrders, followPattern, changeAllOrders;
|
||||||
bool collapseWindow, demandScrollX, fancyPattern, wantPatName, firstFrame, tempoView, waveHex, lockLayout, editOptsVisible, latchNibble, nonLatchNibble;
|
bool collapseWindow, demandScrollX, fancyPattern, wantPatName, firstFrame, tempoView, waveHex, lockLayout, editOptsVisible, latchNibble, nonLatchNibble;
|
||||||
FurnaceGUIWindows curWindow, nextWindow;
|
FurnaceGUIWindows curWindow, nextWindow, curWindowLast;
|
||||||
float peak[2];
|
float peak[2];
|
||||||
float patChanX[DIV_MAX_CHANS+1];
|
float patChanX[DIV_MAX_CHANS+1];
|
||||||
float patChanSlideY[DIV_MAX_CHANS+1];
|
float patChanSlideY[DIV_MAX_CHANS+1];
|
||||||
|
|
|
||||||
|
|
@ -233,22 +233,22 @@ const FurnaceGUIColors fxColors[256]={
|
||||||
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
|
|
||||||
// 50-5F
|
// 50-5F
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
|
|
||||||
// 60-6F
|
// 60-6F
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
||||||
|
|
@ -560,6 +560,7 @@ const FurnaceGUIActionDef guiActions[GUI_ACTION_MAX]={
|
||||||
D("INS_LIST_ADD", "Add", SDLK_INSERT),
|
D("INS_LIST_ADD", "Add", SDLK_INSERT),
|
||||||
D("INS_LIST_DUPLICATE", "Duplicate", FURKMOD_CMD|SDLK_d),
|
D("INS_LIST_DUPLICATE", "Duplicate", FURKMOD_CMD|SDLK_d),
|
||||||
D("INS_LIST_OPEN", "Open", 0),
|
D("INS_LIST_OPEN", "Open", 0),
|
||||||
|
D("INS_LIST_OPEN_REPLACE", "Open (replace current)", 0),
|
||||||
D("INS_LIST_SAVE", "Save", 0),
|
D("INS_LIST_SAVE", "Save", 0),
|
||||||
D("INS_LIST_MOVE_UP", "Move up", FURKMOD_SHIFT|SDLK_UP),
|
D("INS_LIST_MOVE_UP", "Move up", FURKMOD_SHIFT|SDLK_UP),
|
||||||
D("INS_LIST_MOVE_DOWN", "Move down", FURKMOD_SHIFT|SDLK_DOWN),
|
D("INS_LIST_MOVE_DOWN", "Move down", FURKMOD_SHIFT|SDLK_DOWN),
|
||||||
|
|
|
||||||
|
|
@ -1078,7 +1078,7 @@ void FurnaceGUI::drawGBEnv(unsigned char vol, unsigned char len, unsigned char s
|
||||||
if (displayLoop) { \
|
if (displayLoop) { \
|
||||||
ImGui::SetNextItemWidth(lenAvail); \
|
ImGui::SetNextItemWidth(lenAvail); \
|
||||||
if (ImGui::InputScalar("##IMacroLen_" macroName,ImGuiDataType_U8,¯o.len,&_ONE,&_THREE)) { MARK_MODIFIED \
|
if (ImGui::InputScalar("##IMacroLen_" macroName,ImGuiDataType_U8,¯o.len,&_ONE,&_THREE)) { MARK_MODIFIED \
|
||||||
if (macro.len>127) macro.len=127; \
|
if (macro.len>128) macro.len=128; \
|
||||||
} \
|
} \
|
||||||
if (macroMode) { \
|
if (macroMode) { \
|
||||||
bool modeVal=macro.mode; \
|
bool modeVal=macro.mode; \
|
||||||
|
|
@ -1178,7 +1178,7 @@ void FurnaceGUI::drawGBEnv(unsigned char vol, unsigned char len, unsigned char s
|
||||||
if (displayLoop) { \
|
if (displayLoop) { \
|
||||||
ImGui::SetNextItemWidth(lenAvail); \
|
ImGui::SetNextItemWidth(lenAvail); \
|
||||||
if (ImGui::InputScalar("##IOPMacroLen_" #op macroName,ImGuiDataType_U8,¯o.len,&_ONE,&_THREE)) { MARK_MODIFIED \
|
if (ImGui::InputScalar("##IOPMacroLen_" #op macroName,ImGuiDataType_U8,¯o.len,&_ONE,&_THREE)) { MARK_MODIFIED \
|
||||||
if (macro.len>127) macro.len=127; \
|
if (macro.len>128) macro.len=128; \
|
||||||
} \
|
} \
|
||||||
if (macroMode) { \
|
if (macroMode) { \
|
||||||
bool modeVal=macro.mode; \
|
bool modeVal=macro.mode; \
|
||||||
|
|
@ -1267,14 +1267,14 @@ if (ImGui::BeginTable("MacroSpace",2)) { \
|
||||||
ImGui::Dummy(ImVec2(120.0f*dpiScale,dpiScale)); \
|
ImGui::Dummy(ImVec2(120.0f*dpiScale,dpiScale)); \
|
||||||
ImGui::TableNextColumn(); \
|
ImGui::TableNextColumn(); \
|
||||||
float availableWidth=ImGui::GetContentRegionAvail().x-reservedSpace; \
|
float availableWidth=ImGui::GetContentRegionAvail().x-reservedSpace; \
|
||||||
int totalFit=MIN(127,availableWidth/MAX(1,macroPointSize*dpiScale)); \
|
int totalFit=MIN(128,availableWidth/MAX(1,macroPointSize*dpiScale)); \
|
||||||
if (macroDragScroll>127-totalFit) { \
|
if (macroDragScroll>128-totalFit) { \
|
||||||
macroDragScroll=127-totalFit; \
|
macroDragScroll=128-totalFit; \
|
||||||
} \
|
} \
|
||||||
ImGui::SetNextItemWidth(availableWidth); \
|
ImGui::SetNextItemWidth(availableWidth); \
|
||||||
if (CWSliderInt("##MacroScroll",¯oDragScroll,0,127-totalFit,"")) { \
|
if (CWSliderInt("##MacroScroll",¯oDragScroll,0,128-totalFit,"")) { \
|
||||||
if (macroDragScroll<0) macroDragScroll=0; \
|
if (macroDragScroll<0) macroDragScroll=0; \
|
||||||
if (macroDragScroll>127-totalFit) macroDragScroll=127-totalFit; \
|
if (macroDragScroll>128-totalFit) macroDragScroll=128-totalFit; \
|
||||||
}
|
}
|
||||||
|
|
||||||
#define MACRO_END \
|
#define MACRO_END \
|
||||||
|
|
@ -1282,9 +1282,9 @@ if (ImGui::BeginTable("MacroSpace",2)) { \
|
||||||
ImGui::TableNextColumn(); \
|
ImGui::TableNextColumn(); \
|
||||||
ImGui::TableNextColumn(); \
|
ImGui::TableNextColumn(); \
|
||||||
ImGui::SetNextItemWidth(availableWidth); \
|
ImGui::SetNextItemWidth(availableWidth); \
|
||||||
if (CWSliderInt("##MacroScroll",¯oDragScroll,0,127-totalFit,"")) { \
|
if (CWSliderInt("##MacroScroll",¯oDragScroll,0,128-totalFit,"")) { \
|
||||||
if (macroDragScroll<0) macroDragScroll=0; \
|
if (macroDragScroll<0) macroDragScroll=0; \
|
||||||
if (macroDragScroll>127-totalFit) macroDragScroll=127-totalFit; \
|
if (macroDragScroll>128-totalFit) macroDragScroll=128-totalFit; \
|
||||||
} \
|
} \
|
||||||
ImGui::EndTable(); \
|
ImGui::EndTable(); \
|
||||||
}
|
}
|
||||||
|
|
@ -1378,7 +1378,7 @@ void FurnaceGUI::drawInsEdit() {
|
||||||
ImGui::TableNextColumn();
|
ImGui::TableNextColumn();
|
||||||
// TODO: load replace
|
// TODO: load replace
|
||||||
if (ImGui::Button(ICON_FA_FOLDER_OPEN "##IELoad")) {
|
if (ImGui::Button(ICON_FA_FOLDER_OPEN "##IELoad")) {
|
||||||
doAction(GUI_ACTION_INS_LIST_OPEN);
|
doAction(GUI_ACTION_INS_LIST_OPEN_REPLACE);
|
||||||
}
|
}
|
||||||
ImGui::SameLine();
|
ImGui::SameLine();
|
||||||
if (ImGui::Button(ICON_FA_FLOPPY_O "##IESave")) {
|
if (ImGui::Button(ICON_FA_FLOPPY_O "##IESave")) {
|
||||||
|
|
|
||||||
|
|
@ -64,7 +64,7 @@ inline void FurnaceGUI::patternRow(int i, bool isPlaying, float lineHeight, int
|
||||||
}
|
}
|
||||||
// check overflow highlight
|
// check overflow highlight
|
||||||
if (settings.overflowHighlight) {
|
if (settings.overflowHighlight) {
|
||||||
if (edit && cursor.y==i) {
|
if (edit && cursor.y==i && curWindowLast==GUI_WINDOW_PATTERN) {
|
||||||
ImGui::TableSetBgColor(ImGuiTableBgTarget_RowBg0,ImGui::GetColorU32(uiColors[GUI_COLOR_EDITING]));
|
ImGui::TableSetBgColor(ImGuiTableBgTarget_RowBg0,ImGui::GetColorU32(uiColors[GUI_COLOR_EDITING]));
|
||||||
} else if (isPlaying && oldRow==i && ord==e->getOrder()) {
|
} else if (isPlaying && oldRow==i && ord==e->getOrder()) {
|
||||||
ImGui::TableSetBgColor(ImGuiTableBgTarget_RowBg0,ImGui::GetColorU32(uiColors[GUI_COLOR_PATTERN_PLAY_HEAD]));
|
ImGui::TableSetBgColor(ImGuiTableBgTarget_RowBg0,ImGui::GetColorU32(uiColors[GUI_COLOR_PATTERN_PLAY_HEAD]));
|
||||||
|
|
@ -75,7 +75,7 @@ inline void FurnaceGUI::patternRow(int i, bool isPlaying, float lineHeight, int
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
isPushing=true;
|
isPushing=true;
|
||||||
if (edit && cursor.y==i) {
|
if (edit && cursor.y==i && curWindowLast==GUI_WINDOW_PATTERN) {
|
||||||
ImGui::PushStyleColor(ImGuiCol_Header,ImGui::GetColorU32(uiColors[GUI_COLOR_EDITING]));
|
ImGui::PushStyleColor(ImGuiCol_Header,ImGui::GetColorU32(uiColors[GUI_COLOR_EDITING]));
|
||||||
} else if (isPlaying && oldRow==i && ord==e->getOrder()) {
|
} else if (isPlaying && oldRow==i && ord==e->getOrder()) {
|
||||||
ImGui::PushStyleColor(ImGuiCol_Header,ImGui::GetColorU32(uiColors[GUI_COLOR_PATTERN_PLAY_HEAD]));
|
ImGui::PushStyleColor(ImGuiCol_Header,ImGui::GetColorU32(uiColors[GUI_COLOR_PATTERN_PLAY_HEAD]));
|
||||||
|
|
@ -113,9 +113,9 @@ inline void FurnaceGUI::patternRow(int i, bool isPlaying, float lineHeight, int
|
||||||
bool selectedNote=selectedRow && (j32>=sel1XSum && j32<=sel2XSum);
|
bool selectedNote=selectedRow && (j32>=sel1XSum && j32<=sel2XSum);
|
||||||
bool selectedIns=selectedRow && (j32+1>=sel1XSum && j32+1<=sel2XSum);
|
bool selectedIns=selectedRow && (j32+1>=sel1XSum && j32+1<=sel2XSum);
|
||||||
bool selectedVol=selectedRow && (j32+2>=sel1XSum && j32+2<=sel2XSum);
|
bool selectedVol=selectedRow && (j32+2>=sel1XSum && j32+2<=sel2XSum);
|
||||||
bool cursorNote=(cursor.y==i && cursor.xCoarse==j && cursor.xFine==0);
|
bool cursorNote=(cursor.y==i && cursor.xCoarse==j && cursor.xFine==0 && curWindowLast==GUI_WINDOW_PATTERN);
|
||||||
bool cursorIns=(cursor.y==i && cursor.xCoarse==j && cursor.xFine==1);
|
bool cursorIns=(cursor.y==i && cursor.xCoarse==j && cursor.xFine==1 && curWindowLast==GUI_WINDOW_PATTERN);
|
||||||
bool cursorVol=(cursor.y==i && cursor.xCoarse==j && cursor.xFine==2);
|
bool cursorVol=(cursor.y==i && cursor.xCoarse==j && cursor.xFine==2 && curWindowLast==GUI_WINDOW_PATTERN);
|
||||||
|
|
||||||
// note
|
// note
|
||||||
sprintf(id,"%s##PN_%d_%d",noteName(pat->data[i][0],pat->data[i][1]),i,j);
|
sprintf(id,"%s##PN_%d_%d",noteName(pat->data[i][0],pat->data[i][1]),i,j);
|
||||||
|
|
@ -145,7 +145,7 @@ inline void FurnaceGUI::patternRow(int i, bool isPlaying, float lineHeight, int
|
||||||
ImGui::PopStyleColor();
|
ImGui::PopStyleColor();
|
||||||
|
|
||||||
// the following is only visible when the channel is not collapsed
|
// the following is only visible when the channel is not collapsed
|
||||||
if (!e->song.chanCollapse[j]) {
|
if (e->song.chanCollapse[j]<3) {
|
||||||
// instrument
|
// instrument
|
||||||
if (pat->data[i][2]==-1) {
|
if (pat->data[i][2]==-1) {
|
||||||
ImGui::PushStyleColor(ImGuiCol_Text,inactiveColor);
|
ImGui::PushStyleColor(ImGuiCol_Text,inactiveColor);
|
||||||
|
|
@ -183,7 +183,9 @@ inline void FurnaceGUI::patternRow(int i, bool isPlaying, float lineHeight, int
|
||||||
updateSelection(j,1,i);
|
updateSelection(j,1,i);
|
||||||
}
|
}
|
||||||
ImGui::PopStyleColor();
|
ImGui::PopStyleColor();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (e->song.chanCollapse[j]<2) {
|
||||||
// volume
|
// volume
|
||||||
if (pat->data[i][3]==-1) {
|
if (pat->data[i][3]==-1) {
|
||||||
sprintf(id,"..##PV_%d_%d",i,j);
|
sprintf(id,"..##PV_%d_%d",i,j);
|
||||||
|
|
@ -215,14 +217,16 @@ inline void FurnaceGUI::patternRow(int i, bool isPlaying, float lineHeight, int
|
||||||
updateSelection(j,2,i);
|
updateSelection(j,2,i);
|
||||||
}
|
}
|
||||||
ImGui::PopStyleColor();
|
ImGui::PopStyleColor();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (e->song.chanCollapse[j]<1) {
|
||||||
// effects
|
// effects
|
||||||
for (int k=0; k<e->song.pat[j].effectCols; k++) {
|
for (int k=0; k<e->song.pat[j].effectCols; k++) {
|
||||||
int index=4+(k<<1);
|
int index=4+(k<<1);
|
||||||
bool selectedEffect=selectedRow && (j32+index-1>=sel1XSum && j32+index-1<=sel2XSum);
|
bool selectedEffect=selectedRow && (j32+index-1>=sel1XSum && j32+index-1<=sel2XSum);
|
||||||
bool selectedEffectVal=selectedRow && (j32+index>=sel1XSum && j32+index<=sel2XSum);
|
bool selectedEffectVal=selectedRow && (j32+index>=sel1XSum && j32+index<=sel2XSum);
|
||||||
bool cursorEffect=(cursor.y==i && cursor.xCoarse==j && cursor.xFine==index-1);
|
bool cursorEffect=(cursor.y==i && cursor.xCoarse==j && cursor.xFine==index-1 && curWindowLast==GUI_WINDOW_PATTERN);
|
||||||
bool cursorEffectVal=(cursor.y==i && cursor.xCoarse==j && cursor.xFine==index);
|
bool cursorEffectVal=(cursor.y==i && cursor.xCoarse==j && cursor.xFine==index && curWindowLast==GUI_WINDOW_PATTERN);
|
||||||
|
|
||||||
// effect
|
// effect
|
||||||
if (pat->data[i][index]==-1) {
|
if (pat->data[i][index]==-1) {
|
||||||
|
|
@ -499,7 +503,11 @@ void FurnaceGUI::drawPattern() {
|
||||||
snprintf(chanID,2048,"%c##_HCH%d",e->song.chanCollapse[i]?'+':'-',i);
|
snprintf(chanID,2048,"%c##_HCH%d",e->song.chanCollapse[i]?'+':'-',i);
|
||||||
ImGui::SetCursorPosX(ImGui::GetCursorPosX()+4.0f*dpiScale);
|
ImGui::SetCursorPosX(ImGui::GetCursorPosX()+4.0f*dpiScale);
|
||||||
if (ImGui::SmallButton(chanID)) {
|
if (ImGui::SmallButton(chanID)) {
|
||||||
e->song.chanCollapse[i]=!e->song.chanCollapse[i];
|
if (e->song.chanCollapse[i]==0) {
|
||||||
|
e->song.chanCollapse[i]=3;
|
||||||
|
} else if (e->song.chanCollapse[i]>0) {
|
||||||
|
e->song.chanCollapse[i]--;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (!e->song.chanCollapse[i]) {
|
if (!e->song.chanCollapse[i]) {
|
||||||
ImGui::SameLine();
|
ImGui::SameLine();
|
||||||
|
|
|
||||||
|
|
@ -419,6 +419,11 @@ void FurnaceGUI::drawSettings() {
|
||||||
settings.restartOnFlagChange=restartOnFlagChangeB;
|
settings.restartOnFlagChange=restartOnFlagChangeB;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool insLoadAlwaysReplaceB=settings.insLoadAlwaysReplace;
|
||||||
|
if (ImGui::Checkbox("Always replace currently selected instrument when loading from instrument list",&insLoadAlwaysReplaceB)) {
|
||||||
|
settings.insLoadAlwaysReplace=insLoadAlwaysReplaceB;
|
||||||
|
}
|
||||||
|
|
||||||
bool sysFileDialogB=settings.sysFileDialog;
|
bool sysFileDialogB=settings.sysFileDialog;
|
||||||
if (ImGui::Checkbox("Use system file picker",&sysFileDialogB)) {
|
if (ImGui::Checkbox("Use system file picker",&sysFileDialogB)) {
|
||||||
settings.sysFileDialog=sysFileDialogB;
|
settings.sysFileDialog=sysFileDialogB;
|
||||||
|
|
@ -1616,6 +1621,7 @@ void FurnaceGUI::drawSettings() {
|
||||||
UI_KEYBIND_CONFIG(GUI_ACTION_INS_LIST_ADD);
|
UI_KEYBIND_CONFIG(GUI_ACTION_INS_LIST_ADD);
|
||||||
UI_KEYBIND_CONFIG(GUI_ACTION_INS_LIST_DUPLICATE);
|
UI_KEYBIND_CONFIG(GUI_ACTION_INS_LIST_DUPLICATE);
|
||||||
UI_KEYBIND_CONFIG(GUI_ACTION_INS_LIST_OPEN);
|
UI_KEYBIND_CONFIG(GUI_ACTION_INS_LIST_OPEN);
|
||||||
|
UI_KEYBIND_CONFIG(GUI_ACTION_INS_LIST_OPEN_REPLACE);
|
||||||
UI_KEYBIND_CONFIG(GUI_ACTION_INS_LIST_SAVE);
|
UI_KEYBIND_CONFIG(GUI_ACTION_INS_LIST_SAVE);
|
||||||
UI_KEYBIND_CONFIG(GUI_ACTION_INS_LIST_MOVE_UP);
|
UI_KEYBIND_CONFIG(GUI_ACTION_INS_LIST_MOVE_UP);
|
||||||
UI_KEYBIND_CONFIG(GUI_ACTION_INS_LIST_MOVE_DOWN);
|
UI_KEYBIND_CONFIG(GUI_ACTION_INS_LIST_MOVE_DOWN);
|
||||||
|
|
@ -1830,6 +1836,7 @@ void FurnaceGUI::syncSettings() {
|
||||||
settings.eventDelay=e->getConfInt("eventDelay",0);
|
settings.eventDelay=e->getConfInt("eventDelay",0);
|
||||||
settings.moveWindowTitle=e->getConfInt("moveWindowTitle",0);
|
settings.moveWindowTitle=e->getConfInt("moveWindowTitle",0);
|
||||||
settings.hiddenSystems=e->getConfInt("hiddenSystems",0);
|
settings.hiddenSystems=e->getConfInt("hiddenSystems",0);
|
||||||
|
settings.insLoadAlwaysReplace=e->getConfInt("insLoadAlwaysReplace",1);
|
||||||
|
|
||||||
clampSetting(settings.mainFontSize,2,96);
|
clampSetting(settings.mainFontSize,2,96);
|
||||||
clampSetting(settings.patFontSize,2,96);
|
clampSetting(settings.patFontSize,2,96);
|
||||||
|
|
@ -1900,6 +1907,7 @@ void FurnaceGUI::syncSettings() {
|
||||||
clampSetting(settings.eventDelay,0,1);
|
clampSetting(settings.eventDelay,0,1);
|
||||||
clampSetting(settings.moveWindowTitle,0,1);
|
clampSetting(settings.moveWindowTitle,0,1);
|
||||||
clampSetting(settings.hiddenSystems,0,1);
|
clampSetting(settings.hiddenSystems,0,1);
|
||||||
|
clampSetting(settings.insLoadAlwaysReplace,0,1);
|
||||||
|
|
||||||
settings.initialSys=e->decodeSysDesc(e->getConfString("initialSys",""));
|
settings.initialSys=e->decodeSysDesc(e->getConfString("initialSys",""));
|
||||||
if (settings.initialSys.size()<4) {
|
if (settings.initialSys.size()<4) {
|
||||||
|
|
@ -2011,6 +2019,7 @@ void FurnaceGUI::commitSettings() {
|
||||||
e->setConf("moveWindowTitle",settings.moveWindowTitle);
|
e->setConf("moveWindowTitle",settings.moveWindowTitle);
|
||||||
e->setConf("hiddenSystems",settings.hiddenSystems);
|
e->setConf("hiddenSystems",settings.hiddenSystems);
|
||||||
e->setConf("initialSys",e->encodeSysDesc(settings.initialSys));
|
e->setConf("initialSys",e->encodeSysDesc(settings.initialSys));
|
||||||
|
e->setConf("insLoadAlwaysReplace",settings.insLoadAlwaysReplace);
|
||||||
|
|
||||||
// colors
|
// colors
|
||||||
for (int i=0; i<GUI_COLOR_MAX; i++) {
|
for (int i=0; i<GUI_COLOR_MAX; i++) {
|
||||||
|
|
@ -2630,6 +2639,7 @@ void FurnaceGUI::applyUISettings(bool updateFonts) {
|
||||||
if ((iconFont=ImGui::GetIO().Fonts->AddFontFromMemoryCompressedTTF(iconFont_compressed_data,iconFont_compressed_size,e->getConfInt("iconSize",16)*dpiScale,&fc,fontRangeIcon))==NULL) {
|
if ((iconFont=ImGui::GetIO().Fonts->AddFontFromMemoryCompressedTTF(iconFont_compressed_data,iconFont_compressed_size,e->getConfInt("iconSize",16)*dpiScale,&fc,fontRangeIcon))==NULL) {
|
||||||
logE("could not load icon font!");
|
logE("could not load icon font!");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settings.mainFontSize==settings.patFontSize && settings.patFont<5 && builtinFontM[settings.patFont]==builtinFont[settings.mainFont]) {
|
if (settings.mainFontSize==settings.patFontSize && settings.patFont<5 && builtinFontM[settings.patFont]==builtinFont[settings.mainFont]) {
|
||||||
logD("using main font for pat font.");
|
logD("using main font for pat font.");
|
||||||
patFont=mainFont;
|
patFont=mainFont;
|
||||||
|
|
@ -2661,8 +2671,9 @@ void FurnaceGUI::applyUISettings(bool updateFonts) {
|
||||||
logE("could not load pattern font!");
|
logE("could not load pattern font!");
|
||||||
patFont=ImGui::GetIO().Fonts->AddFontDefault();
|
patFont=ImGui::GetIO().Fonts->AddFontDefault();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
if ((bigFont=ImGui::GetIO().Fonts->AddFontFromMemoryCompressedTTF(font_plexSans_compressed_data,font_plexSans_compressed_size,40*dpiScale))==NULL) {
|
if ((bigFont=ImGui::GetIO().Fonts->AddFontFromMemoryCompressedTTF(font_plexSans_compressed_data,font_plexSans_compressed_size,40*dpiScale))==NULL) {
|
||||||
logE("could not load big UI font!");
|
logE("could not load big UI font!");
|
||||||
}
|
}
|
||||||
|
|
@ -2688,6 +2699,7 @@ void FurnaceGUI::applyUISettings(bool updateFonts) {
|
||||||
ImGuiFileDialog::Instance()->SetFileStyle(IGFD_FileStyleByExtension,".ttc",uiColors[GUI_COLOR_FILE_FONT],ICON_FA_FONT);
|
ImGuiFileDialog::Instance()->SetFileStyle(IGFD_FileStyleByExtension,".ttc",uiColors[GUI_COLOR_FILE_FONT],ICON_FA_FONT);
|
||||||
|
|
||||||
ImGuiFileDialog::Instance()->SetFileStyle(IGFD_FileStyleByExtension,".mod",uiColors[GUI_COLOR_FILE_SONG_IMPORT],ICON_FA_FILE);
|
ImGuiFileDialog::Instance()->SetFileStyle(IGFD_FileStyleByExtension,".mod",uiColors[GUI_COLOR_FILE_SONG_IMPORT],ICON_FA_FILE);
|
||||||
|
ImGuiFileDialog::Instance()->SetFileStyle(IGFD_FileStyleByExtension,".ftm",uiColors[GUI_COLOR_FILE_SONG_IMPORT],ICON_FA_FILE);
|
||||||
|
|
||||||
ImGuiFileDialog::Instance()->SetFileStyle(IGFD_FileStyleByExtension,".tfi",uiColors[GUI_COLOR_FILE_INSTR],ICON_FA_FILE);
|
ImGuiFileDialog::Instance()->SetFileStyle(IGFD_FileStyleByExtension,".tfi",uiColors[GUI_COLOR_FILE_INSTR],ICON_FA_FILE);
|
||||||
ImGuiFileDialog::Instance()->SetFileStyle(IGFD_FileStyleByExtension,".vgi",uiColors[GUI_COLOR_FILE_INSTR],ICON_FA_FILE);
|
ImGuiFileDialog::Instance()->SetFileStyle(IGFD_FileStyleByExtension,".vgi",uiColors[GUI_COLOR_FILE_INSTR],ICON_FA_FILE);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue