Merge branch 'master' of https://github.com/tildearrow/furnace into es5506_alt

* 'master' of https://github.com/tildearrow/furnace: (44 commits)
  GUI: now add ability to load VMEM
  Update sysDef.cpp
  GUI: add an option for it
  add preliminary TX81Z SysEx response
  OPL: drum volume
  OPL: implement hard reset
  GUI: add icon size setting
  GUI: macro UI refactor, part 4
  Fix WIN32 define timing in IGFD
  Fix outdated calling convention in SAASound (maybe fix MinGW)
  GUI: macro UI refactor, part 3
  GUI: macro UI refactor, part 2
  Masochism Volatile Compiler
  GUI: is the macro UI back yet
  OPL: fix 4-op muting (I think)
  GUI: macro UI refactor, part 1 - PLEASE READ
  GUI: remove classic macro view
  Maybe just enforce for C++
  Forbid standard extensions
  .ftm loading progress (incomplete, not working)
  ...

# Conflicts:
#	src/engine/instrument.h
#	src/gui/insEdit.cpp

Transwave Checkpoint

.gitmodules

@@ -19,6 +19,3 @@
 [submodule "extern/adpcm"]
 	path = extern/adpcm
 	url = https://github.com/superctr/adpcm
-[submodule "extern/Nuked-OPL3"]
-	path = extern/Nuked-OPL3
-	url = https://github.com/nukeykt/Nuked-OPL3.git

CMakeLists.txt

@@ -11,6 +11,7 @@ if (APPLE)
 endif()
 
 set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_EXTENSIONS OFF)
 
 set(CMAKE_PROJECT_VERSION_MAJOR 0)
 set(CMAKE_PROJECT_VERSION_MINOR 6)
@@ -237,7 +238,7 @@ extern/adpcm/ymz_codec.c
 extern/Nuked-OPN2/ym3438.c
 extern/opm/opm.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/ay8910.cpp
 src/engine/platform/sound/saa1099.cpp
@@ -430,6 +431,7 @@ src/gui/songInfo.cpp
 src/gui/songNotes.cpp
 src/gui/stats.cpp
 src/gui/sysConf.cpp
+src/gui/sysEx.cpp
 src/gui/util.cpp
 src/gui/waveEdit.cpp
 src/gui/volMeter.cpp

TODO.md

@@ -18,9 +18,7 @@
 - SCC/SCC+ system
 - maybe YMU759 ADPCM channel
 - ADPCM chips
-- more effects for FM param control
 - Game Boy envelope macro/sequence
-- option to display chip names instead of "multi-system" on title bar
 - rewrite the system name detection function anyway
 - scroll instrument/wave/sample list when selecting item
 - unified data view
@@ -36,3 +34,5 @@
 - add ability to move selection by dragging
 - Apply button in settings
 - find and replace
+- finish wave synth
+- add mono/poly note preview button

extern/Nuked-OPL3

@@ -1 +0,0 @@
-Subproject commit bb5c8d08a85779c42b75c79d7b84f365a1b93b66

extern/SAASound/src/SAASound.h

@@ -53,7 +53,7 @@ typedef unsigned long SAAPARAM;
 #endif
 
 #ifdef _WIN32
-#define SAAAPI _stdcall
+#define SAAAPI __stdcall
 #else
 #define SAAAPI
 #endif

extern/SAASound/src/types.h

@@ -30,7 +30,7 @@ typedef struct
 } ENVDATA;
 
 #ifdef WIN32
-extern "C" void _stdcall OutputDebugStringA (char*);
+extern "C" void __stdcall OutputDebugStringA (char*);
 #endif
 
 #endif

extern/igfd/ImGuiFileDialog.cpp

@@ -44,10 +44,7 @@ SOFTWARE.
 #if defined (__EMSCRIPTEN__) // EMSCRIPTEN
 	#include <emscripten.h>
 #endif // EMSCRIPTEN
-#if defined(__WIN32__) || defined(_WIN32)
+#ifdef WIN32
-	#ifndef WIN32
-		#define WIN32
-	#endif // WIN32
 	#define stat _stat
 	#define stricmp _stricmp
 	#include <cctype>

extern/igfd/ImGuiFileDialog.h

@@ -581,6 +581,12 @@ ImGuiFontStudio is using also ImGuiFileDialog.
 #ifndef IMGUIFILEDIALOG_H
 #define IMGUIFILEDIALOG_H
 
+#if defined(__WIN32__) || defined(_WIN32)
+	#ifndef WIN32
+		#define WIN32
+	#endif // WIN32
+#endif // defined(__WIN32__) || defined(_WIN32)
+
 #define IMGUIFILEDIALOG_VERSION "v0.6.4"
 
 #ifndef CUSTOM_IMGUIFILEDIALOG_CONFIG

extern/opl/.github/FUNDING.yml

@@ -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']

extern/opl/LICENSE

@@ -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!

extern/opl/MODIFIED.md

@@ -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.

extern/opl/opl3.h

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

papers/doc/7-systems/opll.md

@@ -2,8 +2,8 @@
 
 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 YMF281, ditto
 
@@ -12,7 +12,7 @@ OPLL spawned also a few derivative chips, the best known of these is:
 the YM2413 is equipped with the following features:
 
 - 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)
 - 15 pre-defined patches which can all be used at the same time
 - Support for ADSR on both the modulator and the carrier

papers/doc/7-systems/opz.md

@@ -52,6 +52,9 @@ no plans have been made for TX81Z MIDI passthrough, because:
 - `2Bxy`: set EG shift of operator.
   - `x` is the operator (1-4). a value of 0 means "all operators".
   - `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.
   - this works by inserting a quick release and tiny delay before a new note.
 - `3xyy`: set fixed frequency of operator 1/2.

papers/doc/7-systems/ym2612.md

@@ -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.
   - `x` is the operator (1-4). a value of 0 means "all operators".
   - `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.
   - `x` is the operator (1-4). a value of 0 means "all operators".
   - `y` is the value.

papers/format.md

@@ -697,6 +697,17 @@ size | description
   1  | extra 8 macro mode
  --- | **extra C64 data** (>=89)
   1  | don't test/gate before new note
