From c686bdc3b7a7d7b4681f2c75e503cfc2659678a4 Mon Sep 17 00:00:00 2001 From: "james.k.crook@gmail.com" Date: Sat, 31 Aug 2013 14:55:08 +0000 Subject: [PATCH] Restored two files inadvertently changed in r12511 --- lib-src/sbsms/include/sbsms.h | 13 +++++-------- win/Projects/portmixer/portmixer.vcproj | 2 -- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/lib-src/sbsms/include/sbsms.h b/lib-src/sbsms/include/sbsms.h index a7557f486..167c9e4be 100644 --- a/lib-src/sbsms/include/sbsms.h +++ b/lib-src/sbsms/include/sbsms.h @@ -4,9 +4,6 @@ #include -#undef WXUNUSED -#define WXUNUSED( x ) - namespace _sbsms_ { typedef float t_fft[2]; @@ -52,7 +49,7 @@ typedef long (*SBSMSResampleCB)(void *cbData, SBSMSFrame *frame); class SBSMSInterface { public: virtual ~SBSMSInterface() {} - virtual long samples(audio * WXUNUSED(buf), long WXUNUSED(n)) { return 0; } + virtual long samples(audio *buf, long n) { return 0; } virtual float getStretch(float t)=0; virtual float getPitch(float t)=0; virtual long getPresamples()=0; @@ -81,11 +78,11 @@ class SBSMSRenderer { public: virtual ~SBSMSRenderer() {} virtual void startFrame() {} - virtual void startTime(int WXUNUSED(c), const TimeType & WXUNUSED(time), int WXUNUSED(n)) {} - virtual void render(int WXUNUSED(c), SBSMSTrack * WXUNUSED(t)) {} - virtual void endTime(int WXUNUSED(c)) {} + virtual void startTime(int c, const TimeType &time, int n) {} + virtual void render(int c, SBSMSTrack *t) {} + virtual void endTime(int c) {} virtual void endFrame() {} - virtual void end(const SampleCountType & WXUNUSED(samples)) {} + virtual void end(const SampleCountType &samples) {} }; enum SBSMSError { diff --git a/win/Projects/portmixer/portmixer.vcproj b/win/Projects/portmixer/portmixer.vcproj index ed7676a65..1885aee7f 100644 --- a/win/Projects/portmixer/portmixer.vcproj +++ b/win/Projects/portmixer/portmixer.vcproj @@ -93,7 +93,6 @@