(squash) rebase cleanups

musescore · Sep 19, 2024 · ec78c34 · ec78c34
1 parent 535a9de
commit ec78c34
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 65 deletions.
diff --git a/src/framework/audio/iaudiodriver.h b/src/framework/audio/iaudiodriver.h
@@ -91,7 +91,6 @@ class IAudioDriver : MODULE_EXPORT_INTERFACE
 
     virtual std::vector<unsigned int> availableOutputDeviceSampleRates() const = 0;
     virtual bool isPlaying() const = 0;
-    //virtual float playbackPositionInSeconds() const = 0;
     virtual void remotePlayOrStop(bool) const = 0;
     virtual void remoteSeek(msecs_t) const = 0;
 

diff --git a/src/framework/audio/internal/audiomidimanager.cpp b/src/framework/audio/internal/audiomidimanager.cpp
@@ -229,11 +229,6 @@ bool AudioMidiManager::isPlaying() const
     return playbackController()->isPlaying();
 }
 
-//float AudioMidiManager::playbackPositionInSeconds() const
-//{
-//    return playbackController()->playbackPositionInSeconds();
-//}
-
 void AudioMidiManager::remotePlayOrStop(bool ps) const
 {
     playbackController()->remotePlayOrStop(ps);

diff --git a/src/framework/audio/internal/audiomidimanager.h b/src/framework/audio/internal/audiomidimanager.h
@@ -83,7 +83,6 @@ class AudioMidiManager : public IAudioDriver, public async::Asyncable
     void positionChanged(muse::audio::secs_t secs, muse::midi::tick_t tick);
 
     bool isPlaying() const override;
-    //float playbackPositionInSeconds() const override;
     void remotePlayOrStop(bool) const override;
     void remoteSeek(msecs_t) const override;
 

diff --git a/src/framework/audio/internal/platform/osx/osxaudiodriver.h b/src/framework/audio/internal/platform/osx/osxaudiodriver.h
@@ -66,14 +66,9 @@ class OSXAudioDriver : public IAudioDriver
     bool setOutputDeviceBufferSize(unsigned int bufferSize) override;
     async::Notification outputDeviceBufferSizeChanged() const override;
 
-    unsigned int sampleRate() const override;
-    bool setSampleRate(unsigned int sampleRate) override;
-    async::Notification sampleRateChanged() const override;
-
     int audioDelayCompensate() const override;
     void setAudioDelayCompensate(const int frames) override;
     bool isPlaying() const override;
-    float playbackPositionInSeconds() const override;
     void remotePlayOrStop(bool) const override;
     void remoteSeek(msecs_t) const override;
 

diff --git a/src/framework/audio/internal/platform/osx/osxaudiodriver.mm b/src/framework/audio/internal/platform/osx/osxaudiodriver.mm
@@ -336,21 +336,6 @@
     return m_bufferSizeChanged;
 }
 
-unsigned int OSXAudioDriver::sampleRate() const
-{
-    return 0;
-}
-
-bool OSXAudioDriver::setSampleRate(unsigned int sampleRate)
-{
-    return true;
-}
-
-async::Notification OSXAudioDriver::sampleRateChanged() const
-{
-    return m_sampleRateChanged;
-}
-
 std::vector<unsigned int> OSXAudioDriver::availableOutputDeviceBufferSizes() const
 {
     OSXAudioDeviceID osxDeviceId = this->osxDeviceId();
@@ -442,11 +427,6 @@
     return false;
 }
 
-float OSXAudioDriver::playbackPositionInSeconds() const
-{
-    return 0;
-}
-
 void OSXAudioDriver::remotePlayOrStop([[maybe_unused]] bool ps) const
 {
 }

diff --git a/src/framework/audio/internal/platform/win/wasapiaudiodriver.cpp b/src/framework/audio/internal/platform/win/wasapiaudiodriver.cpp
@@ -244,21 +244,6 @@ async::Notification WasapiAudioDriver::availableOutputDevicesChanged() const
     return m_availableOutputDevicesChanged;
 }
 
-unsigned int WasapiAudioDriver::sampleRate() const
-{
-    return 0;
-}
-
-bool WasapiAudioDriver::setSampleRate(unsigned int sampleRate)
-{
-    return true;
-}
-
-async::Notification WasapiAudioDriver::sampleRateChanged() const
-{
-    return m_sampleRateChanged;
-}
-
 unsigned int WasapiAudioDriver::outputDeviceBufferSize() const
 {
     return m_activeSpec.samples;
@@ -369,11 +354,6 @@ bool WasapiAudioDriver::isPlaying() const
     return false;
 }
 
-float WasapiAudioDriver::playbackPositionInSeconds() const
-{
-    return 0;
-}
-
 void WasapiAudioDriver::remotePlayOrStop(bool ps) const
 {
 }

diff --git a/src/framework/audio/internal/platform/win/wasapiaudiodriver.h b/src/framework/audio/internal/platform/win/wasapiaudiodriver.h
@@ -59,22 +59,15 @@ class WasapiAudioDriver : public IAudioDriver, public async::Asyncable
 
     std::vector<unsigned int> availableOutputDeviceBufferSizes() const override;
 
-    // -------------------------------------------------------------------
-    // FIX-JACK: api-change, WAS:
-    //   unsigned int sampleRate() const override;
-    //   bool setSampleRate(unsigned int sampleRate) override;
-    //   async::Notification sampleRateChanged() const override;
     unsigned int outputDeviceSampleRate() const override;
     bool setOutputDeviceSampleRate(unsigned int sampleRate) override;
     async::Notification outputDeviceSampleRateChanged() const override;
-    // -------------------------------------------------------------------
 
     std::vector<unsigned int> availableOutputDeviceSampleRates() const override;
 
     int audioDelayCompensate(void) const override;
     void setAudioDelayCompensate(const int frames) override;
     bool isPlaying() const override;
-    float playbackPositionInSeconds() const override;
     void remotePlayOrStop(bool) const override;
     void remoteSeek(msecs_t) const override;
     bool pushMidiEvent(muse::midi::Event& e) override;

diff --git a/src/framework/stubs/audio/audiodriverstub.cpp b/src/framework/stubs/audio/audiodriverstub.cpp
@@ -97,11 +97,6 @@ bool AudioDriverStub::isPlaying() const
     return false;
 }
 
-float AudioDriverStub::playbackPositionInSeconds() const
-{
-    return 0;
-}
-
 unsigned int AudioDriverStub::sampleRate() const
 {
     return 0;

diff --git a/src/framework/stubs/audio/audiodriverstub.h b/src/framework/stubs/audio/audiodriverstub.h
@@ -50,7 +50,6 @@ class AudioDriverStub : public IAudioDriver
     int audioDelayCompensate() const override;
     void setAudioDelayCompensate(const int frames) override;
     bool isPlaying() const override;
-    float playbackPositionInSeconds() const override;
     void remotePlayOrStop(bool) const override;
     void remoteSeek(msecs_t) const override;