author | ecalot
<ecalot> 2006-02-24 23:28:36 UTC |
committer | ecalot
<ecalot> 2006-02-24 23:28:36 UTC |
parent | 7bd2ef3153db874160cdb83b0cbc6d255e02d3f2 |
PR/src/include/sound.h | +2 | -0 |
PR/src/lib/object/object.c | +4 | -4 |
diff --git a/PR/src/include/sound.h b/PR/src/include/sound.h index 291e9ee..f6f504e 100644 --- a/PR/src/include/sound.h +++ b/PR/src/include/sound.h @@ -53,6 +53,8 @@ int objWaveWrite(void* o, const char* file, int optionflag, const char* backupEx /*void* objSoundRead(const char* file, int read(const char* file, tBinary* c, int *pchannels, long *psamplerate, long *pbps), int *result);*/ void* objWaveRead(const char* file, int *result); +#define objMidiRead(a,b) objBinaryRead(a,b) +#define objPcspeakerRead(a,b) objBinaryRead(a,b) int objWaveSet(void* o,tResource* res); int objPcspeakerSet(void* o,tResource* res); diff --git a/PR/src/lib/object/object.c b/PR/src/lib/object/object.c index 27bfa5f..ae87082 100644 --- a/PR/src/lib/object/object.c +++ b/PR/src/lib/object/object.c @@ -143,10 +143,10 @@ void setObject(tObject o,int *result,tResource* res) { /*o.obj=objWaveRead(file,result);*/ break; case eResTypeMidi: - /*o.obj=objMidiRead(file,res.content,result);*/ + *result=objMidiSet(o.obj,res); break; case eResTypePcspeaker: - /*o.obj=objPcspeakerRead(file,res.content,result);*/ + *result=objPcspeakerSet(o.obj,res); break; case eResTypePop1Palette4bits: /*o.obj=objPop1Palette4bitsRead(file,res.content,result);*/ @@ -174,10 +174,10 @@ tObject readObject(const char* file,tResource* res,int *result) { o.obj=objWaveRead(file,result); break; case eResTypeMidi: - /*o.obj=objMidiRead(file,res.content,result);*/ + o.obj=objMidiRead(file,result); break; case eResTypePcspeaker: - /*o.obj=objPcspeakerRead(file,res.content,result);*/ + o.obj=objPcspeakerRead(file,result); break; case eResTypePop1Palette4bits: /*o.obj=objPop1Palette4bitsRead(file,res.content,result);*/