From fe891d581dfece13b42414ba1d8fec6063290a31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20M=C3=BCller?= <nexyon@gmail.com>
Date: Sun, 3 May 2020 15:25:52 +0200
Subject: Audaspace: update from upstream

- Changing API for time values from float to double for better precision.
- Fixing minor mistakes in the documentation.
- Fixing minor unnecessary large memory allocation.
---
 extern/audaspace/plugins/jack/JackDevice.cpp       | 6 +++---
 extern/audaspace/plugins/jack/JackDevice.h         | 4 ++--
 extern/audaspace/plugins/jack/JackSynchronizer.cpp | 4 ++--
 extern/audaspace/plugins/jack/JackSynchronizer.h   | 4 ++--
 extern/audaspace/plugins/openal/OpenALDevice.cpp   | 4 ++--
 extern/audaspace/plugins/openal/OpenALDevice.h     | 4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'extern/audaspace/plugins')

diff --git a/extern/audaspace/plugins/jack/JackDevice.cpp b/extern/audaspace/plugins/jack/JackDevice.cpp
index 1d238f74c3a..32874fd1315 100644
--- a/extern/audaspace/plugins/jack/JackDevice.cpp
+++ b/extern/audaspace/plugins/jack/JackDevice.cpp
@@ -292,7 +292,7 @@ void JackDevice::stopPlayback()
 	m_nextState = JackTransportStopped;
 }
 
-void JackDevice::seekPlayback(float time)
+void JackDevice::seekPlayback(double time)
 {
 	if(time >= 0.0f)
 		AUD_jack_transport_locate(m_client, time * m_specs.rate);
@@ -304,11 +304,11 @@ void JackDevice::setSyncCallback(ISynchronizer::syncFunction sync, void* data)
 	m_syncFuncData = data;
 }
 
-float JackDevice::getPlaybackPosition()
+double JackDevice::getPlaybackPosition()
 {
 	jack_position_t position;
 	AUD_jack_transport_query(m_client, &position);
-	return position.frame / (float) m_specs.rate;
+	return position.frame / (double) m_specs.rate;
 }
 
 bool JackDevice::doesPlayback()
diff --git a/extern/audaspace/plugins/jack/JackDevice.h b/extern/audaspace/plugins/jack/JackDevice.h
index 72143eda149..4e6b1f5d12c 100644
--- a/extern/audaspace/plugins/jack/JackDevice.h
+++ b/extern/audaspace/plugins/jack/JackDevice.h
@@ -174,7 +174,7 @@ public:
 	 * Seeks jack transport playback.
 	 * \param time The time to seek to.
 	 */
-	void seekPlayback(float time);
+	void seekPlayback(double time);
 
 	/**
 	 * Sets the sync callback for jack transport playback.
@@ -187,7 +187,7 @@ public:
 	 * Retrieves the jack transport playback time.
 	 * \return The current time position.
 	 */
-	float getPlaybackPosition();
+	double getPlaybackPosition();
 
 	/**
 	 * Returns whether jack transport plays back.
diff --git a/extern/audaspace/plugins/jack/JackSynchronizer.cpp b/extern/audaspace/plugins/jack/JackSynchronizer.cpp
index cd4c448786d..0bcafa19ca5 100644
--- a/extern/audaspace/plugins/jack/JackSynchronizer.cpp
+++ b/extern/audaspace/plugins/jack/JackSynchronizer.cpp
@@ -25,12 +25,12 @@ JackSynchronizer::JackSynchronizer(JackDevice* device) :
 {
 }
 
-void JackSynchronizer::seek(std::shared_ptr<IHandle> handle, float time)
+void JackSynchronizer::seek(std::shared_ptr<IHandle> handle, double time)
 {
 	m_device->seekPlayback(time);
 }
 
-float JackSynchronizer::getPosition(std::shared_ptr<IHandle> handle)
+double JackSynchronizer::getPosition(std::shared_ptr<IHandle> handle)
 {
 	return m_device->getPlaybackPosition();
 }
diff --git a/extern/audaspace/plugins/jack/JackSynchronizer.h b/extern/audaspace/plugins/jack/JackSynchronizer.h
index 5c7341a7872..8a1f930ebed 100644
--- a/extern/audaspace/plugins/jack/JackSynchronizer.h
+++ b/extern/audaspace/plugins/jack/JackSynchronizer.h
@@ -48,8 +48,8 @@ public:
 	 */
 	JackSynchronizer(JackDevice* device);
 
-	virtual void seek(std::shared_ptr<IHandle> handle, float time);
-	virtual float getPosition(std::shared_ptr<IHandle> handle);
+	virtual void seek(std::shared_ptr<IHandle> handle, double time);
+	virtual double getPosition(std::shared_ptr<IHandle> handle);
 	virtual void play();
 	virtual void stop();
 	virtual void setSyncCallback(syncFunction function, void* data);
diff --git a/extern/audaspace/plugins/openal/OpenALDevice.cpp b/extern/audaspace/plugins/openal/OpenALDevice.cpp
index f41e9c6bef8..536ec4ccb1b 100644
--- a/extern/audaspace/plugins/openal/OpenALDevice.cpp
+++ b/extern/audaspace/plugins/openal/OpenALDevice.cpp
@@ -269,7 +269,7 @@ bool OpenALDevice::OpenALHandle::setKeep(bool keep)
 	return true;
 }
 
-bool OpenALDevice::OpenALHandle::seek(float position)
+bool OpenALDevice::OpenALHandle::seek(double position)
 {
 	if(!m_status)
 		return false;
@@ -335,7 +335,7 @@ bool OpenALDevice::OpenALHandle::seek(float position)
 	return true;
 }
 
-float OpenALDevice::OpenALHandle::getPosition()
+double OpenALDevice::OpenALHandle::getPosition()
 {
 	if(!m_status)
 		return false;
diff --git a/extern/audaspace/plugins/openal/OpenALDevice.h b/extern/audaspace/plugins/openal/OpenALDevice.h
index c2bec443933..b6ba5456d85 100644
--- a/extern/audaspace/plugins/openal/OpenALDevice.h
+++ b/extern/audaspace/plugins/openal/OpenALDevice.h
@@ -126,8 +126,8 @@ private:
 		virtual bool stop();
 		virtual bool getKeep();
 		virtual bool setKeep(bool keep);
-		virtual bool seek(float position);
-		virtual float getPosition();
+		virtual bool seek(double position);
+		virtual double getPosition();
 		virtual Status getStatus();
 		virtual float getVolume();
 		virtual bool setVolume(float volume);
-- 
cgit v1.2.3