[VM][General] Merge upstream 2016-03-01. (Pahse 1).

[csp-qt/common_source_project-fm7.git] / source / src / vm / tms3631.h

diff --git a/source/src/vm/tms3631.h b/source/src/vm/tms3631.h
index 14037e3..879a202 100644 (file)
--- a/source/src/vm/tms3631.h
+++ b/source/src/vm/tms3631.h
@@ -23,16 +23,16 @@
 class TMS3631 : public DEVICE
 {
 private:
-       uint8 envelop1, envelop2, datareg, maskreg;
+       uint8_t envelop1, envelop2, datareg, maskreg;
        
        struct {
-               uint32 freq;
-               uint32 count;
+               uint32_t freq;
+               uint32_t count;
        } ch[8];
-       uint8 channel;
+       uint8_t channel;
        bool set_key;
        
-       uint32 freq_table[64];
+       uint32_t freq_table[64];
        int vol, feet[16];
        int volume_l, volume_r;
        
@@ -45,11 +45,15 @@ public:
        
        // common functions
        void reset();
-       void write_signal(int id, uint32 data, uint32 mask);
-       void mix(int32* buffer, int cnt);
+       void write_signal(int id, uint32_t data, uint32_t mask);
+       void mix(int32_t* buffer, int cnt);
        void set_volume(int ch, int decibel_l, int decibel_r);
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
+       const _TCHAR *get_device_name()
+       {
+               return _T("TMS3631");
+       }
        
        // unique function
        void initialize_sound(int rate, int volume);