VSTHost: Fix the build on GCC 7.

rename round -> vstround.
This commit is contained in:
Augustin Cavalier
2018-05-21 17:57:50 -04:00
parent 20aff1c8ca
commit 66e852769e
2 changed files with 566 additions and 566 deletions
File diff suppressed because it is too large Load Diff
@@ -2,8 +2,8 @@
* Copyright 2012, Gerasim Troeglazov (3dEyes**), [email protected]. * Copyright 2012, Gerasim Troeglazov (3dEyes**), [email protected].
* All rights reserved. * All rights reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
#ifndef __VST_HOST_H__ #ifndef __VST_HOST_H__
#define __VST_HOST_H__ #define __VST_HOST_H__
@@ -61,7 +61,7 @@
struct VSTEffect struct VSTEffect
{ {
int cookie; int cookie;
int32 (*dispatcher)(struct VSTEffect*, int32, int32 (*dispatcher)(struct VSTEffect*, int32,
int32, int32, void*, float); int32, int32, void*, float);
void (*process)(struct VSTEffect*, float**, void (*process)(struct VSTEffect*, float**,
float**, int32); float**, int32);
@@ -87,7 +87,7 @@ struct VSTEffect
//typedefs //typedefs
typedef int32 (*audioMasterCallback)(VSTEffect*, int32, int32, int32, void*, float); typedef int32 (*audioMasterCallback)(VSTEffect*, int32, int32, int32, void*, float);
typedef VSTEffect* (*VSTEntryProc)(audioMasterCallback audioMaster); typedef VSTEffect* (*VSTEntryProc)(audioMasterCallback audioMaster);
inline float round(float x) {return ceil(x-0.5);} inline float vstround(float x) {return ceil(x-0.5);}
//structure for droplist parameters //structure for droplist parameters
struct DropListValue { struct DropListValue {
@@ -130,7 +130,7 @@ private:
//vst plugin interface //vst plugin interface
class VSTPlugin { class VSTPlugin {
public: public:
VSTPlugin(); VSTPlugin();
~VSTPlugin(); ~VSTPlugin();
int LoadModule(const char *path); int LoadModule(const char *path);
@@ -150,11 +150,11 @@ public:
int Channels(int mode); int Channels(int mode);
int ReAllocBuffers(void); int ReAllocBuffers(void);
void Process(float *buffer, int samples, int channels); void Process(float *buffer, int samples, int channels);
private: private:
VSTEntryProc GetMainEntry(); VSTEntryProc GetMainEntry();
VSTEffect* fEffect; VSTEffect* fEffect;
VSTEntryProc VSTMainProc; VSTEntryProc VSTMainProc;
bool fActive; bool fActive;
image_id fModule; image_id fModule;
BPath fPath; BPath fPath;
size_t fBlockSize; size_t fBlockSize;