miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.10.0-beta1

Browse Source
This commit is contained in:
dP
2019-10-31 22:24:28 +03:00
parent b84a475e14
commit 599ccf0c2b
1470 changed files with 354219 additions and 16795 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mixer.cpp
View File

@@ -39,7 +39,7 @@ struct MixerChannel {
static MixerChannel _channels[8];
static uint32 _play_rate = 11025;
static uint32 _max_size = UINT_MAX;
static MxStreamCallback _music_stream = NULL;
static MxStreamCallback _music_stream = nullptr;
/**
* The theoretical maximum volume for a single sound sample. Multiple sound
@@ -175,11 +175,11 @@ MixerChannel *MxAllocateChannel()
for (mc = _channels; mc != endof(_channels); mc++) {
if (!mc->active) {
free(mc->memory);
mc->memory = NULL;
mc->memory = nullptr;
return mc;
}
}
return NULL;
return nullptr;
}
void MxSetChannelRawSrc(MixerChannel *mc, int8 *mem, size_t size, uint rate, bool is16bit)
@@ -238,6 +238,6 @@ bool MxInitialize(uint rate)
{
_play_rate = rate;
_max_size = UINT_MAX / _play_rate;
_music_stream = NULL; /* rate may have changed, any music source is now invalid */
_music_stream = nullptr; /* rate may have changed, any music source is now invalid */
return true;
}