mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-15 02:56:35 +01:00
update wavesaudio backend, now supports Windows (ASIO) as well as OS X (CoreAudio)
This commit is contained in:
Paul Davis
parent
152935e736
commit
f374ce69a6
82 changed files with 11259 additions and 7632 deletions
|
|
@ -1,21 +1,3 @@
|
|||
/*
|
||||
Copyright (C) 2013 Waves Audio Ltd.
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
|
||||
*/
|
||||
#ifndef __MinMaxUtilities_h__
|
||||
#define __MinMaxUtilities_h__
|
||||
|
||||
|
|
|
|||
|
|
@ -1,87 +1,69 @@
|
|||
#ifdef _WINDOWS
|
||||
#include "IncludeWindows.h"
|
||||
#endif
|
||||
#if defined(__linux__) || defined(__MACOS__)
|
||||
#include <sys/time.h>
|
||||
#endif
|
||||
|
||||
#include "UMicroseconds.h"
|
||||
|
||||
namespace wvNS {
|
||||
UMicroseconds& UMicroseconds::ReadTime()
|
||||
{
|
||||
#ifdef _WINDOWS
|
||||
LARGE_INTEGER Frequency, Count ;
|
||||
|
||||
QueryPerformanceFrequency(&Frequency) ;
|
||||
QueryPerformanceCounter(&Count);
|
||||
theTime = uint64_t((Count.QuadPart * 1000000.0 / Frequency.QuadPart));
|
||||
#endif
|
||||
|
||||
#if defined(__linux__) || defined(__MACOS__)
|
||||
// Mac code replaced by posix calls, to reduce Carbon dependency.
|
||||
timeval buf;
|
||||
|
||||
gettimeofday(&buf,NULL);
|
||||
|
||||
// micro sec
|
||||
theTime = uint64_t(buf.tv_sec) * 1000*1000 + buf.tv_usec;
|
||||
#endif
|
||||
|
||||
return *this;
|
||||
}
|
||||
/*
|
||||
Copyright (C) 2013 Waves Audio Ltd.
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
|
||||
Removed in favor of the posix implementation.
|
||||
#ifdef __MACOS__
|
||||
uint32_t UMicroseconds::hi() {return reinterpret_cast<UnsignedWide*>(&theTime)->hi;}
|
||||
uint32_t UMicroseconds::lo() {return reinterpret_cast<UnsignedWide*>(&theTime)->lo;}
|
||||
#endif
|
||||
*/
|
||||
#ifdef _WINDOWS
|
||||
#include "IncludeWindows.h"
|
||||
#endif
|
||||
#if defined(__linux__) || defined(__MACOS__)
|
||||
#include <sys/time.h>
|
||||
#endif
|
||||
|
||||
#include "UMicroseconds.h"
|
||||
|
||||
namespace wvNS {
|
||||
UMicroseconds& UMicroseconds::ReadTime()
|
||||
{
|
||||
#ifdef _WINDOWS
|
||||
LARGE_INTEGER Frequency, Count ;
|
||||
|
||||
QueryPerformanceFrequency(&Frequency) ;
|
||||
QueryPerformanceCounter(&Count);
|
||||
theTime = uint64_t((Count.QuadPart * 1000000.0 / Frequency.QuadPart));
|
||||
#endif
|
||||
|
||||
#if defined(__linux__) || defined(__MACOS__)
|
||||
// Mac code replaced by posix calls, to reduce Carbon dependency.
|
||||
timeval buf;
|
||||
|
||||
gettimeofday(&buf,NULL);
|
||||
|
||||
// micro sec
|
||||
theTime = uint64_t(buf.tv_sec) * 1000*1000 + buf.tv_usec;
|
||||
#endif
|
||||
|
||||
return *this;
|
||||
}
|
||||
/*
|
||||
Removed in favor of the posix implementation.
|
||||
#ifdef __MACOS__
|
||||
uint32_t UMicroseconds::hi() {return reinterpret_cast<UnsignedWide*>(&theTime)->hi;}
|
||||
uint32_t UMicroseconds::lo() {return reinterpret_cast<UnsignedWide*>(&theTime)->lo;}
|
||||
#endif
|
||||
*/
|
||||
void UMicrosecondsAccumulator::Start()
|
||||
{
|
||||
m_start_time.ReadTime();
|
||||
}
|
||||
|
||||
void UMicrosecondsAccumulator::Stop()
|
||||
{
|
||||
UMicroseconds stop_time;
|
||||
|
||||
m_accumulator += stop_time.GetNativeTime() - m_start_time.GetNativeTime();
|
||||
}
|
||||
|
||||
void UMicrosecondsAccumulator::Clear()
|
||||
{
|
||||
m_start_time = 0;
|
||||
m_accumulator = 0;
|
||||
}
|
||||
|
||||
UMicroseconds UMicrosecondsAccumulator::GetAccumulatedTime() const
|
||||
{
|
||||
return m_accumulator;
|
||||
}
|
||||
|
||||
UMicrosecondsAccumulator& UMicrosecondsAccumulator::operator+=(const UMicrosecondsAccumulator& inaccum_to_add)
|
||||
{
|
||||
m_accumulator += inaccum_to_add.GetAccumulatedTime();
|
||||
return *this;
|
||||
}
|
||||
|
||||
} // namespace wvNS {
|
||||
void UMicrosecondsAccumulator::Start()
|
||||
{
|
||||
m_start_time.ReadTime();
|
||||
}
|
||||
|
||||
void UMicrosecondsAccumulator::Stop()
|
||||
{
|
||||
UMicroseconds stop_time;
|
||||
|
||||
m_accumulator += stop_time.GetNativeTime() - m_start_time.GetNativeTime();
|
||||
}
|
||||
|
||||
void UMicrosecondsAccumulator::Clear()
|
||||
{
|
||||
m_start_time = 0;
|
||||
m_accumulator = 0;
|
||||
}
|
||||
|
||||
UMicroseconds UMicrosecondsAccumulator::GetAccumulatedTime() const
|
||||
{
|
||||
return m_accumulator;
|
||||
}
|
||||
|
||||
UMicrosecondsAccumulator& UMicrosecondsAccumulator::operator+=(const UMicrosecondsAccumulator& inaccum_to_add)
|
||||
{
|
||||
m_accumulator += inaccum_to_add.GetAccumulatedTime();
|
||||
return *this;
|
||||
}
|
||||
|
||||
} // namespace wvNS {
|
||||
|
|
|
|||
|
|
@ -1,123 +1,105 @@
|
|||
/*
|
||||
Copyright (C) 2013 Waves Audio Ltd.
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
|
||||
#ifndef __UMicroseconds_h__
|
||||
#define __UMicroseconds_h__
|
||||
|
||||
/* Copy to include
|
||||
#include "UMicroseconds.h"
|
||||
*/
|
||||
#ifndef __UMicroseconds_h__
|
||||
#define __UMicroseconds_h__
|
||||
|
||||
/* Copy to include
|
||||
#include "UMicroseconds.h"
|
||||
*/
|
||||
|
||||
|
||||
|
||||
#include "BasicTypes/WUDefines.h"
|
||||
#include "BasicTypes/WUTypes.h"
|
||||
|
||||
namespace wvNS {
|
||||
// a wraper for Microseconds function from Timer.h
|
||||
class DllExport UMicroseconds
|
||||
{
|
||||
public:
|
||||
|
||||
#ifdef _WINDOWS
|
||||
typedef int64_t TimeKeeper;
|
||||
#endif
|
||||
#ifdef __MACOS__
|
||||
typedef uint64_t TimeKeeper;
|
||||
#endif
|
||||
#ifdef __linux__
|
||||
typedef uint64_t TimeKeeper;
|
||||
#endif
|
||||
|
||||
private:
|
||||
TimeKeeper theTime;
|
||||
|
||||
public:
|
||||
|
||||
UMicroseconds()
|
||||
{
|
||||
ReadTime();
|
||||
}
|
||||
|
||||
UMicroseconds(const TimeKeeper in_initVal) : theTime(in_initVal) {}
|
||||
|
||||
UMicroseconds(const UMicroseconds& inUM) : theTime(inUM.theTime) {}
|
||||
UMicroseconds& operator=(const UMicroseconds& inUM) {theTime = inUM.theTime; return *this;}
|
||||
UMicroseconds& operator+=(const TimeKeeper in_timeToAdd) {theTime += in_timeToAdd; return *this;}
|
||||
|
||||
UMicroseconds& ReadTime();
|
||||
|
||||
TimeKeeper GetNativeTime() const {return theTime;}
|
||||
operator uint64_t () {return static_cast<uint64_t>(theTime);}
|
||||
operator double () const {return static_cast<const double>(theTime);}
|
||||
|
||||
double Seconds() const {return static_cast<double>(theTime) / double(1000000);}
|
||||
double MilliSeconds() const {return static_cast<double>(theTime) / double(1000);}
|
||||
double MicroSeconds() const {return static_cast<double>(theTime);}
|
||||
|
||||
#ifdef __MACOS__
|
||||
uint32_t hi();
|
||||
uint32_t lo();
|
||||
#endif
|
||||
};
|
||||
|
||||
inline UMicroseconds operator-(const UMicroseconds& in_one, const UMicroseconds& in_two)
|
||||
{
|
||||
UMicroseconds retVal(in_one.GetNativeTime() - in_two.GetNativeTime());
|
||||
return retVal;
|
||||
}
|
||||
|
||||
class UMicrosecondsAccumulator
|
||||
{
|
||||
public:
|
||||
UMicrosecondsAccumulator() : m_start_time(0), m_accumulator(0) {}
|
||||
|
||||
void Start();
|
||||
void Stop();
|
||||
void Clear();
|
||||
|
||||
UMicroseconds GetAccumulatedTime() const;
|
||||
|
||||
UMicrosecondsAccumulator& operator+=(const UMicrosecondsAccumulator&);
|
||||
|
||||
protected:
|
||||
UMicroseconds m_start_time;
|
||||
UMicroseconds m_accumulator;
|
||||
};
|
||||
|
||||
inline UMicroseconds operator-(const UMicrosecondsAccumulator& in_one, const UMicrosecondsAccumulator& in_two)
|
||||
{
|
||||
UMicroseconds retVal(in_one.GetAccumulatedTime() - in_two.GetAccumulatedTime());
|
||||
return retVal;
|
||||
}
|
||||
|
||||
//=========================================================================================//
|
||||
inline void MicrosecondDelay(double amt)
|
||||
//=========================================================================================//
|
||||
{
|
||||
UMicroseconds than;
|
||||
UMicroseconds now;
|
||||
|
||||
do
|
||||
{
|
||||
now.ReadTime();
|
||||
} while ((now.MicroSeconds() - than.MicroSeconds()) < amt);
|
||||
}
|
||||
|
||||
} // namespace wvNS {
|
||||
#endif //#ifndef __UMicroseconds_h__
|
||||
|
||||
|
||||
|
||||
#include "BasicTypes/WUDefines.h"
|
||||
#include "BasicTypes/WUTypes.h"
|
||||
|
||||
namespace wvNS {
|
||||
// a wraper for Microseconds function from Timer.h
|
||||
class DllExport UMicroseconds
|
||||
{
|
||||
public:
|
||||
|
||||
#ifdef _WINDOWS
|
||||
typedef int64_t TimeKeeper;
|
||||
#endif
|
||||
#ifdef __MACOS__
|
||||
typedef uint64_t TimeKeeper;
|
||||
#endif
|
||||
#ifdef __linux__
|
||||
typedef uint64_t TimeKeeper;
|
||||
#endif
|
||||
|
||||
private:
|
||||
TimeKeeper theTime;
|
||||
|
||||
public:
|
||||
|
||||
UMicroseconds()
|
||||
{
|
||||
ReadTime();
|
||||
}
|
||||
|
||||
UMicroseconds(const TimeKeeper in_initVal) : theTime(in_initVal) {}
|
||||
|
||||
UMicroseconds(const UMicroseconds& inUM) : theTime(inUM.theTime) {}
|
||||
UMicroseconds& operator=(const UMicroseconds& inUM) {theTime = inUM.theTime; return *this;}
|
||||
UMicroseconds& operator+=(const TimeKeeper in_timeToAdd) {theTime += in_timeToAdd; return *this;}
|
||||
|
||||
UMicroseconds& ReadTime();
|
||||
|
||||
TimeKeeper GetNativeTime() const {return theTime;}
|
||||
operator uint64_t () {return static_cast<uint64_t>(theTime);}
|
||||
operator double () const {return static_cast<const double>(theTime);}
|
||||
|
||||
double Seconds() const {return static_cast<double>(theTime) / double(1000000);}
|
||||
double MilliSeconds() const {return static_cast<double>(theTime) / double(1000);}
|
||||
double MicroSeconds() const {return static_cast<double>(theTime);}
|
||||
|
||||
#ifdef __MACOS__
|
||||
uint32_t hi();
|
||||
uint32_t lo();
|
||||
#endif
|
||||
};
|
||||
|
||||
inline UMicroseconds operator-(const UMicroseconds& in_one, const UMicroseconds& in_two)
|
||||
{
|
||||
UMicroseconds retVal(in_one.GetNativeTime() - in_two.GetNativeTime());
|
||||
return retVal;
|
||||
}
|
||||
|
||||
class UMicrosecondsAccumulator
|
||||
{
|
||||
public:
|
||||
UMicrosecondsAccumulator() : m_start_time(0), m_accumulator(0) {}
|
||||
|
||||
void Start();
|
||||
void Stop();
|
||||
void Clear();
|
||||
|
||||
UMicroseconds GetAccumulatedTime() const;
|
||||
|
||||
UMicrosecondsAccumulator& operator+=(const UMicrosecondsAccumulator&);
|
||||
|
||||
protected:
|
||||
UMicroseconds m_start_time;
|
||||
UMicroseconds m_accumulator;
|
||||
};
|
||||
|
||||
inline UMicroseconds operator-(const UMicrosecondsAccumulator& in_one, const UMicrosecondsAccumulator& in_two)
|
||||
{
|
||||
UMicroseconds retVal(in_one.GetAccumulatedTime() - in_two.GetAccumulatedTime());
|
||||
return retVal;
|
||||
}
|
||||
|
||||
//=========================================================================================//
|
||||
inline void MicrosecondDelay(double amt)
|
||||
//=========================================================================================//
|
||||
{
|
||||
UMicroseconds than;
|
||||
UMicroseconds now;
|
||||
|
||||
do
|
||||
{
|
||||
now.ReadTime();
|
||||
} while ((now.MicroSeconds() - than.MicroSeconds()) < amt);
|
||||
}
|
||||
|
||||
} // namespace wvNS {
|
||||
#endif //#ifndef __UMicroseconds_h__
|
||||
|
|
|
|||
|
|
@ -1,21 +1,3 @@
|
|||
/*
|
||||
Copyright (C) 2013 Waves Audio Ltd.
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
|
||||
*/
|
||||
#ifndef __WCFixedString_h__
|
||||
#define __WCFixedString_h__
|
||||
|
||||
|
|
|
|||
|
|
@ -1,21 +1,3 @@
|
|||
/*
|
||||
Copyright (C) 2013 Waves Audio Ltd.
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
|
||||
*/
|
||||
#ifndef __WUErrors_h__
|
||||
#define __WUErrors_h__
|
||||
|
||||
|
|
@ -53,6 +35,7 @@ const WTErr eAppTerminateFailed = -23; //!< failed to terminate an appl
|
|||
const WTErr eAppReturnedError = -24; //!< Non zero exit code from application
|
||||
const WTErr eNotImplemented = -25; //!< Function is not implmemented
|
||||
const WTErr eNotEmpty = -26; //!< Something was expected to be empty but is not
|
||||
const WTErr eAsioFailed = -27;
|
||||
|
||||
// File Manager errors
|
||||
const WTErr eFMNoSuchVolume = -1001;
|
||||
|
|
|
|||
|
|
@ -1,21 +1,3 @@
|
|||
/*
|
||||
Copyright (C) 2013 Waves Audio Ltd.
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
|
||||
*/
|
||||
#ifndef __safe_delete_h__
|
||||
#define __safe_delete_h__
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue