etc
/
furnace
mirror of https://github.com/tildearrow/furnace.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

it builds on GCC again

This commit is contained in:
tildearrow 2021-05-17 19:18:59 -05:00
parent cf7aa9139c
commit ba8c6d8169
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/engine/playback.cpp
View File

@ -134,7 +134,7 @@ void DivEngine::processRow(int i, bool afterDelay) {
// volume
if (pat->data[curRow][3]!=-1) {
if ((min(chan[i].volMax,chan[i].volume)>>8)!=pat->data[curRow][3]) {
if ((MIN(chan[i].volMax,chan[i].volume)>>8)!=pat->data[curRow][3]) {
chan[i].volume=pat->data[curRow][3]<<8;
dispatch->dispatch(DivCommand(DIV_CMD_VOLUME,i,chan[i].volume>>8));
}

4
src/ta-utils.h
View File

@ -6,7 +6,7 @@
typedef std::string String;
#define min(a,b) (((a)<(b))?(a):(b))
#define max(a,b) (((a)>(b))?(a):(b))
#define MIN(a,b) (((a)<(b))?(a):(b))
#define MAX(a,b) (((a)>(b))?(a):(b))
#endif