[VM][DEVICE][WIP] Updating State functions.Still cause FTBFS.

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

diff --git a/source/src/vm/tms3631.cpp b/source/src/vm/tms3631.cpp
index f47e655..e3773cc 100644 (file)
--- a/source/src/vm/tms3631.cpp
+++ b/source/src/vm/tms3631.cpp
@@ -119,69 +119,25 @@ void TMS3631::initialize_sound(int rate, int volume)
        vol = volume / 8;
 }
 
-#define STATE_VERSION  1
+#define STATE_VERSION  2
 
-#include "../statesub.h"
-
-void TMS3631::decl_state()
-{
-       enter_decl_state(STATE_VERSION);
-
-       DECL_STATE_ENTRY_UINT8(envelop1);
-       DECL_STATE_ENTRY_UINT8(envelop2);
-       DECL_STATE_ENTRY_UINT8(datareg);
-       DECL_STATE_ENTRY_UINT8(maskreg);
-       for(int i = 0; i < 8; i++) {
-               DECL_STATE_ENTRY_UINT32_MEMBER((ch[i].freq), i);
-               DECL_STATE_ENTRY_UINT32_MEMBER((ch[i].count), i);
-       }
-
-       DECL_STATE_ENTRY_UINT8(channel);
-       DECL_STATE_ENTRY_BOOL(set_key);
-
-       leave_decl_state();
-}
-
-void TMS3631::save_state(FILEIO* state_fio)
+bool TMS3631::process_state(FILEIO* state_fio, bool loading)
 {
-       if(state_entry != NULL) {
-               state_entry->save_state(state_fio);
+       if(!state_fio->StateCheckUint32(STATE_VERSION)) {
+               return false;
+       }
+       if(!state_fio->StateCheckInt32(this_device_id)) {
+               return false;
+       }
+       state_fio->StateValue(envelop1);
+       state_fio->StateValue(envelop2);
+       state_fio->StateValue(datareg);
+       state_fio->StateValue(maskreg);
+       for(int i = 0; i < array_length(ch); i++) {
+               state_fio->StateValue(ch[i].freq);
+               state_fio->StateValue(ch[i].count);
        }
-       
-//     state_fio->FputUint32(STATE_VERSION);
-//     state_fio->FputInt32(this_device_id);
-       
-//     state_fio->FputUint8(envelop1);
-//     state_fio->FputUint8(envelop2);
-//     state_fio->FputUint8(datareg);
-//     state_fio->FputUint8(maskreg);
-//     state_fio->Fwrite(ch, sizeof(ch), 1);
-//     state_fio->FputUint8(channel);
-//     state_fio->FputBool(set_key);
+       state_fio->StateValue(channel);
+       state_fio->StateValue(set_key);
+       return true;
 }
-
-bool TMS3631::load_state(FILEIO* state_fio)
-{
-       bool mb = false;
-       if(state_entry != NULL) {
-               mb = state_entry->load_state(state_fio);
-       }
-       if(!mb) return false;
-
-//     if(state_fio->FgetUint32() != STATE_VERSION) {
-//             return false;
-//     }
-//     if(state_fio->FgetInt32() != this_device_id) {
-//             return false;
-//     }
-//     envelop1 = state_fio->FgetUint8();
-//     envelop2 = state_fio->FgetUint8();
-//     datareg = state_fio->FgetUint8();
-//     maskreg = state_fio->FgetUint8();
-//     state_fio->Fread(ch, sizeof(ch), 1);
-//     channel = state_fio->FgetUint8();
-//     set_key = state_fio->FgetBool();
-       //touch_sound();
-       return true;
-}
-