diff --git a/desmume/src/mic.cpp b/desmume/src/mic.cpp index c9211a602..1049eb174 100644 --- a/desmume/src/mic.cpp +++ b/desmume/src/mic.cpp @@ -23,6 +23,7 @@ #include "types.h" #include "mic.h" #include "readwrite.h" +#include "emufile.h" static BOOL silence = TRUE; @@ -52,12 +53,12 @@ void Mic_DoNoise(BOOL noise) silence = !noise; } -void mic_savestate(std::ostream* os) +void mic_savestate(EMUFILE* os) { write32le(-1,os); } -bool mic_loadstate(std::istream* is, int size) +bool mic_loadstate(EMUFILE* is, int size) { is->seekg(size, std::ios::cur); return TRUE; diff --git a/desmume/src/mic.h b/desmume/src/mic.h index 89e99a242..ae85a901b 100644 --- a/desmume/src/mic.h +++ b/desmume/src/mic.h @@ -21,6 +21,7 @@ #ifndef MIC_H #define MIC_H #include +#include "emufile.h" #ifdef WIN32 static char MicSampleName[256]; diff --git a/desmume/src/mic_alsa.cpp b/desmume/src/mic_alsa.cpp index bcf971ccd..28a2f432e 100644 --- a/desmume/src/mic_alsa.cpp +++ b/desmume/src/mic_alsa.cpp @@ -22,7 +22,8 @@ #include "types.h" #include "mic.h" #include "debug.h" -#include "readwrite.h" +#include "readwrite.h" +#include "emufile.h" #define MIC_BUFSIZE 4096 @@ -149,13 +150,13 @@ u8 Mic_ReadSample() } /* FIXME: stub! */ -void mic_savestate(std::ostream* os) +void mic_savestate(EMUFILE* os) { - write32le(-1,os); + write32le(0,os); } -bool mic_loadstate(std::istream* is, int size) +bool mic_loadstate(EMUFILE* is, int size) { - is->seekg(size, std::ios::cur); + is->fseek(size-4, SEEK_CUR); return TRUE; }