mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-17 12:16:30 +01:00
[P4/git history rebuild]
This commit is contained in:
parent
07dad6265b
commit
524bf0c3ca
1 changed files with 67 additions and 85 deletions
|
|
@ -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.
|
Removed in favor of the posix implementation.
|
||||||
|
#ifdef __MACOS__
|
||||||
This program is free software; you can redistribute it and/or modify
|
uint32_t UMicroseconds::hi() {return reinterpret_cast<UnsignedWide*>(&theTime)->hi;}
|
||||||
it under the terms of the GNU General Public License as published by
|
uint32_t UMicroseconds::lo() {return reinterpret_cast<UnsignedWide*>(&theTime)->lo;}
|
||||||
the Free Software Foundation; either version 2 of the License, or
|
#endif
|
||||||
(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.
|
|
||||||
|
|
||||||
*/
|
*/
|
||||||
#ifdef _WINDOWS
|
void UMicrosecondsAccumulator::Start()
|
||||||
#include "IncludeWindows.h"
|
{
|
||||||
#endif
|
m_start_time.ReadTime();
|
||||||
#if defined(__linux__) || defined(__MACOS__)
|
}
|
||||||
#include <sys/time.h>
|
|
||||||
#endif
|
void UMicrosecondsAccumulator::Stop()
|
||||||
|
{
|
||||||
#include "UMicroseconds.h"
|
UMicroseconds stop_time;
|
||||||
|
|
||||||
namespace wvNS {
|
m_accumulator += stop_time.GetNativeTime() - m_start_time.GetNativeTime();
|
||||||
UMicroseconds& UMicroseconds::ReadTime()
|
}
|
||||||
{
|
|
||||||
#ifdef _WINDOWS
|
void UMicrosecondsAccumulator::Clear()
|
||||||
LARGE_INTEGER Frequency, Count ;
|
{
|
||||||
|
m_start_time = 0;
|
||||||
QueryPerformanceFrequency(&Frequency) ;
|
m_accumulator = 0;
|
||||||
QueryPerformanceCounter(&Count);
|
}
|
||||||
theTime = uint64_t((Count.QuadPart * 1000000.0 / Frequency.QuadPart));
|
|
||||||
#endif
|
UMicroseconds UMicrosecondsAccumulator::GetAccumulatedTime() const
|
||||||
|
{
|
||||||
#if defined(__linux__) || defined(__MACOS__)
|
return m_accumulator;
|
||||||
// Mac code replaced by posix calls, to reduce Carbon dependency.
|
}
|
||||||
timeval buf;
|
|
||||||
|
UMicrosecondsAccumulator& UMicrosecondsAccumulator::operator+=(const UMicrosecondsAccumulator& inaccum_to_add)
|
||||||
gettimeofday(&buf,NULL);
|
{
|
||||||
|
m_accumulator += inaccum_to_add.GetAccumulatedTime();
|
||||||
// micro sec
|
return *this;
|
||||||
theTime = uint64_t(buf.tv_sec) * 1000*1000 + buf.tv_usec;
|
}
|
||||||
#endif
|
|
||||||
|
} // namespace wvNS {
|
||||||
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 {
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue