Move all frequency computation code from a MIDIPlay into the Synth

1 files changed, 11 insertions, 11 deletions

diff --git a/src/adlmidi_opl3.hpp b/src/adlmidi_opl3.hpp
index 76edcc7..b47c2ed 100644
--- a/src/adlmidi_opl3.hpp
+++ b/src/adlmidi_opl3.hpp
@@ -170,10 +170,10 @@ public:
     {
         //! Regular melodic/percussion channel
         ChanCat_Regular     = 0,
-        //! Four-op master
-        ChanCat_4op_Master  = 1,
-        //! Four-op slave
-        ChanCat_4op_Slave   = 2,
+        //! Four-op first part
+        ChanCat_4op_First  = 1,
+        //! Four-op second part
+        ChanCat_4op_Second   = 2,
         //! Rhythm-mode Bass drum
         ChanCat_Rhythm_Bass     = 3,
         //! Rhythm-mode Snare drum
@@ -184,18 +184,18 @@ public:
         ChanCat_Rhythm_Cymbal   = 6,
         //! Rhythm-mode Hi-Hat
         ChanCat_Rhythm_HiHat    = 7,
-        //! Rhythm-mode Slave channel
-        ChanCat_Rhythm_Slave    = 8
+        //! Rhythm-mode Secondary channel
+        ChanCat_Rhythm_Secondary    = 8
     };
 
     //! Category of the channel
-    /*! 1 = quad-master, 2 = quad-slave, 0 = regular
+    /*! 1 = quad-first, 2 = quad-second, 0 = regular
         3 = percussion BassDrum
         4 = percussion Snare
         5 = percussion Tom
         6 = percussion Crash cymbal
         7 = percussion Hihat
-        8 = percussion slave
+        8 = percussion Secondary
     */
     std::vector<uint32_t> m_channelCategory;
 
@@ -255,10 +255,10 @@ public:
     /**
      * @brief On the note in specified chip channel with specified frequency of the tone
      * @param c1 Channel of chip [or master 4-op channel] (Emulated chip choosing by next formula: [c = ch + (chipId * 23)])
-     * @param c2 Slave 4-op channel of chip, unused for 2op (Emulated chip choosing by next formula: [c = ch + (chipId * 23)])
-     * @param hertz Frequency of the tone in hertzes
+     * @param c2 Second 4-op channel of chip, unused for 2op (Emulated chip choosing by next formula: [c = ch + (chipId * 23)])
+     * @param tone The tone to play (integer part - MIDI halftone, decimal part - relative bend offset)
      */
-    void noteOn(size_t c1, size_t c2, double hertz);
+    void noteOn(size_t c1, size_t c2, double tone);
 
     /**
      * @brief Change setup of instrument in specified chip channel