+ --- | **MultiPCM data** (>=93)
+  1  | attack rate
+  1  | decay 1 rate
+  1  | decay level
+  1  | decay 2 rate
+  1  | release rate
+  1  | rate correction
+  1  | lfo rate
+  1  | vib depth
+  1  | am depth
+ 23  | reserved
 ```
 
 # wavetable

src/audio/abstract.cpp

@@ -18,6 +18,7 @@
  */
 
 #include "taAudio.h"
+#include "../ta-log.h"
 
 void TAAudio::setSampleRateChangeCallback(void (*callback)(SampleRateChangeEvent)) {
   sampleRateChanged=callback;
@@ -62,6 +63,7 @@ bool TAMidiIn::gather() {
 }
 
 bool TAMidiOut::send(const TAMidiMessage& what) {
+  logE("virtual method TAMidiOut::send() called! this is a bug!");
   return false;
 }
 

src/audio/rtmidi.cpp

@@ -36,6 +36,11 @@ bool TAMidiInRtMidi::gather() {
     m.type=msg[0];
     if (m.type!=TA_MIDI_SYSEX && msg.size()>1) {
       memcpy(m.data,msg.data()+1,MIN(msg.size()-1,7));
+    } else if (m.type==TA_MIDI_SYSEX) {
+      m.sysExData.reset(new unsigned char[msg.size()]);
+      m.sysExLen=msg.size();
+      logD("got a SysEx of length %ld!",msg.size());
+      memcpy(m.sysExData.get(),msg.data(),msg.size());
     }
     queue.push(m);
   }
@@ -105,6 +110,7 @@ bool TAMidiInRtMidi::init() {
   if (port!=NULL) return true;
   try {
     port=new RtMidiIn;
+    port->ignoreTypes(false,true,true);
   } catch (RtMidiError& e) {
     logW("could not initialize RtMidi in! %s",e.what());
     return false;
@@ -140,8 +146,18 @@ bool TAMidiOutRtMidi::send(const TAMidiMessage& what) {
       break;
   }
   if (len==0) switch (what.type) {
-    case TA_MIDI_SYSEX: // currently not supported :<
+    case TA_MIDI_SYSEX:
-      return false;
+      if (what.sysExLen<1) {
+        logE("sysExLen is NULL!");
+        return false;
+      }
+      if (what.sysExData.get()==NULL) {
+        logE("sysExData is NULL!");
+        return false;
+      }
+      len=what.sysExLen;
+      port->sendMessage(what.sysExData.get(),len);
+      return true;
       break;
     case TA_MIDI_MTC_FRAME:
     case TA_MIDI_SONG_SELECT:

src/audio/taAudio.h

@@ -20,6 +20,7 @@
 #ifndef _TAAUDIO_H
 #define _TAAUDIO_H
 #include "../ta-utils.h"
+#include <memory>
 #include <queue>
 #include <vector>
 
@@ -93,7 +94,7 @@ struct TAMidiMessage {
   double time;
   unsigned char type;
   unsigned char data[7];
-  unsigned char* sysExData;
+  std::shared_ptr<unsigned char[]> sysExData;
   size_t sysExLen;
 
   void submitSysEx(std::vector<unsigned char> data);

src/engine/engine.cpp

@@ -2397,6 +2397,22 @@ void DivEngine::setMidiCallback(std::function<int(const TAMidiMessage&)> what) {
   midiCallback=what;
 }
 
+bool DivEngine::sendMidiMessage(TAMidiMessage& msg) {
+  if (output==NULL) {
+    logW("output is NULL!");
+    return false;
+  }
+  if (output->midiOut==NULL) {
+    logW("MIDI output is NULL!");
+    return false;
+  }
+  BUSY_BEGIN;
+  logD("sending MIDI message...");
+  bool ret=(output->midiOut->send(msg));
+  BUSY_END;
+  return ret;
+}
+
 void DivEngine::synchronized(const std::function<void()>& what) {
   BUSY_BEGIN;
   what();

src/engine/engine.h

@@ -45,8 +45,8 @@
 #define BUSY_BEGIN_SOFT softLocked=true; isBusy.lock();
 #define BUSY_END isBusy.unlock(); softLocked=false;
 
-#define DIV_VERSION "dev91"
+#define DIV_VERSION "dev93"
-#define DIV_ENGINE_VERSION 91
+#define DIV_ENGINE_VERSION 93
 
 // for imports
 #define DIV_VERSION_MOD 0xff01
@@ -385,6 +385,7 @@ class DivEngine {
   bool loadDMF(unsigned char* file, size_t len);
   bool loadFur(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 loadTFI(SafeReader& reader, std::vector<DivInstrument*>& ret, String& stripPath);
@@ -549,7 +550,7 @@ class DivEngine {
     DivInstrumentType getPreferInsSecondType(int ch);
 
     // get song system name
-    const char* getSongSystemName();
+    String getSongSystemName(bool isMultiSystemAcceptable=true);
 
     // get sys name
     const char* getSystemName(DivSystem sys);
@@ -827,6 +828,9 @@ class DivEngine {
     // if the specified function returns -2, note feedback will be inhibited.
     void setMidiCallback(std::function<int(const TAMidiMessage&)> what);
 
+    // send MIDI message
+    bool sendMidiMessage(TAMidiMessage& msg);
+
     // perform secure/sync operation
     void synchronized(const std::function<void()>& what);
 

src/engine/fileOps.cpp

@@ -19,6 +19,7 @@
 
 #include "engine.h"
 #include "../ta-log.h"
+#include "instrument.h"
 #include "song.h"
 #include <zlib.h>
 #include <fmt/printf.h>
@@ -26,6 +27,7 @@
 #define DIV_READ_SIZE 131072
 #define DIV_DMF_MAGIC ".DelekDefleMask."
 #define DIV_FUR_MAGIC "-Furnace module-"
+#define DIV_FTM_MAGIC "FamiTracker Module"
 
 struct InflateBlock {
   unsigned char* buf;
@@ -1314,6 +1316,12 @@ bool DivEngine::loadFur(unsigned char* file, size_t len) {
         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++) {
         ds.chanName[i]=reader.readString();
       }
@@ -1624,8 +1632,6 @@ bool DivEngine::loadFur(unsigned char* file, size_t len) {
   return true;
 }
 
-
-
 bool DivEngine::loadMod(unsigned char* file, size_t len) {
   struct InvalidHeaderException {};
   bool success=false;
@@ -2042,10 +2048,370 @@ bool DivEngine::loadMod(unsigned char* file, size_t len) {
   return success;
 }
 
+#define CHECK_BLOCK_VERSION(x) \
+  if (blockVersion>x) { \
+    logE("incompatible block version %d for %s!",blockVersion,blockName); \
+    lastError="incompatible block version"; \
+    delete[] file; \
+    return false; \
+  }
+
+bool DivEngine::loadFTM(unsigned char* file, size_t len) {
+  SafeReader reader=SafeReader(file,len);
+  warnings="";
+  try {
+    DivSong ds;
+    String blockName;
+    unsigned char expansions=0;
+    unsigned int tchans=0;
+    unsigned int n163Chans=0;
+    bool hasSequence[256][8];
+    unsigned char sequenceIndex[256][8];
+    
+    memset(hasSequence,0,256*8*sizeof(bool));
+    memset(sequenceIndex,0,256*8);
+
+    if (!reader.seek(18,SEEK_SET)) {
+      logE("premature end of file!");
+      lastError="incomplete file";
+      delete[] file;
+      return false;
+    }
+    ds.version=(unsigned short)reader.readI();
+    logI("module version %d (0x%.4x)",ds.version,ds.version);
+
+    if (ds.version>0x0450) {
+      logE("incompatible version %x!",ds.version);
+      lastError="incompatible version";
+      delete[] file;
+      return false;
+    }
+
+    while (true) {
+      blockName=reader.readString(3);
+      if (blockName=="END") {
+        // end of module
+        logD("end of data");
+        break;
+      }
+
+      // not the end
+      reader.seek(-3,SEEK_CUR);
+      blockName=reader.readString(16);
+      unsigned int blockVersion=(unsigned int)reader.readI();
+      unsigned int blockSize=(unsigned int)reader.readI();
+      size_t blockStart=reader.tell();
+      
+      logD("reading block %s (version %d, %d bytes)",blockName,blockVersion,blockSize);
+      if (blockName=="PARAMS") {
+        CHECK_BLOCK_VERSION(6);
+        unsigned int oldSpeedTempo=0;
+        if (blockVersion<=1) {
+          oldSpeedTempo=reader.readI();
+        }
+        if (blockVersion>=2) {
+          expansions=reader.readC();
+        }
+        tchans=reader.readI();
+        unsigned int pal=reader.readI();
+        unsigned int customHz=reader.readI();
+        unsigned int newVibrato=0;
+        unsigned int speedSplitPoint=0;
+        if (blockVersion>=3) {
+          newVibrato=reader.readI();
+        }
+        if (blockVersion>=4) {
+          ds.hilightA=reader.readI();
+          ds.hilightB=reader.readI();
+        }
+        if (expansions&8) if (blockVersion>=5) { // N163 channels
+          n163Chans=reader.readI();
+        }
+        if (blockVersion>=6) {
+          speedSplitPoint=reader.readI();
+        }
+
+        logV("old speed/tempo: %d",oldSpeedTempo);
+        logV("expansions: %x",expansions);
+        logV("channels: %d",tchans);
+        logV("PAL: %d",pal);
+        logV("custom Hz: %d",customHz);
+        logV("new vibrato: %d",newVibrato);
+        logV("N163 channels: %d",n163Chans);
+        logV("highlight 1: %d",ds.hilightA);
+        logV("highlight 2: %d",ds.hilightB);
+        logV("split point: %d",speedSplitPoint);
+
+        if (customHz!=0) {
+          ds.hz=customHz;
+        }
+
+        // initialize channels
+        int systemID=0;
+        ds.system[systemID++]=DIV_SYSTEM_NES;
+        if (expansions&1) {
+          ds.system[systemID++]=DIV_SYSTEM_VRC6;
+        }
+        if (expansions&2) {
+          ds.system[systemID++]=DIV_SYSTEM_VRC7;
+        }
+        if (expansions&4) {
+          ds.system[systemID++]=DIV_SYSTEM_FDS;
+        }
+        if (expansions&8) {
+          ds.system[systemID++]=DIV_SYSTEM_MMC5;
+        }
+        if (expansions&16) {
+          ds.system[systemID]=DIV_SYSTEM_N163;
+          ds.systemFlags[systemID++]=n163Chans;
+        }
+        if (expansions&32) {
+          ds.system[systemID]=DIV_SYSTEM_AY8910;
+          ds.systemFlags[systemID++]=38; // Sunsoft 5B
+        }
+        ds.systemLen=systemID;
+
+        unsigned int calcChans=0;
+        for (int i=0; i<ds.systemLen; i++) {
+          calcChans+=getChannelCount(ds.system[i]);
+        }
+        if (calcChans!=tchans) {
+          logE("channel counts do not match! %d != %d",tchans,calcChans);
+          lastError="channel counts do not match";
+          delete[] file;
+          return false;
+        }
+        if (tchans>DIV_MAX_CHANS) {
+          tchans=DIV_MAX_CHANS;
+          logW("too many channels!");
+        }
+      } else if (blockName=="INFO") {
+        CHECK_BLOCK_VERSION(1);
+        ds.name=reader.readString(32);
+        ds.author=reader.readString(32);
+        ds.copyright=reader.readString(32);
+      } else if (blockName=="HEADER") {
+        CHECK_BLOCK_VERSION(3);
+        unsigned char totalSongs=reader.readC();
+        logV("%d songs:",totalSongs+1);
+        for (int i=0; i<=totalSongs; i++) {
+          String subSongName=reader.readString();
+          logV("- %s",subSongName);
+        }
+        for (unsigned int i=0; i<tchans; i++) {
+          unsigned char chID=reader.readC();
+          logV("for channel ID %d",chID);
+          for (int j=0; j<=totalSongs; j++) {
+            unsigned char effectCols=reader.readC();
+            if (j==0) {
+              ds.pat[i].effectCols=effectCols+1;
+            }
+            logV("- song %d has %d effect columns",j,effectCols);
+          }
+        }
+      } else if (blockName=="INSTRUMENTS") {
+        CHECK_BLOCK_VERSION(6);
+        ds.insLen=reader.readI();
+        if (ds.insLen<0 || ds.insLen>256) {
+          logE("too many instruments/out of range!");
+          lastError="too many instruments/out of range";
+          delete[] file;
+          return false;
+        }
+
+        for (int i=0; i<ds.insLen; i++) {
+          DivInstrument* ins=new DivInstrument;
+          ds.ins.push_back(ins);
+        }
+
+        logV("instruments:");
+        for (int i=0; i<ds.insLen; i++) {
+          unsigned int insIndex=reader.readI();
+          if (insIndex>=ds.ins.size()) {
+            logE("instrument index %d is out of range!",insIndex);
+            lastError="instrument index out of range";
+            delete[] file;
+            return false;
+          }
+
+          DivInstrument* ins=ds.ins[insIndex];
+          unsigned char insType=reader.readC();
+          switch (insType) {
+            case 1:
+              ins->type=DIV_INS_STD;
+              break;
+            case 2: // TODO: tell VRC6 and VRC6 saw instruments apart
+              ins->type=DIV_INS_VRC6;
+              break;
+            case 3:
+              ins->type=DIV_INS_OPLL;
+              break;
+            case 4:
+              ins->type=DIV_INS_FDS;
+              break;
+            case 5:
+              ins->type=DIV_INS_N163;
+              break;
+            case 6: // 5B?
+              ins->type=DIV_INS_AY;
+              break;
+            default: {
+              logE("%d: invalid instrument type %d",insIndex,insType);
+              lastError="invalid instrument type";
+              delete[] file;
+              return false;
+            }
+          }
+
+          // instrument data
+          switch (ins->type) {
+            case DIV_INS_STD: {
+              unsigned int totalSeqs=reader.readI();
+              if (totalSeqs>5) {
+                logE("%d: too many sequences!",insIndex);
+                lastError="too many sequences";
+                delete[] file;
+                return false;
+              }
+
+              for (unsigned int j=0; j<totalSeqs; j++) {
+                hasSequence[insIndex][j]=reader.readC();
+                sequenceIndex[insIndex][j]=reader.readC();
+              }
+
+              const int dpcmNotes=(blockVersion>=2)?96:72;
+              for (int j=0; j<dpcmNotes; j++) {
+                ins->amiga.noteMap[j]=(short)((unsigned char)reader.readC())-1;
+                ins->amiga.noteFreq[j]=(unsigned char)reader.readC();
+                if (blockVersion>=6) {
+                  reader.readC(); // DMC value
+                }
+              }
+              break;
+            }
+            case DIV_INS_VRC6: {
+              unsigned int totalSeqs=reader.readI();
+              if (totalSeqs>4) {
+                logE("%d: too many sequences!",insIndex);
+                lastError="too many sequences";
+                delete[] file;
+                return false;
+              }
+
+              for (unsigned int j=0; j<totalSeqs; j++) {
+                hasSequence[insIndex][j]=reader.readC();
+                sequenceIndex[insIndex][j]=reader.readC();
+              }
+              break;
+            }
+            case DIV_INS_OPLL: {
+              ins->fm.opllPreset=(unsigned int)reader.readI();
+              // TODO
+              break;
+            }
+            case DIV_INS_FDS: {
+              DivWavetable* wave=new DivWavetable;
+              wave->len=64;
+              wave->max=64;
+              for (int j=0; j<64; j++) {
+                wave->data[j]=reader.readC();
+              }
+              ins->std.waveMacro.len=1;
+              ins->std.waveMacro.val[0]=ds.wave.size();
+              for (int j=0; j<32; j++) {
+                ins->fds.modTable[j]=reader.readC()-3;
+              }
+              ins->fds.modSpeed=reader.readI();
+              ins->fds.modDepth=reader.readI();
+              reader.readI(); // this is delay. currently ignored. TODO.
+              ds.wave.push_back(wave);
+
+              ins->std.volMacro.len=reader.readC();
+              ins->std.volMacro.loop=reader.readI();
+              ins->std.volMacro.rel=reader.readI();
+              reader.readI(); // arp mode does not apply here
+              for (int j=0; j<ins->std.volMacro.len; j++) {
+                ins->std.volMacro.val[j]=reader.readC();
+              }
+
+              ins->std.arpMacro.len=reader.readC();
+              ins->std.arpMacro.loop=reader.readI();
+              ins->std.arpMacro.rel=reader.readI();
+              ins->std.arpMacro.mode=reader.readI();
+              for (int j=0; j<ins->std.arpMacro.len; j++) {
+                ins->std.arpMacro.val[j]=reader.readC();
+              }
+
+              ins->std.pitchMacro.len=reader.readC();
+              ins->std.pitchMacro.loop=reader.readI();
+              ins->std.pitchMacro.rel=reader.readI();
+              reader.readI(); // arp mode does not apply here
+              for (int j=0; j<ins->std.pitchMacro.len; j++) {
+                ins->std.pitchMacro.val[j]=reader.readC();
+              }
+
+              break;
+            }
+            case DIV_INS_N163: {
+              // TODO!
+              break;
+            }
+            // TODO: 5B!
+            default: {
+              logE("%d: what's going on here?",insIndex);
+              lastError="invalid instrument type";
+              delete[] file;
+              return false;
+            }
+          }
+
+          // name
+          ins->name=reader.readString((unsigned int)reader.readI());
+          logV("- %d: %s",insIndex,ins->name);
+        }
+      } else if (blockName=="SEQUENCES") {
+        CHECK_BLOCK_VERSION(6);
+      } else if (blockName=="FRAMES") {
+        CHECK_BLOCK_VERSION(3);
+      } else if (blockName=="PATTERNS") {
+        CHECK_BLOCK_VERSION(5);
+      } else if (blockName=="DPCM SAMPLES") {
+        CHECK_BLOCK_VERSION(1);
+      } else if (blockName=="SEQUENCES_VRC6") {
+        // where are the 5B and FDS sequences?
+        CHECK_BLOCK_VERSION(6);
+      } else if (blockName=="SEQUENCES_N163") {
+        CHECK_BLOCK_VERSION(1);
+      } else if (blockName=="COMMENTS") {
+        CHECK_BLOCK_VERSION(1);
+      } else {
+        logE("block %s is unknown!",blockName);
+        lastError="unknown block "+blockName;
+        delete[] file;
+        return false;
+      }
+
+      if ((reader.tell()-blockStart)!=blockSize) {
+        logE("block %s is incomplete!",blockName);
+        lastError="incomplete block "+blockName;
+        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) {
   unsigned char* file;
   size_t len;
-  if (slen<16) {
+  if (slen<18) {
     logE("too small!");
     lastError="file is too small";
     delete[] f;
@@ -2150,6 +2516,8 @@ bool DivEngine::load(unsigned char* f, size_t slen) {
   // step 2: try loading as .fur or .dmf
   if (memcmp(file,DIV_DMF_MAGIC,16)==0) {
     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) {
     return loadFur(file,len);
   }

src/engine/instrument.cpp

@@ -510,6 +510,20 @@ void DivInstrument::putInsData(SafeWriter* w) {
 
   // C64 no test
   w->writeC(c64.noTest);
+
+  // MultiPCM
+  w->writeC(multipcm.ar);
+  w->writeC(multipcm.d1r);
+  w->writeC(multipcm.dl);
+  w->writeC(multipcm.d2r);
+  w->writeC(multipcm.rr);
+  w->writeC(multipcm.rc);
+  w->writeC(multipcm.lfo);
+  w->writeC(multipcm.vib);
+  w->writeC(multipcm.am);
+  for (int j=0; j<23; j++) { // reserved
+    w->writeC(0);
+  }
 }
 
 DivDataErrors DivInstrument::readInsData(SafeReader& reader, short version) {
@@ -1022,6 +1036,21 @@ DivDataErrors DivInstrument::readInsData(SafeReader& reader, short version) {
     c64.noTest=reader.readC();
   }
 
+  // MultiPCM
+  if (version>=93) {
+    multipcm.ar=reader.readC();
+    multipcm.d1r=reader.readC();
+    multipcm.dl=reader.readC();
+    multipcm.d2r=reader.readC();
+    multipcm.rr=reader.readC();
+    multipcm.rc=reader.readC();
+    multipcm.lfo=reader.readC();
+    multipcm.vib=reader.readC();
+    multipcm.am=reader.readC();
+    // reserved
+    for (int k=0; k<23; k++) reader.readC();
+  }
+
   return DIV_DATA_SUCCESS;
 }
 

src/engine/instrument.h

@@ -168,13 +168,20 @@ struct DivInstrumentMacro {
   unsigned char len;
   signed char loop;
   signed char rel;
+  
+  // the following variables are used by the GUI and not saved in the file
+  int vScroll, vZoom;
+
+
   explicit DivInstrumentMacro(const String& n, bool initOpen=false):
     name(n),
     mode(0),
     open(initOpen),
     len(0),
     loop(-1),
-    rel(-1) {
+    rel(-1),
+    vScroll(0),
+    vZoom(-1) {
     memset(val,0,256*sizeof(int));
   }
 };
@@ -310,12 +317,7 @@ struct DivInstrumentAmiga {
       reversed(false) {}
   };
 
-  struct TransWave {
+  struct TransWaveSlice {
-    bool enable;
-    bool sliceEnable;
-    int ind;
-    unsigned short slice;
-
     // states
     double sliceSize;
     double sliceBound;
@@ -323,35 +325,50 @@ struct DivInstrumentAmiga {
     double sliceEnd;
   
     // inlines
+    inline double updateSize(double length, double loopStart, double loopEnd) {
+      sliceSize=loopEnd-loopStart;
+      sliceBound=(length-sliceSize);
+    }
     inline double slicePos(double slice) {
       double pos=sliceBound*slice;
       if (sliceStart!=pos) {
         sliceStart=pos;
       }
-      if (sliceEnd!=(sliceSize+pos))
+      if (sliceEnd!=(sliceSize+pos)) {
         sliceEnd=(sliceSize+pos);
       }
       return pos;
     }
 
-    TransWave():
+    TransWaveSlice():
-      enable(false),
-      sliceEnable(false),
-      ind(0),
-      slice(0),
       sliceSize(0),
       sliceBound(0),
       sliceStart(0),
       sliceEnd(0) {}
   };
 
-  struct TransWaveMap {
+  struct TransWave: TransWaveSlice {
+    bool enable;
+    bool sliceEnable;
+    int ind;
+    unsigned short slice;
+
+    TransWave():
+      TransWaveSlice(),
+      enable(false),
+      sliceEnable(false),
+      ind(0),
+      slice(0) {}
+  };
+
+  struct TransWaveMap: TransWaveSlice {
     short ind;
     unsigned char reversed;
     int loopStart, loopEnd;
     DivSampleLoopMode loopMode;
 
     TransWaveMap():
+      TransWaveSlice(),
       ind(-1),
       reversed(0),
       loopStart(-1),
@@ -438,6 +455,16 @@ struct DivInstrumentES5506 {
     rVol(0xffff) {}
 };
 
+struct DivInstrumentMultiPCM {
+  unsigned char ar, d1r, dl, d2r, rr, rc;
+  unsigned char lfo, vib, am;
+
+  DivInstrumentMultiPCM():
+    ar(15), d1r(15), dl(0), d2r(0), rr(15), rc(15),
+    lfo(0), vib(0), am(0) {
+  }
+};
+
 enum DivWaveSynthEffects {
   DIV_WS_NONE=0,
   // one waveform effects
@@ -494,6 +521,7 @@ struct DivInstrument {
   DivInstrumentN163 n163;
   DivInstrumentFDS fds;
   DivInstrumentES5506 es5506;
+  DivInstrumentMultiPCM multipcm;
   DivInstrumentWaveSynth ws;
   
   /**

src/engine/platform/arcade.cpp

@@ -135,6 +135,54 @@ const char* DivPlatformArcade::getEffectName(unsigned char effect) {
     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 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;
 }
@@ -650,6 +698,134 @@ int DivPlatformArcade::dispatch(DivCommand c) {
       }
       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: {
       amDepth=c.value;
       immWrite(0x19,amDepth);

src/engine/platform/es5506.cpp

@@ -299,16 +299,16 @@ void DivPlatformES5506::tick(bool sysTick) {
     if (chan[i].std.arp.had) {
       if (!chan[i].inPorta) {
         if (chan[i].std.arp.mode) {
-          chan[i].baseFreq=NOTE_ES5506(i,chan[i].std.arp.val);
+          chan[i].nextNote=chan[i].std.arp.val;
         } else {
-          chan[i].baseFreq=NOTE_ES5506(i,chan[i].note+chan[i].std.arp.val);
+          chan[i].nextNote=chan[i].note+chan[i].std.arp.val;
         }
       }
-      chan[i].freqChanged=true;
+      chan[i].noteChanged.note=1;
     } else {
       if (chan[i].std.arp.mode && chan[i].std.arp.finished) {
-        chan[i].baseFreq=NOTE_ES5506(i,chan[i].note);
+        chan[i].nextNote=chan[i].note;
-        chan[i].freqChanged=true;
+        chan[i].noteChanged.note=1;
       }
     }
     if (chan[i].std.pitch.had) {
@@ -535,12 +535,39 @@ void DivPlatformES5506::tick(bool sysTick) {
       }
       chan[i].envChanged.changed=0;
     }
+    if (chan[i].noteChanged.changed) {
+      if (chan[i].noteChanged.offs) {
+        if (chan[i].pcm.freqOffs!=chan[i].pcm.nextFreqOffs) {
+          chan[i].pcm.freqOffs=chan[i].pcm.nextFreqOffs;
+          const int nextFreq=NOTE_ES5506(i,chan[i].nextNote);
+          if (chan[i].nextFreq!=nextFreq) {
+            chan[i].nextFreq=nextFreq;
+            chan[i].noteChanged.freq=1;
+          }
+        }
+      }
+      if (chan[i].noteChanged.note) { // note value changed or frequency offset is changed
+        if (chan[i].prevNote!=chan[i].nextNote) {
+          chan[i].prevNote=chan[i].nextNote;
+          const int nextFreq=NOTE_ES5506(i,chan[i].nextNote);
+          if (chan[i].nextFreq!=nextFreq) {
+            chan[i].nextFreq=nextFreq;
+            chan[i].noteChanged.freq=1;
+          }
+        }
+      }
+      if (chan[i].noteChanged.freq) {
+        if (chan[i].baseFreq!=chan[i].nextFreq) {
+          chan[i].baseFreq=chan[i].nextFreq;
+          chan[i].freqChanged=true;
+        }
+      }
+      chan[i].noteChanged.changed=0;
+    }
     if (chan[i].freqChanged || chan[i].keyOn || chan[i].keyOff) {
-      chan[i].freq=parent->calcFreq(chan[i].baseFreq,chan[i].pitch,false,2,chan[i].std.pitch.val);
+      chan[i].freq=CLAMP_VAL(parent->calcFreq(chan[i].baseFreq,chan[i].pitch,false,2,chan[i].pitch2),0,0x1ffff);
-      if (chan[i].freq<0) chan[i].freq=0;
-      if (chan[i].freq>0x1ffff) chan[i].freq=0x1ffff;
       if (chan[i].keyOn) {
-        if (chan[i].pcm.index>=0) {
+        if (chan[i].pcm.index>=0 && chan[i].pcm.index<parent->song.sampleLen) {
           chan[i].k1Prev=0xffff;
           chan[i].k2Prev=0xffff;
           pageWriteMask(0x00|i,0x5f,0x00,0x0303); // Wipeout CR
@@ -622,45 +649,87 @@ int DivPlatformES5506::dispatch(DivCommand c) {
   switch (c.cmd) {
     case DIV_CMD_NOTE_ON: {
       DivInstrument* ins=parent->getIns(chan[c.chan].ins);
+      DivInstrumentAmiga::NoteMap& noteMapind=ins->amiga.noteMap[c.value];
       DivInstrumentAmiga::TransWaveMap& transWaveInd=ins->amiga.transWaveMap[ins->amiga.transWave.ind];
-      chan[c.chan].sample=ins->amiga.useTransWave?transWaveInd.ind:
+      int sample=ins->amiga.initSample;
-        (ins->amiga.useNoteMap?ins->amiga.noteMap[c.value].ind:ins->amiga.initSample);
+      if (ins->amiga.transWave.enable) {
-      double off=1.0;
+        sample=transWaveInd.ind;
-      if (chan[c.chan].sample>=0 && chan[c.chan].sample<parent->song.sampleLen) {
+      } else if (ins->amiga.useNoteMap) {
-        chan[c.chan].pcm.index=chan[c.chan].sample;
+        ins->amiga.noteMap[c.value].ind;
-        DivSample* s=parent->getSample(chan[c.chan].sample);
+      }
-        if (s->centerRate<1) {
+      if (sample>=0 && sample<parent->song.sampleLen) {
+        chan[c.chan].pcm.index=sample;
+        chan[c.chan].transWave.enable=ins->amiga.transWave.enable;
+        chan[c.chan].transWave.sliceEnable=ins->amiga.transWave.sliceEnable;
+        chan[c.chan].transWave.ind=ins->amiga.transWave.ind;
+        DivSample* s=parent->getSample(sample);
+        // get frequency offset
+        double off=1.0;
+        double center=s->centerRate;
+        if (center<1) {
           off=1.0;
         } else {
-          off=(ins->amiga.useNoteMap?((double)ins->amiga.noteMap[c.value].freq/((double)s->centerRate*pow(2.0,((double)c.value-48.0)/12.0))):1.0)*((double)s->centerRate/8363.0);
+          off=(double)center/8363.0;
+        }
+        if (ins->amiga.useNoteMap) {
+          off*=(double)noteMapind.freq/((double)MAX(1,center)*pow(2.0,((double)c.value-48.0)/12.0));
+          chan[c.chan].pcm.note=c.value;
+        }
+        // get loop mode, transwave loop
+        double loopStart=(double)s->loopStart;
+        double loopEnd=(double)s->loopEnd;
+        DivSampleLoopMode loopMode=s->isLoopable()?s->loopMode:DIV_SAMPLE_LOOPMODE_ONESHOT;
+        if (ins->amiga.transWave.enable) {
+          if (transWaveInd.loopMode!=DIV_SAMPLE_LOOPMODE_ONESHOT) {
+            loopMode=transWaveInd.loopMode;
+          } else if (!s->isLoopable()) { // default
+            loopMode=DIV_SAMPLE_LOOPMODE_PINGPONG;
+          }
+          // get loop position
+          loopStart=(double)transWaveInd.loopStart;
+          loopEnd=(double)transWaveInd.loopEnd;
+          if (ins->amiga.transWave.sliceEnable) { // sliced loop position?
+            chan[c.chan].transWave.updateSize(s->samples,loopStart,loopEnd);
+            chan[c.chan].transWave.slice=transWaveInd.slice;
+            chan[c.chan].transWave.slicePos(transWaveInd.slice);
+            loopStart=transWaveInd.sliceStart;
+            loopEnd=transWaveInd.sliceEnd;
+          }
+        }
+        // get reversed
+        bool reversed=ins->amiga.reversed;
+        if (ins->amiga.transWave.enable&&transWaveInd.reversed!=2) {
+          reversed=transWaveInd.reversed;
+        } else if (ins->amiga.useNoteMap&&noteMapind.reversed!=2) {
+          reversed=noteMapind.reversed;
         }
         const unsigned int start=s->offES5506<<10;
         const unsigned int length=s->samples-1;
         const unsigned int end=start+(length<<11);
-        chan[c.chan].pcm.loopMode=(ins->amiga.useTransWave&&transWaveInd.loopMode!=DIV_SAMPLE_LOOPMODE_ONESHOT)?transWaveInd.loopMode:(s->isLoopable()?s->loopMode:DIV_SAMPLE_LOOPMODE_ONESHOT);
+        chan[c.chan].pcm.loopMode=loopMode;
         chan[c.chan].pcm.freqOffs=off;
-        chan[c.chan].pcm.reversed=(ins->amiga.useTransWave&&transWaveInd.reversed!=2)?transWaveInd.reversed:ins->amiga.useNoteMap?ins->amiga.noteMap[c.value].reversed:ins->amiga.reversed;
+        chan[c.chan].pcm.reversed=reversed;
         chan[c.chan].pcm.bank=(s->offES5506>>22)&3;
         chan[c.chan].pcm.start=start;
         chan[c.chan].pcm.end=end;
         chan[c.chan].pcm.length=length;
-        chan[c.chan].pcm.loopStart=(start+(s->loopStart<<11))&0xfffff800;
+        chan[c.chan].pcm.loopStart=(start+(unsigned int)(loopStart*2048.0))&0xfffff800;
-        chan[c.chan].pcm.loopEnd=(start+((s->loopEnd-1)<<11))&0xffffff80;
+        chan[c.chan].pcm.loopEnd=(start+(unsigned int)((loopEnd-1.0)*2048.0))&0xffffff80;
         chan[c.chan].volMacroMax=ins->type==DIV_INS_AMIGA?64:0xffff;
         chan[c.chan].panMacroMax=ins->type==DIV_INS_AMIGA?127:0xffff;
         chan[c.chan].filter=ins->es5506.filter;
         chan[c.chan].envelope=ins->es5506.envelope;
       } else {
-        chan[c.chan].sample=-1;
         chan[c.chan].pcm.index=-1;
         chan[c.chan].filter=DivInstrumentES5506::Filter();
         chan[c.chan].envelope=DivInstrumentES5506::Envelope();
       }
       if (c.value!=DIV_NOTE_NULL) {
-        chan[c.chan].baseFreq=NOTE_ES5506(c.chan,c.value);
-        chan[c.chan].freqChanged=true;
-        chan[c.chan].volChanged.changed=0xff;
         chan[c.chan].note=c.value;
+        chan[c.chan].nextNote=chan[c.chan].note;
+        chan[c.chan].freqChanged=true;
+        chan[c.chan].noteChanged.changed=0xff;
+        chan[c.chan].volChanged.changed=0xff;
       }
       if (!chan[c.chan].std.vol.will) {
         chan[c.chan].outVol=(0xffff*chan[c.chan].vol)/0xff;
@@ -679,7 +748,6 @@ int DivPlatformES5506::dispatch(DivCommand c) {
     case DIV_CMD_NOTE_OFF:
       chan[c.chan].filter=DivInstrumentES5506::Filter();
       chan[c.chan].envelope=DivInstrumentES5506::Envelope();
-      chan[c.chan].sample=-1;
       chan[c.chan].active=false;
       chan[c.chan].keyOff=true;
       chan[c.chan].macroInit(NULL);
@@ -784,22 +852,24 @@ int DivPlatformES5506::dispatch(DivCommand c) {
       chan[c.chan].envChanged.k2Ramp=1;
       break;
     case DIV_CMD_NOTE_PORTA: {
+      int nextFreq=chan[c.chan].baseFreq;
       const int destFreq=NOTE_ES5506(c.chan,c.value2);
       bool return2=false;
-      if (destFreq>chan[c.chan].baseFreq) {
+      if (destFreq>nextFreq) {
-        chan[c.chan].baseFreq+=c.value;
+        nextFreq+=c.value;
-        if (chan[c.chan].baseFreq>=destFreq) {
+        if (nextFreq>=destFreq) {
-          chan[c.chan].baseFreq=destFreq;
+          nextFreq=destFreq;
           return2=true;
         }
       } else {
-        chan[c.chan].baseFreq-=c.value;
+        nextFreq-=c.value;
-        if (chan[c.chan].baseFreq<=destFreq) {
+        if (nextFreq<=destFreq) {
-          chan[c.chan].baseFreq=destFreq;
+          nextFreq=destFreq;
           return2=true;
         }
       }
-      chan[c.chan].freqChanged=true;
+      chan[c.chan].nextFreq=nextFreq;
+      chan[c.chan].noteChanged.freq=1;
       if (return2) {
         chan[c.chan].inPorta=false;
         return 2;
@@ -807,9 +877,9 @@ int DivPlatformES5506::dispatch(DivCommand c) {
       break;
     }
     case DIV_CMD_LEGATO: {
-      chan[c.chan].baseFreq=NOTE_ES5506(c.chan,c.value+((chan[c.chan].std.arp.will && !chan[c.chan].std.arp.mode)?(chan[c.chan].std.arp.val-12):(0)));
-      chan[c.chan].freqChanged=true;
       chan[c.chan].note=c.value;
+      chan[c.chan].nextNote=chan[c.chan].note+((chan[c.chan].std.arp.will && !chan[c.chan].std.arp.mode)?(chan[c.chan].std.arp.val-12):(0));
+      chan[c.chan].noteChanged.note=1;
       break;
     }
     case DIV_CMD_PRE_PORTA:
@@ -849,6 +919,7 @@ void DivPlatformES5506::forceIns() {
   for (int i=0; i<=chanMax; i++) {
     chan[i].insChanged=true;
     chan[i].freqChanged=true;
+    chan[i].noteChanged.changed=0xff;
     chan[i].volChanged.changed=0xff;
     chan[i].filterChanged.changed=0xff;
     chan[i].envChanged.changed=0xff;

src/engine/platform/es5506.h

@@ -33,7 +33,9 @@ class DivPlatformES5506: public DivDispatch, public es550x_intf {
   struct Channel {
     struct PCM {
       int index, next;
+      int note;
       double freqOffs;
+      double nextFreqOffs;
       bool reversed;
       unsigned int bank;
       unsigned int start;
@@ -45,7 +47,9 @@ class DivPlatformES5506: public DivDispatch, public es550x_intf {
       PCM():
         index(-1),
         next(-1),
+        note(0),
         freqOffs(1.0),
+        nextFreqOffs(1.0),
         reversed(false),
         bank(0),
         start(0),
@@ -55,10 +59,25 @@ class DivPlatformES5506: public DivDispatch, public es550x_intf {
         loopEnd(0),
         loopMode(DIV_SAMPLE_LOOPMODE_ONESHOT) {}
     } pcm;
-    int freq, baseFreq, pitch, pitch2, note, ins, sample, wave;
+    int freq, baseFreq, nextFreq, pitch, pitch2, note, nextNote, prevNote, ins, wave;
     unsigned int volMacroMax, panMacroMax;
     bool active, insChanged, freqChanged, pcmChanged, keyOn, keyOff, inPorta, useWave, isReverseLoop;
 
+    struct NoteChanged { // Note changed flags
+      union { // pack flag bits in single byte
+        struct { // flag bits
+          unsigned char offs: 1; // frequency offset
+          unsigned char note: 1; // note
+          unsigned char freq: 1; // base frequency
+          unsigned char dummy: 5; // dummy for bit padding
+        };
+        unsigned char changed; // Packed flags are stored here
+      };
+
+      NoteChanged() :
+        changed(0) {}
+    } noteChanged;
+
     struct VolChanged { // Volume changed flags
       union { // pack flag bits in single byte
         struct { // flag bits
@@ -114,6 +133,7 @@ class DivPlatformES5506: public DivDispatch, public es550x_intf {
     signed int lOut, rOut, oscOut;
     DivInstrumentES5506::Filter filter;
     DivInstrumentES5506::Envelope envelope;
+    DivInstrumentAmiga::TransWave transWave;
     DivMacroInt std;
     void macroInit(DivInstrument* which) {
       std.init(which);
@@ -130,11 +150,13 @@ class DivPlatformES5506: public DivDispatch, public es550x_intf {
     Channel():
       freq(0),
       baseFreq(0),
+      nextFreq(0),
       pitch(0),
       pitch2(0),
       note(0),
+      nextNote(0),
+      prevNote(0),
       ins(-1),
-      sample(-1),
       wave(-1),
       volMacroMax(0xffff),
       panMacroMax(0xffff),

src/engine/platform/genesis.cpp

@@ -77,6 +77,54 @@ const char* DivPlatformGenesis::getEffectName(unsigned char effect) {
     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 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;
 }
@@ -782,7 +830,7 @@ int DivPlatformGenesis::dispatch(DivCommand c) {
           unsigned short baseAddr=chanOffs[c.chan]|opOffs[i];
           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]];
         op.ar=c.value2&31;
         unsigned short baseAddr=chanOffs[c.chan]|opOffs[orderedOps[c.value]];
@@ -790,6 +838,134 @@ int DivPlatformGenesis::dispatch(DivCommand c) {
       }
       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:
       chan[c.chan].hardReset=c.value;
       break;

src/engine/platform/genesisext.cpp

@@ -235,6 +235,134 @@ int DivPlatformGenesisExt::dispatch(DivCommand c) {
       }
       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:
       return 127;
       break;

src/engine/platform/mmc5.cpp

@@ -305,6 +305,7 @@ int DivPlatformMMC5::dispatch(DivCommand c) {
     }
     case DIV_CMD_STD_NOISE_MODE:
       chan[c.chan].duty=c.value;
+      rWrite(0x5000+c.chan*4,0x30|chan[c.chan].outVol|((chan[c.chan].duty&3)<<6));
       break;
     case DIV_CMD_SAMPLE_BANK:
       sampleBank=c.value;

src/engine/platform/nes.cpp

@@ -521,6 +521,8 @@ int DivPlatformNES::dispatch(DivCommand c) {
       chan[c.chan].duty=c.value;
       if (c.chan==3) { // noise
         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;
     case DIV_CMD_NES_SWEEP:

src/engine/platform/opl.cpp

@@ -197,6 +197,48 @@ const char* DivPlatformOPL::getEffectName(unsigned char effect) {
     case 0x1d:
       return "1Dxx: Set attack of operator 4 (0 to F; 4-op only)";
       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;
 }
@@ -266,7 +308,7 @@ void DivPlatformOPL::tick(bool sysTick) {
         if (isMuted[i]) {
           rWrite(baseAddr+ADDR_KSL_TL,63|(op.ksl<<6));
         } else {
-          if (isOutputL[ops==4][chan[i].state.alg][j]) {
+          if (isOutputL[ops==4][chan[i].state.alg][j] || i>=melodicChans) {
             rWrite(baseAddr+ADDR_KSL_TL,(63-(((63-op.tl)*(chan[i].outVol&0x3f))/63))|(op.ksl<<6));
           } else {
             rWrite(baseAddr+ADDR_KSL_TL,op.tl|(op.ksl<<6));
@@ -393,7 +435,7 @@ void DivPlatformOPL::tick(bool sysTick) {
         if (isMuted[i]) {
           rWrite(baseAddr+ADDR_KSL_TL,63|(op.ksl<<6));
         } else {
-          if (isOutputL[ops==4][chan[i].state.alg][j]) {
+          if (isOutputL[ops==4][chan[i].state.alg][j] || i>=melodicChans) {
             rWrite(baseAddr+ADDR_KSL_TL,(63-(((63-op.tl)*(chan[i].outVol&0x3f))/63))|(op.ksl<<6));
           } else {
             rWrite(baseAddr+ADDR_KSL_TL,op.tl|(op.ksl<<6));
@@ -403,10 +445,34 @@ void DivPlatformOPL::tick(bool sysTick) {
     }
 
     if (i<melodicChans) {
+      if (chan[i].hardReset && chan[i].keyOn) {
+        for (int j=0; j<ops; j++) {
+          unsigned char slot=slots[j][i];
+          if (slot==255) continue;
+          unsigned short baseAddr=slotMap[slot];
+          DivInstrumentFM::Operator& op=chan[i].state.op[(ops==4)?orderedOpsL[j]:j];
+          immWrite(baseAddr+ADDR_SL_RR,0x0f);
+          immWrite(baseAddr+ADDR_KSL_TL,63|(op.ksl<<6));
+          oldWrites[baseAddr+ADDR_SL_RR]=-1;
+          oldWrites[baseAddr+ADDR_KSL_TL]=-1;
+        }
+      }
       if (chan[i].keyOn || chan[i].keyOff) {
         immWrite(chanMap[i]+ADDR_FREQH,0x00|(chan[i].freqH&31));
         chan[i].keyOff=false;
       }
+      if (chan[i].hardReset && chan[i].keyOn) {
+        for (int j=0; j<ops; j++) {
+          unsigned char slot=slots[j][i];
+          if (slot==255) continue;
+          unsigned short baseAddr=slotMap[slot];
+          DivInstrumentFM::Operator& op=chan[i].state.op[(ops==4)?orderedOpsL[j]:j];
+          for (int k=0; k<5; k++) {
+            immWrite(baseAddr+ADDR_SL_RR,0x0f);
+            immWrite(baseAddr+ADDR_KSL_TL,63|(op.ksl<<6));
+          }
+        }
+      }
     }
   }
 
@@ -522,6 +588,9 @@ int DivPlatformOPL::toFreq(int freq) {
 
 void DivPlatformOPL::muteChannel(int ch, bool mute) {
   isMuted[ch]=mute;
+  if (oplType<3 && ch<melodicChans) {
+    fm.channel[outChanMap[ch]].muted=mute;
+  }
   int ops=(slots[3][ch]!=255 && chan[ch].state.ops==4 && oplType==3)?4:2;
   chan[ch].fourOp=(ops==4);
   update4OpMask=true;
@@ -534,7 +603,7 @@ void DivPlatformOPL::muteChannel(int ch, bool mute) {
     if (isMuted[ch]) {
       rWrite(baseAddr+ADDR_KSL_TL,63|(op.ksl<<6));
     } else {
-      if (isOutputL[ops==4][chan[ch].state.alg][i]) {
+      if (isOutputL[ops==4][chan[ch].state.alg][i] || ch>=melodicChans) {
         rWrite(baseAddr+ADDR_KSL_TL,(63-(((63-op.tl)*(chan[ch].outVol&0x3f))/63))|(op.ksl<<6));
       } else {
         rWrite(baseAddr+ADDR_KSL_TL,op.tl|(op.ksl<<6));
@@ -589,7 +658,7 @@ int DivPlatformOPL::dispatch(DivCommand c) {
           if (isMuted[c.chan]) {
             rWrite(baseAddr+ADDR_KSL_TL,63|(op.ksl<<6));
           } else {
-            if (isOutputL[ops==4][chan[c.chan].state.alg][i]) {
+            if (isOutputL[ops==4][chan[c.chan].state.alg][i] || c.chan>=melodicChans) {
               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));
@@ -678,7 +747,7 @@ int DivPlatformOPL::dispatch(DivCommand c) {
         if (isMuted[c.chan]) {
           rWrite(baseAddr+ADDR_KSL_TL,63|(op.ksl<<6));
         } else {
-          if (isOutputL[ops==4][chan[c.chan].state.alg][i]) {
+          if (isOutputL[ops==4][chan[c.chan].state.alg][i] || c.chan>=melodicChans) {
             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));
@@ -811,7 +880,7 @@ int DivPlatformOPL::dispatch(DivCommand c) {
       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]) {
+        if (isOutputL[ops==4][chan[c.chan].state.alg][c.value] || c.chan>=melodicChans) {
           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));
@@ -841,6 +910,222 @@ int DivPlatformOPL::dispatch(DivCommand c) {
       }      
       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] || c.chan>=melodicChans) {
+              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] || c.chan>=melodicChans) {
+            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: {
       if (!properDrumsSys) break;
       properDrums=c.value;
@@ -857,6 +1142,9 @@ int DivPlatformOPL::dispatch(DivCommand c) {
       }
       break;
     }
+    case DIV_CMD_FM_HARD_RESET:
+      chan[c.chan].hardReset=c.value;
+      break;
     case DIV_ALWAYS_SET_VOLUME:
       return 0;
       break;
@@ -900,7 +1188,7 @@ void DivPlatformOPL::forceIns() {
       if (isMuted[i]) {
         rWrite(baseAddr+ADDR_KSL_TL,63|(op.ksl<<6));
       } else {
-        if (isOutputL[ops==4][chan[i].state.alg][j]) {
+        if (isOutputL[ops==4][chan[i].state.alg][j] || i>=melodicChans) {
           rWrite(baseAddr+ADDR_KSL_TL,(63-(((63-op.tl)*(chan[i].outVol&0x3f))/63))|(op.ksl<<6));
         } else {
           rWrite(baseAddr+ADDR_KSL_TL,op.tl|(op.ksl<<6));
@@ -968,10 +1256,12 @@ void DivPlatformOPL::reset() {
   properDrums=properDrumsSys;
   if (oplType==3) {
     chanMap=properDrums?chanMapOPL3Drums:chanMapOPL3;
+    outChanMap=outChanMapOPL3;
     melodicChans=properDrums?15:18;
     totalChans=properDrums?20:18;
   } else {
     chanMap=properDrums?chanMapOPL2Drums:chanMapOPL2;
+    outChanMap=outChanMapOPL2;
     melodicChans=properDrums?6:9;
     totalChans=properDrums?11:9;
   }
@@ -983,6 +1273,10 @@ void DivPlatformOPL::reset() {
     chan[i].outVol=0x3f;
   }
   
+  if (oplType<3) for (int i=0; i<melodicChans; i++) {
+    fm.channel[outChanMap[i]].muted=isMuted[i];
+  }
+
   for (int i=0; i<512; i++) {
     oldWrites[i]=-1;
     pendingWrites[i]=-1;

src/engine/platform/opl.h

@@ -22,7 +22,7 @@
 #include "../dispatch.h"
 #include "../macroInt.h"
 #include <queue>
-#include "../../../extern/Nuked-OPL3/opl3.h"
+#include "../../../extern/opl/opl3.h"
 
 class DivPlatformOPL: public DivDispatch {
   protected:
@@ -31,7 +31,7 @@ class DivPlatformOPL: public DivDispatch {
       DivMacroInt std;
       unsigned char freqH, freqL;
       int freq, baseFreq, pitch, pitch2, note, ins;
-      bool active, insChanged, freqChanged, keyOn, keyOff, portaPause, furnaceDac, inPorta, fourOp;
+      bool active, insChanged, freqChanged, keyOn, keyOff, portaPause, furnaceDac, inPorta, fourOp, hardReset;
       int vol, outVol;
       unsigned char pan;
       void macroInit(DivInstrument* which) {
@@ -56,6 +56,7 @@ class DivPlatformOPL: public DivDispatch {
         furnaceDac(false),
         inPorta(false),
         fourOp(false),
+        hardReset(false),
         vol(0),
         pan(3) {
         state.ops=2;

src/engine/platform/opll.cpp

@@ -55,6 +55,36 @@ const char* DivPlatformOPLL::getEffectName(unsigned char effect) {
     case 0x1b:
       return "1Bxx: Set attack of operator 2 (0 to F)";
       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;
 }
@@ -447,6 +477,7 @@ int DivPlatformOPLL::dispatch(DivCommand c) {
             if (drums) {
               drums=false;
               immWrite(0x0e,0);
+              drumState=0;
             }
           }
           if (c.chan<9) {
@@ -637,6 +668,150 @@ int DivPlatformOPLL::dispatch(DivCommand c) {
       rWrite(0x05,(car.ar<<4)|(car.dr));
       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:
       if (!properDrumsSys) break;
       if ((int)properDrums==c.value) break;

src/engine/platform/sound/ymfm/ymfm_fm.ipp

@@ -480,7 +480,7 @@ if (m_choffs == 0)
 #endif
 
 	// early out if the envelope is effectively off
-	if (m_env_attenuation > EG_QUIET)
+	if (m_env_attenuation > EG_QUIET && m_cache.eg_shift == 0)
 		return 0;
 
 	// get the absolute value of the sin, as attenuation, as a 4.8 fixed point value

src/engine/platform/sound/ymfm/ymfm_opz.cpp

@@ -70,16 +70,24 @@
 // OPZ supports a "fixed frequency" mode for each operator, with a 3-bit
 // range and 4-bit frequency value, plus a 1-bit enable. Not sure how that
 // works at all, so it's not implemented.
+// note by tildearrow:
+// - I have verified behavior of this mode against real hardware.
+//   after applying a small fix on the existing early implementation, it matches hardware.
+//   this means fixed frequency is fully implemented and working.
 //
 // There are also several mystery fields in the operators which I have no
 // clue about: "fine" (4 bits), "eg_shift" (2 bits), and "rev" (3 bits).
 // eg_shift is some kind of envelope generator effect, but how it works is
 // unknown.
+// note by tildearrow:
+// - behavior of "fine" is now confirmed and matches hardware.
 //
 // Also, according to the site above, the panning controls are changed from
 // OPM, with a "mono" bit and only one control bit for the right channel.
 // Current implementation is just a guess.
 //
+// additional modifications by tildearrow for Furnace
+//
 
 namespace ymfm
 {
@@ -409,9 +417,6 @@ uint32_t opz_registers::lfo_am_offset(uint32_t choffs) const
 
 void opz_registers::cache_operator_data(uint32_t choffs, uint32_t opoffs, opdata_cache &cache)
 {
-	// TODO: how does fixed frequency mode work? appears to be enabled by
-	// op_fix_mode(), and controlled by op_fix_range(), op_fix_frequency()
-
 	// TODO: what is op_rev()?
 
 	// set up the easy stuff
@@ -467,8 +472,8 @@ void opz_registers::cache_operator_data(uint32_t choffs, uint32_t opoffs, opdata
 	if (reverb != 0)
 		cache.eg_rate[EG_REVERB] = std::min<uint32_t>(effective_rate(reverb * 4 + 2, ksrval), cache.eg_rate[EG_REVERB]);
 
-	// set the envelope shift; TX81Z manual says operator 1 shift is fixed at "off"
+	// set the envelope shift; TX81Z manual says operator 1 (actually operator 4) shift is fixed at "off"
-	cache.eg_shift = ((opoffs & 0x18) == 0) ? 0 : op_eg_shift(opoffs);
+	cache.eg_shift = ((opoffs & 0x18) == 0x18) ? 0 : op_eg_shift(opoffs);
 }
 
 

src/engine/platform/tx81z.cpp

@@ -137,8 +137,84 @@ const char* DivPlatformTX81Z::getEffectName(unsigned char effect) {
     case 0x1f:
       return "1Fxx: Set PM depth (0 to 7F)";
       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;
   }
   return NULL;
@@ -604,8 +680,10 @@ int DivPlatformTX81Z::dispatch(DivCommand c) {
     case DIV_CMD_FM_MULT: {
       unsigned short baseAddr=chanOffs[c.chan]|opOffs[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;
     }
     case DIV_CMD_FM_TL: {
@@ -639,6 +717,222 @@ int DivPlatformTX81Z::dispatch(DivCommand c) {
       }
       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;
+      printf("fixfreq %x\n",c.value2);
+      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)<<4));
+        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: {
       amDepth=c.value;
       immWrite(0x19,amDepth);

src/engine/platform/ym2610.cpp

@@ -397,6 +397,54 @@ const char* DivPlatformYM2610::getEffectName(unsigned char effect) {
     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 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;
 }
@@ -1088,6 +1136,134 @@ int DivPlatformYM2610::dispatch(DivCommand c) {
       }
       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:
       chan[c.chan].hardReset=c.value;
       break;

src/engine/platform/ym2610b.cpp

@@ -377,6 +377,54 @@ const char* DivPlatformYM2610B::getEffectName(unsigned char effect) {
     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 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;
 }
@@ -1066,6 +1114,134 @@ int DivPlatformYM2610B::dispatch(DivCommand c) {
       }
       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:
       chan[c.chan].hardReset=c.value;
       break;

src/engine/platform/ym2610bext.cpp

@@ -175,17 +175,146 @@ int DivPlatformYM2610BExt::dispatch(DivCommand c) {
       break;
     }
     case DIV_CMD_FM_AR: {
-      DivInstrument* ins=parent->getIns(opChan[ch].ins,DIV_INS_FM);
       if (c.value<0)  {
         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];
-          rWrite(baseAddr+0x50,(c.value2&31)|(op.rs<<6));
+          rWrite(baseAddr+0x50,(op.ar&31)|(op.rs<<6));
         }
       } 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]];
-        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;
     }

src/engine/platform/ym2610ext.cpp

@@ -175,17 +175,146 @@ int DivPlatformYM2610Ext::dispatch(DivCommand c) {
       break;
     }
     case DIV_CMD_FM_AR: {
-      DivInstrument* ins=parent->getIns(opChan[ch].ins,DIV_INS_FM);
       if (c.value<0)  {
         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];
-          rWrite(baseAddr+0x50,(c.value2&31)|(op.rs<<6));
+          rWrite(baseAddr+0x50,(op.ar&31)|(op.rs<<6));
         }
       } 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]];
-        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;
     }

src/engine/song.h

@@ -346,7 +346,7 @@ struct DivSong {
   std::vector<DivSample*> sample;
 
   bool chanShow[DIV_MAX_CHANS];
-  bool chanCollapse[DIV_MAX_CHANS];
+  unsigned char chanCollapse[DIV_MAX_CHANS];
 
   DivInstrument nullIns, nullInsOPLL, nullInsOPL, nullInsQSound;
   DivWavetable nullWave;
@@ -453,13 +453,39 @@ struct DivSong {
     }
     for (int i=0; i<DIV_MAX_CHANS; i++) {
       chanShow[i]=true;
-      chanCollapse[i]=false;
+      chanCollapse[i]=0;
     }
     system[0]=DIV_SYSTEM_YM2612;
     system[1]=DIV_SYSTEM_SMS;
 
+    // OPLL default instrument contest winner - piano_guitar_idk by Weeppiko
     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].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!";
 
     nullInsOPL.fm.alg=0;

src/engine/sysDef.cpp

@@ -53,7 +53,7 @@ std::vector<DivInstrumentType>& DivEngine::getPossibleInsTypes() {
 }
 
 // TODO: rewrite this function (again). it's an unreliable mess.
-const char* DivEngine::getSongSystemName() {
+String DivEngine::getSongSystemName(bool isMultiSystemAcceptable) {
   switch (song.systemLen) {
     case 0:
       return "help! what's going on!";
@@ -198,7 +198,15 @@ const char* DivEngine::getSongSystemName() {
       }
       break;
   }
-  return "multi-system";
+  if (isMultiSystemAcceptable) return "multi-system";
+
+  String ret="";
+  for (int i=0; i<song.systemLen; i++) {
+    if (i>0) ret+=" + ";
+    ret+=getSystemName(song.system[i]);
+  }
+
+  return ret;
 }
 
 const char* DivEngine::getSystemName(DivSystem sys) {
@@ -496,6 +504,7 @@ void DivEngine::registerSystems() {
       OP_EFFECT_SINGLE(0x28,DIV_CMD_FM_REV,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(0x2c,DIV_CMD_FM_FINE,4,15);
       default:
         return false;
     }
@@ -541,7 +550,6 @@ void DivEngine::registerSystems() {
       OP_EFFECT_MULTI(0x58,DIV_CMD_FM_DR,1,15);
 
       OP_EFFECT_SINGLE(0x5b,DIV_CMD_FM_KSR,2,1);
-      OP_EFFECT_SINGLE(0x2a,DIV_CMD_FM_WS,4,7);
       default:
         return false;
     }
@@ -607,6 +615,7 @@ void DivEngine::registerSystems() {
       OP_EFFECT_MULTI(0x5a,DIV_CMD_FM_DR,3,15);
 
       OP_EFFECT_SINGLE(0x5b,DIV_CMD_FM_KSR,4,1);
+      OP_EFFECT_SINGLE(0x2a,DIV_CMD_FM_WS,4,7);
 
       default:
         return false;
@@ -1439,7 +1448,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_YM2612_EXT]=new DivSysDef(
-    "Yamaha YM2612 Extended Channel 3", NULL, 0xa0, 0, 9, true, false, 0x150, false,
+    "Yamaha YM2612 (OPN2) Extended Channel 3", NULL, 0xa0, 0, 9, true, false, 0x150, false,
     {"FM 1", "FM 2", "FM 3 OP1", "FM 3 OP2", "FM 3 OP3", "FM 3 OP4", "FM 4", "FM 5", "FM 6"},
     {"F1", "F2", "O1", "O2", "O3", "O4", "F4", "F5", "F6"},
     {DIV_CH_FM, DIV_CH_FM, DIV_CH_OP, DIV_CH_OP, DIV_CH_OP, DIV_CH_OP, DIV_CH_FM, DIV_CH_FM, DIV_CH_FM},
@@ -1472,7 +1481,7 @@ void DivEngine::registerSystems() {
   };
 
   sysDefs[DIV_SYSTEM_OPL_DRUMS]=new DivSysDef(
-    "Yamaha OPL with drums", NULL, 0xa2, 0, 11, true, false, 0x151, false,
+    "Yamaha YM3526 (OPL) with drums", NULL, 0xa2, 0, 11, true, false, 0x151, false,
     {"FM 1", "FM 2", "FM 3", "FM 4", "FM 5", "FM 6", "Kick", "Snare", "Tom", "Top", "HiHat"},
     {"F1", "F2", "F3", "F4", "F5", "F6", "BD", "SD", "TM", "TP", "HH"},
     {DIV_CH_FM, DIV_CH_FM, DIV_CH_FM, DIV_CH_FM, DIV_CH_FM, DIV_CH_FM, DIV_CH_NOISE, DIV_CH_NOISE, DIV_CH_NOISE, DIV_CH_NOISE, DIV_CH_NOISE},
@@ -1483,7 +1492,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_OPL2_DRUMS]=new DivSysDef(
-    "Yamaha OPL2 with drums", NULL, 0xa3, 0, 11, true, false, 0x151, false,
+    "Yamaha YM3812 (OPL2) with drums", NULL, 0xa3, 0, 11, true, false, 0x151, false,
     {"FM 1", "FM 2", "FM 3", "FM 4", "FM 5", "FM 6", "Kick", "Snare", "Tom", "Top", "HiHat"},
     {"F1", "F2", "F3", "F4", "F5", "F6", "BD", "SD", "TM", "TP", "HH"},
     {DIV_CH_FM, DIV_CH_FM, DIV_CH_FM, DIV_CH_FM, DIV_CH_FM, DIV_CH_FM, DIV_CH_NOISE, DIV_CH_NOISE, DIV_CH_NOISE, DIV_CH_NOISE, DIV_CH_NOISE},
@@ -1494,7 +1503,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_OPL3_DRUMS]=new DivSysDef(
-    "Yamaha OPL3 with drums", NULL, 0xa4, 0, 20, true, false, 0x151, false,
+    "Yamaha YMF262 (OPL3) with drums", NULL, 0xa4, 0, 20, true, false, 0x151, false,
     {"4OP 1", "FM 2", "4OP 3", "FM 4", "4OP 5", "FM 6", "4OP 7", "FM 8", "4OP 9", "FM 10", "4OP 11", "FM 12", "FM 13", "FM 14", "FM 15", "Kick", "Snare", "Tom", "Top", "HiHat"},
     {"1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "BD", "SD", "TM", "TP", "HH"},
     {DIV_CH_OP, DIV_CH_FM, DIV_CH_OP, DIV_CH_FM, DIV_CH_OP, DIV_CH_FM, DIV_CH_OP, DIV_CH_FM, DIV_CH_OP, DIV_CH_FM, DIV_CH_OP, DIV_CH_FM, DIV_CH_FM, DIV_CH_FM, DIV_CH_FM, DIV_CH_NOISE, DIV_CH_NOISE, DIV_CH_NOISE, DIV_CH_NOISE, DIV_CH_NOISE},
@@ -1516,7 +1525,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_YM2610_FULL_EXT]=new DivSysDef(
-    "Yamaha YM2610 Extended Channel 2", NULL, 0xa6, 0, 17, true, false, 0x151, false,
+    "Yamaha YM2610 (OPNB) Extended Channel 2", NULL, 0xa6, 0, 17, true, false, 0x151, false,
     {"FM 1", "FM 2 OP1", "FM 2 OP2", "FM 2 OP3", "FM 2 OP4", "FM 3", "FM 4", "PSG 1", "PSG 2", "PSG 3", "ADPCM-A 1", "ADPCM-A 2", "ADPCM-A 3", "ADPCM-A 4", "ADPCM-A 5", "ADPCM-A 6", "ADPCM-B"},
     {"F1", "O1", "O2", "O3", "O4", "F3", "F4", "S1", "S2", "S3", "P1", "P2", "P3", "P4", "P5", "P6", "B"},
     {DIV_CH_FM, DIV_CH_OP, DIV_CH_OP, DIV_CH_OP, DIV_CH_OP, DIV_CH_FM, DIV_CH_FM, DIV_CH_PULSE, DIV_CH_PULSE, DIV_CH_PULSE, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM},
@@ -1527,7 +1536,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_OPLL_DRUMS]=new DivSysDef(
-    "Yamaha OPLL with drums", NULL, 0xa7, 0, 11, true, false, 0x150, false,
+    "Yamaha YM2413 (OPLL) with drums", NULL, 0xa7, 0, 11, true, false, 0x150, false,
     {"FM 1", "FM 2", "FM 3", "FM 4", "FM 5", "FM 6", "Kick", "Snare", "Tom", "Top", "HiHat"},
     {"F1", "F2", "F3", "F4", "F5", "F6", "BD", "SD", "TM", "TP", "HH"},
     {DIV_CH_FM, DIV_CH_FM, DIV_CH_FM, DIV_CH_FM, DIV_CH_FM, DIV_CH_FM, DIV_CH_NOISE, DIV_CH_NOISE, DIV_CH_NOISE, DIV_CH_NOISE, DIV_CH_NOISE},
@@ -1608,7 +1617,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_YM2610B_EXT]=new DivSysDef(
-    "Yamaha YM2610B Extended Channel 3", NULL, 0xde, 0, 19, true, false, 0x151, false,
+    "Yamaha YM2610B (OPNB-B) Extended Channel 3", NULL, 0xde, 0, 19, true, false, 0x151, false,
     {"FM 1", "FM 2", "FM 3 OP1", "FM 3 OP2", "FM 3 OP3", "FM 3 OP4", "FM 4", "FM 5", "FM 6", "PSG 1", "PSG 2", "PSG 3", "ADPCM-A 1", "ADPCM-A 2", "ADPCM-A 3", "ADPCM-A 4", "ADPCM-A 5", "ADPCM-A 6", "ADPCM-B"},
     {"F1", "F2", "O1", "O2", "O3", "O4", "F4", "F5", "F6", "S1", "S2", "S3", "P1", "P2", "P3", "P4", "P5", "P6", "B"},
     {DIV_CH_FM, DIV_CH_FM, DIV_CH_OP, DIV_CH_OP, DIV_CH_OP, DIV_CH_OP, DIV_CH_FM, DIV_CH_FM, DIV_CH_FM, DIV_CH_PULSE, DIV_CH_PULSE, DIV_CH_PULSE, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM},

src/gui/cursor.cpp

@@ -83,10 +83,10 @@ void FurnaceGUI::finishSelection() {
   if (cursor.y<0) cursor.y=0;
   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;
   }
-  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;
   }
 
@@ -105,7 +105,7 @@ void FurnaceGUI::moveCursor(int x, int y, bool select) {
     demandScrollX=true;
     if (x>0) {
       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;
           if (++cursor.xCoarse>=lastChannel) {
             if (settings.wrapHorizontal!=0 && !select) {
@@ -113,7 +113,7 @@ void FurnaceGUI::moveCursor(int x, int y, bool select) {
               if (settings.wrapHorizontal==2) y++;
             } else {
               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 {
             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 (e->song.chanCollapse[cursor.xCoarse]) {
-              cursor.xFine=0;
+              cursor.xFine=3-e->song.chanCollapse[cursor.xCoarse];
             } else {
               cursor.xFine=2+e->song.pat[cursor.xCoarse].effectCols*2;
             }

src/gui/dataList.cpp

@@ -23,6 +23,7 @@
 #include "plot_nolerp.h"
 #include "guiConst.h"
 #include <fmt/printf.h>
+#include <imgui.h>
 
 const char* sampleNote[12]={
   "C", "C#", "D", "D#", "E", "F", "F#", "G", "G#", "A", "A#", "B"
@@ -36,6 +37,7 @@ void FurnaceGUI::drawInsList() {
   }
   if (!insListOpen) return;
   if (ImGui::Begin("Instruments",&insListOpen)) {
+    if (settings.unifiedDataView) settings.horizontalDataView=0;
     if (ImGui::Button(ICON_FA_PLUS "##InsAdd")) {
       doAction(GUI_ACTION_INS_LIST_ADD);
     }
@@ -45,7 +47,7 @@ void FurnaceGUI::drawInsList() {
     }
     ImGui::SameLine();
     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();
     if (ImGui::Button(ICON_FA_FLOPPY_O "##InsSave")) {
@@ -64,7 +66,12 @@ void FurnaceGUI::drawInsList() {
       doAction(GUI_ACTION_INS_LIST_DELETE);
     }
     ImGui::Separator();
-    if (ImGui::BeginTable("InsListScroll",1,ImGuiTableFlags_ScrollY)) {
+    int availableRows=ImGui::GetContentRegionAvail().y/ImGui::GetFrameHeight();
+    if (availableRows<1) availableRows=1;
+    int columns=settings.horizontalDataView?(int)(ceil((double)(e->song.ins.size()+1)/(double)availableRows)):1;
+    if (columns<1) columns=1;
+    if (columns>64) columns=64;
+    if (ImGui::BeginTable("InsListScroll",columns,(settings.horizontalDataView?ImGuiTableFlags_ScrollX:0)|ImGuiTableFlags_ScrollY)) {
       if (settings.unifiedDataView) {
         ImGui::TableNextRow();
         ImGui::TableNextColumn();
@@ -72,6 +79,11 @@ void FurnaceGUI::drawInsList() {
         ImGui::Indent();
       }
 
+      if (settings.horizontalDataView) {
+        ImGui::TableNextRow();
+      }
+
+      int curRow=0;
       for (int i=-1; i<(int)e->song.ins.size(); i++) {
         String name=ICON_FA_CIRCLE_O " - None -";
         const char* insType="Bug!";
@@ -211,8 +223,12 @@ void FurnaceGUI::drawInsList() {
         } else {
           ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_TEXT]);
         }
-        ImGui::TableNextRow();
+        if (!settings.horizontalDataView) {
-        ImGui::TableNextColumn();
+          ImGui::TableNextRow();
+          ImGui::TableNextColumn();
+        } else if (curRow==0) {
+          ImGui::TableNextColumn();
+        }
         if (ImGui::Selectable(name.c_str(),(i==-1)?(curIns<0 || curIns>=e->song.insLen):(curIns==i))) {
           curIns=i;
         }
@@ -228,6 +244,9 @@ void FurnaceGUI::drawInsList() {
             nextWindow=GUI_WINDOW_INS_EDIT;
           }
         }
+        if (settings.horizontalDataView) {
+          if (++curRow>=availableRows) curRow=0;
+        }
       }
 
       if (settings.unifiedDataView) {

src/gui/debug.cpp

@@ -339,17 +339,23 @@ void putDispatchChan(void* data, int chanNum, int type) {
       ImGui::Text("> ES5506");
       ImGui::Text("* freq: %.5x",ch->freq);
       ImGui::Text(" - base: %d",ch->baseFreq);
+      ImGui::Text(" - next: %d",ch->nextFreq);
+      ImGui::Text(" - prev: %d",ch->prevFreq);
       ImGui::Text(" - pitch: %d",ch->pitch);
       ImGui::Text(" - pitch2: %d",ch->pitch2);
-      ImGui::Text("- note: %d",ch->note);
+      ImGui::Text("* note: %d",ch->note);
+      ImGui::Text(" - next: %d",ch->nextNote);
+      ImGui::Text(" - prev: %d",ch->prevNote);
       ImGui::Text("- ins: %d",ch->ins);
-      ImGui::Text("- sample: %d",ch->sample);
       ImGui::Text("- wave: %d",ch->wave);
       ImGui::Text("- VolMacroMax: %d",ch->volMacroMax);
       ImGui::Text("- PanMacroMax: %d",ch->panMacroMax);
       ImGui::Text("* PCM:");
-      ImGui::Text(" - index: %d",ch->pcm.index);
+      ImGui::Text(" * index: %d",ch->pcm.index);
-      ImGui::Text(" - freqOffs: %.6f",ch->pcm.freqOffs);
+      ImGui::Text("  - next: %d",ch->pcm.next);
+      ImGui::Text(" - note: %d",ch->pcm.note);
+      ImGui::Text(" * freqOffs: %.6f",ch->pcm.freqOffs);
+      ImGui::Text("  - next: %.6f",ch->pcm.nextFreqOffs);
       ImGui::Text(" - bank: %.2x",ch->pcm.bank);
       ImGui::Text(" - start: %.8x",ch->pcm.start);
       ImGui::Text(" - end: %.8x",ch->pcm.end);

src/gui/doAction.cpp

@@ -465,7 +465,11 @@ void FurnaceGUI::doAction(int what) {
       break;
     case GUI_ACTION_PAT_COLLAPSE:
       if (cursor.xCoarse<0 || cursor.xCoarse>=e->getTotalChannelCount()) break;
-      e->song.chanCollapse[cursor.xCoarse]=!e->song.chanCollapse[cursor.xCoarse];
+      if (e->song.chanCollapse[cursor.xCoarse]==0) {
+        e->song.chanCollapse[cursor.xCoarse]=3;
+      } else if (e->song.chanCollapse[cursor.xCoarse]>0) {
+        e->song.chanCollapse[cursor.xCoarse]--;
+      }
       break;
     case GUI_ACTION_PAT_INCREASE_COLUMNS:
       if (cursor.xCoarse<0 || cursor.xCoarse>=e->getTotalChannelCount()) break;
@@ -518,6 +522,9 @@ void FurnaceGUI::doAction(int what) {
     case GUI_ACTION_INS_LIST_OPEN:
       openFileDialog(GUI_FILE_INS_OPEN);
       break;
+    case GUI_ACTION_INS_LIST_OPEN_REPLACE:
+      openFileDialog(GUI_FILE_INS_OPEN_REPLACE);
+      break;
     case GUI_ACTION_INS_LIST_SAVE:
       if (curIns>=0 && curIns<(int)e->song.ins.size()) openFileDialog(GUI_FILE_INS_SAVE);
       break;

src/gui/gui.cpp

@@ -588,7 +588,7 @@ void FurnaceGUI::updateWindowTitle() {
   }
 
   if (settings.titleBarSys) {
-    title+=fmt::sprintf(" (%s)",e->getSongSystemName());
+    title+=fmt::sprintf(" (%s)",e->getSongSystemName(!settings.noMultiSystem));
   }
 
   if (sdlWin!=NULL) SDL_SetWindowTitle(sdlWin,title.c_str());
@@ -1259,9 +1259,9 @@ void FurnaceGUI::openFileDialog(FurnaceGUIFileDialogs type) {
       if (!dirExists(workingDirSong)) workingDirSong=getHomeDir();
       hasOpened=fileDialog->openLoad(
         "Open File",
-        {"compatible files", "*.fur *.dmf *.mod",
+        {"compatible files", "*.fur *.dmf *.mod *.ftm",
          "all files", ".*"},
-        "compatible files{.fur,.dmf,.mod},.*",
+        "compatible files{.fur,.dmf,.mod,.ftm},.*",
         workingDirSong,
         dpiScale
       );
@@ -1288,7 +1288,14 @@ void FurnaceGUI::openFileDialog(FurnaceGUIFileDialogs type) {
       );
       break;
     case GUI_FILE_INS_OPEN:
+    case GUI_FILE_INS_OPEN_REPLACE:
       prevIns=-3;
+      if (prevInsData!=NULL) {
+        delete prevInsData;
+        prevInsData=NULL;
+      }
+      prevInsData=new DivInstrument;
+      *prevInsData=*e->getIns(curIns);
       if (!dirExists(workingDirIns)) workingDirIns=getHomeDir();
       hasOpened=fileDialog->openLoad(
         "Load Instrument",
@@ -1300,11 +1307,20 @@ void FurnaceGUI::openFileDialog(FurnaceGUIFileDialogs type) {
         [this](const char* path) {
           std::vector<DivInstrument*> instruments=e->instrumentFromFile(path);
           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;
         }
@@ -1750,8 +1766,11 @@ void FurnaceGUI::processDrags(int dragX, int dragY) {
     if (macroLoopDragLen>0) {
       int x=(dragX-macroLoopDragStart.x)*macroLoopDragLen/MAX(1,macroLoopDragAreaSize.x);
       if (x<0) x=0;
-      if (x>=macroLoopDragLen) x=-1;
+      if (x>=macroLoopDragLen) {
-      x+=macroDragScroll;
+        x=-1;
+      } else {
+        x+=macroDragScroll;
+      }
       *macroLoopDragTarget=x;
     }
   }
@@ -2072,7 +2091,7 @@ void FurnaceGUI::editOptions(bool topMenu) {
   }
   ImGui::SameLine();
   if (ImGui::Button("Values")) {
-    doTranspose(transposeAmount,opMaskTransposeNote);
+    doTranspose(transposeAmount,opMaskTransposeValue);
     ImGui::CloseCurrentPopup();
   }
   
@@ -2417,6 +2436,13 @@ bool FurnaceGUI::loop() {
 
     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) {
       midiLock.lock();
       if (midiQueue.empty()) {
@@ -2426,6 +2452,19 @@ bool FurnaceGUI::loop() {
       TAMidiMessage msg=midiQueue.front();
       midiLock.unlock();
 
+      if (msg.type==TA_MIDI_SYSEX) {
+        unsigned char* data=msg.sysExData.get();
+        for (size_t i=0; i<msg.sysExLen; i++) {
+          if ((i&15)==0) printf("\n");
+          printf("%.2x ",data[i]);
+        }
+        printf("\n");
+
+        if (!parseSysEx(data,msg.sysExLen)) {
+          logW("error while parsing SysEx data!");
+        }
+      }
+
       // parse message here
       if (learning!=-1) {
         if (learning>=0 && learning<(int)midiMap.binds.size()) {
@@ -2559,6 +2598,7 @@ bool FurnaceGUI::loop() {
     ImGui_ImplSDL2_NewFrame(sdlWin);
     ImGui::NewFrame();
 
+    curWindowLast=curWindow;
     curWindow=GUI_WINDOW_NOTHING;
     editOptsVisible=false;
 
@@ -2900,8 +2940,16 @@ bool FurnaceGUI::loop() {
     if (fileDialog->render(ImVec2(600.0f*dpiScale,400.0f*dpiScale),ImVec2(scrW*dpiScale,scrH*dpiScale))) {
       bool openOpen=false;
       //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;
       }
       switch (curFileDialog) {
@@ -2911,6 +2959,7 @@ bool FurnaceGUI::loop() {
           workingDirSong=fileDialog->getPath()+DIR_SEPARATOR_STR;
           break;
         case GUI_FILE_INS_OPEN:
+        case GUI_FILE_INS_OPEN_REPLACE:
         case GUI_FILE_INS_SAVE:
           workingDirIns=fileDialog->getPath()+DIR_SEPARATOR_STR;
           break;
@@ -3090,6 +3139,25 @@ bool FurnaceGUI::loop() {
               }
               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[0];
+                } 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:
               e->addWaveFromFile(copyOfName.c_str());
               MARK_MODIFIED;
@@ -3690,6 +3758,7 @@ bool FurnaceGUI::init() {
     midiQueue.push(msg);
     midiLock.unlock();
     e->setMidiBaseChan(cursor.xCoarse);
+    if (msg.type==TA_MIDI_SYSEX) return -2;
     if (midiMap.valueInputStyle!=0 && cursor.xFine!=0 && edit) return -2;
     if (!midiMap.noteInput) return -2;
     if (learning!=-1) return -2;
@@ -3805,6 +3874,7 @@ FurnaceGUI::FurnaceGUI():
   patFont(NULL),
   bigFont(NULL),
   fontRange(NULL),
+  prevInsData(NULL),
   curIns(0),
   curWave(0),
   curSample(0),
@@ -3903,6 +3973,7 @@ FurnaceGUI::FurnaceGUI():
   nonLatchNibble(false),
   curWindow(GUI_WINDOW_NOTHING),
   nextWindow(GUI_WINDOW_NOTHING),
+  curWindowLast(GUI_WINDOW_NOTHING),
   nextDesc(NULL),
   latchNote(-1),
   latchIns(-2),
@@ -4005,7 +4076,8 @@ FurnaceGUI::FurnaceGUI():
   followLog(true),
   pianoOctaves(7),
   pianoOptions(false),
-  pianoOffset(6) {
+  pianoOffset(6),
+  hasACED(false) {
   // value keys
   valueKeys[SDLK_0]=0;
   valueKeys[SDLK_1]=1;
@@ -4063,4 +4135,6 @@ FurnaceGUI::FurnaceGUI():
   memset(chanOscLP0,0,sizeof(float)*DIV_MAX_CHANS);
   memset(chanOscLP1,0,sizeof(float)*DIV_MAX_CHANS);
   memset(lastCorrPos,0,sizeof(short)*DIV_MAX_CHANS);
+
+  memset(acedData,0,23);
 }

src/gui/gui.h

@@ -239,6 +239,7 @@ enum FurnaceGUIFileDialogs {
   GUI_FILE_SAVE,
   GUI_FILE_SAVE_DMF_LEGACY,
   GUI_FILE_INS_OPEN,
+  GUI_FILE_INS_OPEN_REPLACE,
   GUI_FILE_INS_SAVE,
   GUI_FILE_WAVE_OPEN,
   GUI_FILE_WAVE_SAVE,
@@ -406,6 +407,7 @@ enum FurnaceGUIActions {
   GUI_ACTION_INS_LIST_ADD,
   GUI_ACTION_INS_LIST_DUPLICATE,
   GUI_ACTION_INS_LIST_OPEN,
+  GUI_ACTION_INS_LIST_OPEN_REPLACE,
   GUI_ACTION_INS_LIST_SAVE,
   GUI_ACTION_INS_LIST_MOVE_UP,
   GUI_ACTION_INS_LIST_MOVE_DOWN,
@@ -596,7 +598,7 @@ struct MIDIMap {
   int**** map;
   std::vector<MIDIBind> binds;
 
-  bool noteInput, volInput, rawVolume, polyInput, directChannel, programChange, midiClock, midiTimeCode;
+  bool noteInput, volInput, rawVolume, polyInput, directChannel, programChange, midiClock, midiTimeCode, yamahaFMResponse;
   // 0: disabled
   //
   // 1: C- C# D- D# E- F- F# G- G# A- A# B-
@@ -658,6 +660,7 @@ struct MIDIMap {
     programChange(true),
     midiClock(false),
     midiTimeCode(false),
+    yamahaFMResponse(false),
     valueInputStyle(1),
     valueInputControlMSB(0),
     valueInputControlLSB(0),
@@ -721,6 +724,37 @@ struct FurnaceGUISysCategory {
     name(NULL) {}
 };
 
+static const char* modeDummy[1]={NULL};
+struct FurnaceGUIMacroDesc {
+  DivInstrumentMacro* macro;
+  int min, max;
+  float height;
+  const char* displayName;
+  const char** bitfieldBits;
+  const char** modeName;
+  ImVec4 color;
+  unsigned int bitOffset;
+  bool isBitfield, blockMode, macroMode;
+  String (*hoverFunc)(int,float);
+
+  FurnaceGUIMacroDesc(const char* name, DivInstrumentMacro* m, int macroMin, int macroMax, float macroHeight, ImVec4 col=ImVec4(1.0f,1.0f,1.0f,1.0f), bool block=false, bool mMode=false, const char** mName=NULL, String (*hf)(int,float)=NULL, bool bitfield=false, const char** bfVal=NULL, unsigned int bitOff=0):
+    macro(m),
+    height(macroHeight),
+    displayName(name),
+    bitfieldBits(bfVal),
+    modeName(mName),
+    color(col),
+    bitOffset(bitOff),
+    isBitfield(bitfield),
+    blockMode(block),
+    macroMode(mMode),
+    hoverFunc(hf) {
+    // MSVC -> hell
+    this->min=macroMin;
+    this->max=macroMax;
+  }
+};
+
 class FurnaceGUI {
   DivEngine* e;
 
@@ -855,6 +889,9 @@ class FurnaceGUI {
     int eventDelay;
     int moveWindowTitle;
     int hiddenSystems;
+    int insLoadAlwaysReplace;
+    int horizontalDataView;
+    int noMultiSystem;
     unsigned int maxUndoSteps;
     String mainFontPath;
     String patFontPath;
@@ -937,6 +974,9 @@ class FurnaceGUI {
       eventDelay(0),
       moveWindowTitle(0),
       hiddenSystems(0),
+      insLoadAlwaysReplace(1),
+      horizontalDataView(0),
+      noMultiSystem(0),
       maxUndoSteps(100),
       mainFontPath(""),
       patFontPath(""),
@@ -947,6 +987,8 @@ class FurnaceGUI {
 
   char finalLayoutPath[4096];
 
+  DivInstrument* prevInsData;
+
   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 wheelX, wheelY;
@@ -966,7 +1008,7 @@ class FurnaceGUI {
   SelectionPoint selStart, selEnd, cursor;
   bool selecting, curNibble, orderNibble, followOrders, followPattern, changeAllOrders;
   bool collapseWindow, demandScrollX, fancyPattern, wantPatName, firstFrame, tempoView, waveHex, lockLayout, editOptsVisible, latchNibble, nonLatchNibble;
-  FurnaceGUIWindows curWindow, nextWindow;
+  FurnaceGUIWindows curWindow, nextWindow, curWindowLast;
   float peak[2];
   float patChanX[DIV_MAX_CHANS+1];
   float patChanSlideY[DIV_MAX_CHANS+1];
@@ -1125,6 +1167,10 @@ class FurnaceGUI {
   float pianoKeyHit[180];
   int pianoOffset;
 
+  // TX81Z
+  bool hasACED;
+  unsigned char acedData[23];
+
   void drawSSGEnv(unsigned char type, const ImVec2& size);
   void drawWaveform(unsigned char type, bool opz, const ImVec2& size);
   void drawAlgorithm(unsigned char alg, FurnaceGUIFMAlgs algType, const ImVec2& size);
@@ -1151,6 +1197,8 @@ class FurnaceGUI {
 
   void patternRow(int i, bool isPlaying, float lineHeight, int chans, int ord, const DivPattern** patCache, bool inhibitSel);
 
+  void drawMacros(std::vector<FurnaceGUIMacroDesc>& macros);
+
   void actualWaveList();
   void actualSampleList();
 
@@ -1251,6 +1299,8 @@ class FurnaceGUI {
   int load(String path);
   void exportAudio(String path, DivAudioExportModes mode);
 
+  bool parseSysEx(unsigned char* data, size_t len);
+
   void applyUISettings(bool updateFonts=true);
   void initSystemPresets();
 

src/gui/guiConst.cpp

@@ -240,22 +240,22 @@ const FurnaceGUIColors fxColors[256]={
   GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
 
   // 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
   GUI_COLOR_PATTERN_EFFECT_INVALID,
@@ -567,6 +567,7 @@ const FurnaceGUIActionDef guiActions[GUI_ACTION_MAX]={
   D("INS_LIST_ADD", "Add", SDLK_INSERT),
   D("INS_LIST_DUPLICATE", "Duplicate", FURKMOD_CMD|SDLK_d),
   D("INS_LIST_OPEN", "Open", 0),
+  D("INS_LIST_OPEN_REPLACE", "Open (replace current)", 0),
   D("INS_LIST_SAVE", "Save", 0),
   D("INS_LIST_MOVE_UP", "Move up", FURKMOD_SHIFT|SDLK_UP),
   D("INS_LIST_MOVE_DOWN", "Move down", FURKMOD_SHIFT|SDLK_DOWN),

src/gui/midiMap.cpp

@@ -138,6 +138,7 @@ bool MIDIMap::read(String path) {
         UNDERSTAND_OPTION(programChange) else
         UNDERSTAND_OPTION(midiClock) else
         UNDERSTAND_OPTION(midiTimeCode) else
+        UNDERSTAND_OPTION(yamahaFMResponse) else
         UNDERSTAND_OPTION(valueInputStyle) else
         UNDERSTAND_OPTION(valueInputControlMSB) else
         UNDERSTAND_OPTION(valueInputControlLSB) else
@@ -203,6 +204,7 @@ bool MIDIMap::write(String path) {
   WRITE_OPTION(programChange);
   WRITE_OPTION(midiClock);
   WRITE_OPTION(midiTimeCode);
+  WRITE_OPTION(yamahaFMResponse);
   WRITE_OPTION(valueInputStyle);
   WRITE_OPTION(valueInputControlMSB);
   WRITE_OPTION(valueInputControlLSB);

src/gui/pattern.cpp

@@ -64,7 +64,7 @@ inline void FurnaceGUI::patternRow(int i, bool isPlaying, float lineHeight, int
   }
   // check overflow highlight
   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]));
     } else if (isPlaying && oldRow==i && ord==e->getOrder()) {
       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 {
     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]));
     } else if (isPlaying && oldRow==i && ord==e->getOrder()) {
       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 selectedIns=selectedRow && (j32+1>=sel1XSum && j32+1<=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
     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();
 
     // the following is only visible when the channel is not collapsed
-    if (!e->song.chanCollapse[j]) {
+    if (e->song.chanCollapse[j]<3) {
       // instrument
       if (pat->data[i][2]==-1) {
         ImGui::PushStyleColor(ImGuiCol_Text,inactiveColor);
@@ -183,7 +183,9 @@ inline void FurnaceGUI::patternRow(int i, bool isPlaying, float lineHeight, int
         updateSelection(j,1,i);
       }
       ImGui::PopStyleColor();
+    }
 
+    if (e->song.chanCollapse[j]<2) {
       // volume
       if (pat->data[i][3]==-1) {
         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);
       }
       ImGui::PopStyleColor();
+    }
 
+    if (e->song.chanCollapse[j]<1) {
       // effects
       for (int k=0; k<e->song.pat[j].effectCols; k++) {
         int index=4+(k<<1);
         bool selectedEffect=selectedRow && (j32+index-1>=sel1XSum && j32+index-1<=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
         if (pat->data[i][index]==-1) {
@@ -499,7 +503,11 @@ void FurnaceGUI::drawPattern() {
           snprintf(chanID,2048,"%c##_HCH%d",e->song.chanCollapse[i]?'+':'-',i);
           ImGui::SetCursorPosX(ImGui::GetCursorPosX()+4.0f*dpiScale);
           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]) {
             ImGui::SameLine();

src/gui/plot_nolerp.cpp

@@ -289,7 +289,7 @@ void PlotBitfield(const char* label, const int* values, int values_count, int va
     PlotBitfieldEx(label, &Plot_IntArrayGetter, (void*)&data, values_count, values_offset, overlay_text, bits, graph_size);
 }
 
-int PlotCustomEx(ImGuiPlotType plot_type, const char* label, float (*values_getter)(void* data, int idx), void* data, int values_count, int values_display_offset, const char* overlay_text, float scale_min, float scale_max, ImVec2 frame_size, ImVec4 color, int highlight, std::string (*hoverFunc)(int,float), bool blockMode)
+int PlotCustomEx(ImGuiPlotType plot_type, const char* label, float (*values_getter)(void* data, int idx), void* data, int values_count, int values_display_offset, const char* overlay_text, float scale_min, float scale_max, ImVec2 frame_size, ImVec4 color, int highlight, std::string (*hoverFunc)(int,float), bool blockMode, std::string (*guideFunc)(float))
 {
     ImGuiContext& g = *GImGui;
     ImGuiWindow* window = ImGui::GetCurrentWindow();
@@ -428,13 +428,31 @@ int PlotCustomEx(ImGuiPlotType plot_type, const char* label, float (*values_gett
     if (label_size.x > 0.0f)
         ImGui::RenderText(ImVec2(frame_bb.Max.x + style.ItemInnerSpacing.x, inner_bb.Min.y), label);
 
+    if (guideFunc && idx_hovered!=0) {
+      std::string guide=guideFunc(scale_max);
+      window->DrawList->AddText(frame_bb.Min+ImVec2(1.0f,1.0f),0xff000000,guide.c_str());
+      window->DrawList->AddText(frame_bb.Min+ImVec2(1.0f,-1.0f),0xff000000,guide.c_str());
+      window->DrawList->AddText(frame_bb.Min+ImVec2(-1.0f,1.0f),0xff000000,guide.c_str());
+      window->DrawList->AddText(frame_bb.Min+ImVec2(-1.0f,-1.0f),0xff000000,guide.c_str());
+      window->DrawList->AddText(frame_bb.Min,0xffffffff,guide.c_str());
+
+      std::string guide1=guideFunc(scale_min);
+      ImVec2 maxPos=frame_bb.Min;
+      maxPos.y=frame_bb.Max.y-ImGui::GetFont()->FontSize;
+      window->DrawList->AddText(maxPos+ImVec2(1.0f,1.0f),0xff000000,guide1.c_str());
+      window->DrawList->AddText(maxPos+ImVec2(1.0f,-1.0f),0xff000000,guide1.c_str());
+      window->DrawList->AddText(maxPos+ImVec2(-1.0f,1.0f),0xff000000,guide1.c_str());
+      window->DrawList->AddText(maxPos+ImVec2(-1.0f,-1.0f),0xff000000,guide1.c_str());
+      window->DrawList->AddText(maxPos,0xffffffff,guide1.c_str());
+    }
+
     // Return hovered index or -1 if none are hovered.
     // This is currently not exposed in the public API because we need a larger redesign of the whole thing, but in the short-term we are making it available in PlotEx().
     return idx_hovered;
 }
 
-void PlotCustom(const char* label, const float* values, int values_count, int values_offset, const char* overlay_text, float scale_min, float scale_max, ImVec2 graph_size, int stride, ImVec4 color, int highlight, std::string (*hoverFunc)(int,float), bool blockMode)
+void PlotCustom(const char* label, const float* values, int values_count, int values_offset, const char* overlay_text, float scale_min, float scale_max, ImVec2 graph_size, int stride, ImVec4 color, int highlight, std::string (*hoverFunc)(int,float), bool blockMode, std::string (*guideFunc)(float))
 {
     FurnacePlotArrayGetterData data(values, stride);
-    PlotCustomEx(ImGuiPlotType_Histogram, label, &Plot_ArrayGetter, (void*)&data, values_count, values_offset, overlay_text, scale_min, scale_max, graph_size, color, highlight, hoverFunc, blockMode);
+    PlotCustomEx(ImGuiPlotType_Histogram, label, &Plot_ArrayGetter, (void*)&data, values_count, values_offset, overlay_text, scale_min, scale_max, graph_size, color, highlight, hoverFunc, blockMode, guideFunc);
 }

src/gui/plot_nolerp.h

@@ -22,4 +22,4 @@
 
 void PlotNoLerp(const char* label, const float* values, int values_count, int values_offset = 0, const char* overlay_text = NULL, float scale_min = FLT_MAX, float scale_max = FLT_MAX, ImVec2 graph_size = ImVec2(0, 0), int stride = sizeof(float));
 void PlotBitfield(const char* label, const int* values, int values_count, int values_offset = 0, const char** overlay_text = NULL, int bits = 8, ImVec2 graph_size = ImVec2(0, 0), int stride = sizeof(float));
-void PlotCustom(const char* label, const float* values, int values_count, int values_offset = 0, const char* overlay_text = NULL, float scale_min = FLT_MAX, float scale_max = FLT_MAX, ImVec2 graph_size = ImVec2(0, 0), int stride = sizeof(float), ImVec4 fgColor = ImVec4(1.0f,1.0f,1.0f,1.0f), int highlight = 0, std::string (*hoverFunc)(int,float) = NULL, bool blockMode=false);
+void PlotCustom(const char* label, const float* values, int values_count, int values_offset = 0, const char* overlay_text = NULL, float scale_min = FLT_MAX, float scale_max = FLT_MAX, ImVec2 graph_size = ImVec2(0, 0), int stride = sizeof(float), ImVec4 fgColor = ImVec4(1.0f,1.0f,1.0f,1.0f), int highlight = 0, std::string (*hoverFunc)(int,float) = NULL, bool blockMode=false, std::string (*guideFunc)(float) = NULL);

src/gui/settings.cpp

@@ -419,6 +419,11 @@ void FurnaceGUI::drawSettings() {
             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;
           if (ImGui::Checkbox("Use system file picker",&sysFileDialogB)) {
             settings.sysFileDialog=sysFileDialogB;
@@ -635,6 +640,7 @@ void FurnaceGUI::drawSettings() {
             //ImGui::Checkbox("Use raw velocity value (don't map from linear to log)",&midiMap.rawVolume);
             //ImGui::Checkbox("Polyphonic/chord input",&midiMap.polyInput);
             ImGui::Checkbox("Map MIDI channels to direct channels",&midiMap.directChannel);
+            ImGui::Checkbox("Map Yamaha FM voice data to instruments",&midiMap.yamahaFMResponse);
             ImGui::Checkbox("Program change is instrument selection",&midiMap.programChange);
             //ImGui::Checkbox("Listen to MIDI clock",&midiMap.midiClock);
             //ImGui::Checkbox("Listen to MIDI time code",&midiMap.midiTimeCode);
@@ -932,6 +938,10 @@ void FurnaceGUI::drawSettings() {
             if (settings.patFontSize<3) settings.patFontSize=3;
             if (settings.patFontSize>96) settings.patFontSize=96;
           }
+          if (ImGui::InputInt("Icon size",&settings.iconSize)) {
+            if (settings.iconSize<3) settings.iconSize=3;
+            if (settings.iconSize>48) settings.iconSize=48;
+          }
 
           bool loadJapaneseB=settings.loadJapanese;
           if (ImGui::Checkbox("Display Japanese characters",&loadJapaneseB)) {
@@ -1001,6 +1011,12 @@ void FurnaceGUI::drawSettings() {
             updateWindowTitle();
           }
 
+          bool noMultiSystemB=settings.noMultiSystem;
+          if (ImGui::Checkbox("Display chip names instead of \"multi-system\" in title bar",&noMultiSystemB)) {
+            settings.noMultiSystem=noMultiSystemB;
+            updateWindowTitle();
+          }
+
           ImGui::Text("Status bar:");
           if (ImGui::RadioButton("Cursor details##sbar0",settings.statusDisplay==0)) {
             settings.statusDisplay=0;
@@ -1063,15 +1079,20 @@ void FurnaceGUI::drawSettings() {
             settings.separateFMColors=separateFMColorsB;
           }
 
-          bool macroViewB=settings.macroView;
-          if (ImGui::Checkbox("Classic macro view (standard macros only; deprecated!)",&macroViewB)) {
-            settings.macroView=macroViewB;
-          }
-
           bool unifiedDataViewB=settings.unifiedDataView;
           if (ImGui::Checkbox("Unified instrument/wavetable/sample list",&unifiedDataViewB)) {
             settings.unifiedDataView=unifiedDataViewB;
           }
+          if (settings.unifiedDataView) {
+            settings.horizontalDataView=0;
+          }
+
+          ImGui::BeginDisabled(settings.unifiedDataView);
+          bool horizontalDataViewB=settings.horizontalDataView;
+          if (ImGui::Checkbox("Horizontal instrument list",&horizontalDataViewB)) {
+            settings.horizontalDataView=horizontalDataViewB;
+          }
+          ImGui::EndDisabled();
 
           bool chipNamesB=settings.chipNames;
           if (ImGui::Checkbox("Use chip names instead of system names",&chipNamesB)) {
@@ -1616,6 +1637,7 @@ void FurnaceGUI::drawSettings() {
             UI_KEYBIND_CONFIG(GUI_ACTION_INS_LIST_ADD);
             UI_KEYBIND_CONFIG(GUI_ACTION_INS_LIST_DUPLICATE);
             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_MOVE_UP);
             UI_KEYBIND_CONFIG(GUI_ACTION_INS_LIST_MOVE_DOWN);
@@ -1830,6 +1852,9 @@ void FurnaceGUI::syncSettings() {
   settings.eventDelay=e->getConfInt("eventDelay",0);
   settings.moveWindowTitle=e->getConfInt("moveWindowTitle",0);
   settings.hiddenSystems=e->getConfInt("hiddenSystems",0);
+  settings.insLoadAlwaysReplace=e->getConfInt("insLoadAlwaysReplace",1);
+  settings.horizontalDataView=e->getConfInt("horizontalDataView",0);
+  settings.noMultiSystem=e->getConfInt("noMultiSystem",0);
 
   clampSetting(settings.mainFontSize,2,96);
   clampSetting(settings.patFontSize,2,96);
@@ -1900,6 +1925,9 @@ void FurnaceGUI::syncSettings() {
   clampSetting(settings.eventDelay,0,1);
   clampSetting(settings.moveWindowTitle,0,1);
   clampSetting(settings.hiddenSystems,0,1);
+  clampSetting(settings.insLoadAlwaysReplace,0,1);
+  clampSetting(settings.horizontalDataView,0,1);
+  clampSetting(settings.noMultiSystem,0,1)
 
   settings.initialSys=e->decodeSysDesc(e->getConfString("initialSys",""));
   if (settings.initialSys.size()<4) {
@@ -2011,6 +2039,9 @@ void FurnaceGUI::commitSettings() {
   e->setConf("moveWindowTitle",settings.moveWindowTitle);
   e->setConf("hiddenSystems",settings.hiddenSystems);
   e->setConf("initialSys",e->encodeSysDesc(settings.initialSys));
+  e->setConf("insLoadAlwaysReplace",settings.insLoadAlwaysReplace);
+  e->setConf("horizontalDataView",settings.horizontalDataView);
+  e->setConf("noMultiSystem",settings.noMultiSystem);
 
   // colors
   for (int i=0; i<GUI_COLOR_MAX; i++) {
@@ -2630,6 +2661,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) {
       logE("could not load icon font!");
     }
+    
     if (settings.mainFontSize==settings.patFontSize && settings.patFont<5 && builtinFontM[settings.patFont]==builtinFont[settings.mainFont]) {
       logD("using main font for pat font.");
       patFont=mainFont;
@@ -2661,8 +2693,9 @@ void FurnaceGUI::applyUISettings(bool updateFonts) {
           logE("could not load pattern font!");
           patFont=ImGui::GetIO().Fonts->AddFontDefault();
         }
+      }
     }
-    }
+    
     if ((bigFont=ImGui::GetIO().Fonts->AddFontFromMemoryCompressedTTF(font_plexSans_compressed_data,font_plexSans_compressed_size,40*dpiScale))==NULL) {
       logE("could not load big UI font!");
     }
@@ -2688,6 +2721,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,".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,".vgi",uiColors[GUI_COLOR_FILE_INSTR],ICON_FA_FILE);

src/gui/sysEx.cpp

@@ -0,0 +1,232 @@
+#include "gui.h"
+#include "../ta-log.h"
+
+bool FurnaceGUI::parseSysEx(unsigned char* data, size_t len) {
+  SafeReader reader(data,len);
+
+  if (!midiMap.yamahaFMResponse) return true;
+
+  try {
+    unsigned char isSysEx=reader.readC();
+    if (isSysEx!=0xf0) {
+      logW("but this isn't a SysEx! (%x)",isSysEx);
+      return false;
+    }
+
+    unsigned char vendor=reader.readC();
+    if (vendor!=0x43) {
+      logV("not Yamaha. skipping.");
+      return true;
+    }
+
+    unsigned char channel=reader.readC();
+    logV("channel: %d",channel);
+    if (channel>15) {
+      logV("not a valid one");
+      return true;
+    }
+
+    unsigned char msgType=reader.readC();
+    unsigned char lenH=reader.readC();
+    unsigned char lenL=reader.readC();
+    unsigned short msgLen=(lenH<<7)|lenL;
+    logV("message length: %d",msgLen);
+    std::vector<DivInstrument*> instruments;
+
+    switch (msgType) {
+      case 0x03: { // VCED - voice data
+        logD("reading VCED...");
+        DivInstrument* ins=new DivInstrument;
+        ins->type=DIV_INS_FM;
+        for (int i=0; i<4; i++) {
+          DivInstrumentFM::Operator& op=ins->fm.op[i];
+          op.ar=reader.readC();
+          op.dr=reader.readC();
+          op.d2r=reader.readC();
+          op.rr=reader.readC();
+          op.sl=15-reader.readC();
+          reader.readC(); // LS - ignore
+          op.rs=reader.readC();
+          reader.readC(); // EBS - ignore
+          op.am=reader.readC();
+          reader.readC(); // KVS - ignore
+          op.tl=3+((99-reader.readC())*124)/99;
+          unsigned char freq=reader.readC();
+          logV("OP%d freq: %d",i,freq);
+          op.mult=freq>>2;
+          op.dt2=freq&3;
+          op.dt=reader.readC();
+        }
+
+        ins->fm.alg=reader.readC();
+        ins->fm.fb=reader.readC();
+        reader.readC(); // LFO speed - ignore
+        reader.readC(); // LFO delay - ignore
+        reader.readC(); // PMD
+        reader.readC(); // AMD
+        reader.readC(); // LFO sync
+        reader.readC(); // LFO shape
+        ins->fm.fms=reader.readC();
+        ins->fm.ams=reader.readC();
+        reader.readC(); // transpose
+
+        reader.readC(); // poly/mono
+        reader.readC(); // pitch bend range
+        reader.readC(); // porta mode
+        reader.readC(); // porta time
+        reader.readC(); // FC volume
+        reader.readC(); // sustain
+        reader.readC(); // portamento
+        reader.readC(); // chorus
+        reader.readC(); // mod wheel pitch
+        reader.readC(); // mod wheel amp
+        reader.readC(); // breath pitch
+        reader.readC(); // breath amp
+        reader.readC(); // breath pitch bias
+        reader.readC(); // breath EG bias
+
+        ins->name=reader.readString(10);
+
+        for (int i=0; i<7; i++) { // reserved (except the last one, which we don't support yet)
+          reader.readC();
+        }
+
+        // TX81Z-specific data
+        if (hasACED) {
+          hasACED=false;
+          ins->type=DIV_INS_OPZ;
+
+          for (int i=0; i<4; i++) {
+            DivInstrumentFM::Operator& op=ins->fm.op[i];
+            op.egt=acedData[(5*i)+0];
+            if (op.egt) {
+              op.dt=acedData[(5*i)+1];
+            }
+            op.dvb=acedData[(5*i)+2];
+            op.ws=acedData[(5*i)+3];
+            op.ksl=acedData[(5*i)+4];
+            op.dam=acedData[20];
+          }
+        }
+
+        instruments.push_back(ins);
+        break;
+      }
+      case 0x7e: { // ACED - TX81Z extended data
+        logD("reading ACED...");
+        String acedMagic=reader.readString(10);
+        if (acedMagic!="LM  8976AE") {
+          logD("not TX81Z ACED data");
+          break;
+        }
+        reader.read(acedData,23);
+        hasACED=true;
+        break;
+      }
+      case 0x04: { // VMEM - voice bank
+        logD("reading VMEM...");
+        for (int i=0; i<32; i++) {
+          DivInstrument* ins=new DivInstrument;
+          ins->type=DIV_INS_FM;
+          for (int i=0; i<4; i++) {
+            DivInstrumentFM::Operator& op=ins->fm.op[i];
+            op.ar=reader.readC();
+            op.dr=reader.readC();
+            op.d2r=reader.readC();
+            op.rr=reader.readC();
+            op.sl=15-reader.readC();
+            reader.readC(); // LS - ignore
+            op.am=(reader.readC()&0x40)?1:0;
+            op.tl=3+((99-reader.readC())*124)/99;
+            unsigned char freq=reader.readC();
+            logV("OP%d freq: %d",i,freq);
+            op.mult=freq>>2;
+            op.dt2=freq&3;
+            unsigned char rsDt=reader.readC();
+            op.rs=rsDt>>3;
+            op.dt=rsDt&7;
+          }
+
+          unsigned char algFb=reader.readC();
+          ins->fm.alg=algFb&7;
+          ins->fm.fb=(algFb>>3)&7;
+          reader.readC(); // LFO speed - ignore
+          reader.readC(); // LFO delay - ignore
+          reader.readC(); // PMD
+          reader.readC(); // AMD
+          unsigned char fmsAmsShape=reader.readC();
+          ins->fm.fms=(fmsAmsShape>>4)&7;
+          ins->fm.ams=(fmsAmsShape>>2)&3;
+          for (int i=0; i<11; i++) { // skip 11 bytes
+            reader.readC();
+          }
+
+          ins->name=reader.readString(10);
+
+          for (int i=0; i<6; i++) { // reserved
+            reader.readC();
+          }
+
+          // TX81Z-specific data
+          for (int i=0; i<4; i++) {
+            DivInstrumentFM::Operator& op=ins->fm.op[i];
+            unsigned char egShiftFixedFixRange=reader.readC();
+            unsigned char wsFine=reader.readC();
+            op.egt=(egShiftFixedFixRange&8)?1:0;
+            if (op.egt) {
+              op.dt=egShiftFixedFixRange&7;
+            }
+            op.dvb=wsFine&15;
+            op.ws=wsFine>>4;
+            op.ksl=egShiftFixedFixRange>>4;
+          }
+          unsigned char rev=reader.readC();
+          for (int i=0; i<4; i++) {
+            ins->fm.op[i].dam=rev;
+          }
+
+          // skip more bytes
+          for (int i=0; i<46; i++) {
+            reader.readC();
+          }
+
+          instruments.push_back(ins);
+        }
+        break;
+      }
+    }
+
+    if (!reader.seek(6+msgLen,SEEK_SET)) {
+      logW("couldn't seek for checksum! (pre)");
+      for (DivInstrument* i: instruments) delete i;
+      return false;
+    }
+    unsigned char checkSum=reader.readC();
+    unsigned char localCheckSum=0xff;
+    if (!reader.seek(6,SEEK_SET)) {
+      logW("couldn't seek for checksum! (post)");
+      for (DivInstrument* i: instruments) delete i;
+      return false;
+    }
+    for (unsigned short i=0; i<msgLen; i++) {
+      localCheckSum+=reader.readC();
+    }
+    localCheckSum=(localCheckSum&0x7f)^0x7f;
+    logD("checksums: %.2x %.2x",checkSum,localCheckSum);
+
+    if (checkSum!=localCheckSum) {
+      logW("checksum invalid!");
+      return false;
+    }
+
+    for (DivInstrument* i: instruments) {
+      logI("got instrument from MIDI: %s",i->name);
+      e->addInstrumentPtr(i);
+      curIns=e->song.insLen-1;
+    }
+  } catch (EndOfFileException e) {
+    logW("end of data already?");
+    return false;
+  }
+  return true;
+}

src/winMain.cpp

@@ -31,16 +31,3 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prevInst, PSTR args, int state) {
   }
   return main(argc,argv);
 }
-
-int WINAPI wWinMain(HINSTANCE inst, HINSTANCE prevInst, PWSTR args, int state) {
-  int argc=0;
-  wchar_t** argw=CommandLineToArgvW(args,&argc);
-  char** argv=new char*[argc+1];
-  argv[argc]=NULL;
-  for (int i=0; i<argc; i++) {
-    std::string str=utf16To8(argw[i]);
-    argv[i]=new char[str.size()+1];
-    strcpy(argv[i],str.c_str());
-  }
-  return main(argc,argv);
-}