Subversion Repositories eduke32

Compare Revisions

Ignore whitespace Rev 8740 → Rev 8741

/source/audiolib/include/fx_man.h
74,10 → 74,9
int FX_PlayLoopedRaw(char *ptr, uint32_t ptrlength, char *loopstart, char *loopend, int rate,
int pitchoffset, int vol, int left, int right, int priority, fix16_t volume, intptr_t callbackval);
 
int FX_StartDemandFeedPlayback(void (*function)(const char** ptr, uint32_t* length), int bitdepth, int channels, int rate, int pitchoffset,
int vol, int left, int right, int priority, fix16_t volume, intptr_t callbackval);
int FX_StartDemandFeedPlayback(void (*function)(const char** ptr, uint32_t* length, void* userdata), int bitdepth, int channels, int rate, int pitchoffset,
int vol, int left, int right, int priority, fix16_t volume, intptr_t callbackval, void* userdata);
 
 
int FX_SetPrintf(void(*function)(const char *, ...));
 
extern int FX_ErrorCode;
/source/audiolib/include/multivoc.h
110,8 → 110,8
int MV_PlayVOC(char *ptr, uint32_t length, int loopstart, int loopend, int pitchoffset, int vol,
int left, int right, int priority, fix16_t volume, intptr_t callbackval);
 
int MV_StartDemandFeedPlayback(void (*function)(const char** ptr, uint32_t* length), int bitdepth, int channels, int rate,
int pitchoffset, int vol, int left, int right, int priority, fix16_t volume, intptr_t callbackval);
int MV_StartDemandFeedPlayback(void (*function)(const char** ptr, uint32_t* length, void* userdata), int bitdepth, int channels, int rate,
int pitchoffset, int vol, int left, int right, int priority, fix16_t volume, intptr_t callbackval, void* userdata);
 
decltype(MV_PlayVOC3D) MV_PlayWAV3D;
decltype(MV_PlayVOC) MV_PlayWAV;
/source/audiolib/src/_multivc.h
170,7 → 170,7
union
{
void *rawdataptr;
void (*DemandFeed)(const char** ptr, uint32_t* length);
void (*DemandFeed)(const char** ptr, uint32_t* length, void* userdata);
};
 
const char *NextBlock;
203,6 → 203,7
int priority;
 
intptr_t callbackval;
void *userdata;
} VoiceNode;
 
typedef struct
/source/audiolib/src/fx_man.cpp
304,11 → 304,11
return handle;
}
 
int FX_StartDemandFeedPlayback(void (*function)(const char** ptr, uint32_t* length), int bitdepth, int channels, int rate, int pitchoffset,
int vol, int left, int right, int priority, fix16_t volume, intptr_t callbackval)
int FX_StartDemandFeedPlayback(void (*function)(const char** ptr, uint32_t* length, void* userdata), int bitdepth, int channels, int rate, int pitchoffset,
int vol, int left, int right, int priority, fix16_t volume, intptr_t callbackval, void* userdata)
{
int handle = MV_StartDemandFeedPlayback(function, bitdepth, channels, rate,
pitchoffset, vol, left, right, priority, volume, callbackval);
pitchoffset, vol, left, right, priority, volume, callbackval, userdata);
 
if (handle <= MV_Ok)
{
/source/audiolib/src/multivoc.cpp
989,7 → 989,7
return NoMoreData;
 
voice->position = 0;
(voice->DemandFeed)(&voice->sound, &voice->BlockLength);
(voice->DemandFeed)(&voice->sound, &voice->BlockLength, voice->userdata);
voice->length = min(voice->BlockLength, 0x8000u);
voice->BlockLength -= voice->length;
voice->length <<= 16;
1000,8 → 1000,8
return NoMoreData;
}
 
int MV_StartDemandFeedPlayback(void (*function)(const char** ptr, uint32_t* length), int bitdepth, int channels, int rate,
int pitchoffset, int vol, int left, int right, int priority, fix16_t volume, intptr_t callbackval)
int MV_StartDemandFeedPlayback(void (*function)(const char** ptr, uint32_t* length, void* userdata), int bitdepth, int channels, int rate,
int pitchoffset, int vol, int left, int right, int priority, fix16_t volume, intptr_t callbackval, void* userdata)
{
VoiceNode* voice;
 
1036,6 → 1036,7
voice->prev = nullptr;
voice->priority = priority;
voice->callbackval = callbackval;
voice->userdata = userdata;
 
MV_SetVoicePitch(voice, rate, pitchoffset);
MV_SetVoiceMixMode(voice);