Merge branch 'master' into feature/savestates-2

This commit is contained in:
Hamish Milne 2020-04-12 11:24:06 +01:00
commit 828f88d20a
76 changed files with 3507 additions and 1369 deletions

View file

@ -101,7 +101,7 @@ public:
void EnableStretching(bool enable);
protected:
void OutputFrame(StereoFrame16& frame);
void OutputFrame(StereoFrame16 frame);
void OutputSample(std::array<s16, 2> sample);
private: