diff --git a/include/AudioAlsa.h b/include/AudioAlsa.h index 975532071..92c47a6ac 100644 --- a/include/AudioAlsa.h +++ b/include/AudioAlsa.h @@ -84,7 +84,6 @@ public: private: void startProcessing() override; void stopProcessing() override; - void applyQualitySettings() override; void run() override; int setHWParams( const ch_cnt_t _channels, snd_pcm_access_t _access ); diff --git a/include/AudioDevice.h b/include/AudioDevice.h index c6ee46efc..def233a11 100644 --- a/include/AudioDevice.h +++ b/include/AudioDevice.h @@ -89,9 +89,7 @@ public: virtual void stopProcessing(); - virtual void applyQualitySettings(); - - + void applyQualitySettings(); protected: // subclasses can re-implement this for being used in conjunction with @@ -129,8 +127,6 @@ protected: return m_audioEngine; } - bool hqAudio() const; - static void stopProcessingThread( QThread * thread ); diff --git a/include/AudioJack.h b/include/AudioJack.h index 6efb262ed..01f41f092 100644 --- a/include/AudioJack.h +++ b/include/AudioJack.h @@ -93,7 +93,6 @@ private: void startProcessing() override; void stopProcessing() override; - void applyQualitySettings() override; void registerPort(AudioPort* port) override; void unregisterPort(AudioPort* port) override; diff --git a/include/AudioOss.h b/include/AudioOss.h index 55f64de85..91d456073 100644 --- a/include/AudioOss.h +++ b/include/AudioOss.h @@ -79,7 +79,6 @@ class setupWidget : public gui::AudioDeviceSetupWidget private: void startProcessing() override; void stopProcessing() override; - void applyQualitySettings() override; void run() override; int m_audioFD; diff --git a/include/AudioPortAudio.h b/include/AudioPortAudio.h index 01b8f3fd7..4465b18c1 100644 --- a/include/AudioPortAudio.h +++ b/include/AudioPortAudio.h @@ -109,7 +109,6 @@ public: private: void startProcessing() override; void stopProcessing() override; - void applyQualitySettings() override; #ifdef PORTAUDIO_V19 static int _process_callback( const void *_inputBuffer, void * _outputBuffer, diff --git a/include/AudioPulseAudio.h b/include/AudioPulseAudio.h index b6a998274..db3c566bf 100644 --- a/include/AudioPulseAudio.h +++ b/include/AudioPulseAudio.h @@ -88,7 +88,6 @@ public: private: void startProcessing() override; void stopProcessing() override; - void applyQualitySettings() override; void run() override; volatile bool m_quit; diff --git a/include/AudioSdl.h b/include/AudioSdl.h index 62db8b68a..5062f79ea 100644 --- a/include/AudioSdl.h +++ b/include/AudioSdl.h @@ -74,7 +74,6 @@ public: private: void startProcessing() override; void stopProcessing() override; - void applyQualitySettings() override; static void sdlAudioCallback( void * _udata, Uint8 * _buf, int _len ); void sdlAudioCallback( Uint8 * _buf, int _len ); diff --git a/include/AudioSndio.h b/include/AudioSndio.h index 594ca94e7..beb4913eb 100644 --- a/include/AudioSndio.h +++ b/include/AudioSndio.h @@ -75,7 +75,6 @@ public: private: void startProcessing() override; void stopProcessing() override; - void applyQualitySettings() override; void run() override; struct sio_hdl *m_hdl; diff --git a/include/SetupDialog.h b/include/SetupDialog.h index 7a1304d9a..871a80bcd 100644 --- a/include/SetupDialog.h +++ b/include/SetupDialog.h @@ -102,7 +102,6 @@ private slots: // Audio settings widget. void audioInterfaceChanged(const QString & driver); - void toggleHQAudioDev(bool enabled); void updateBufferSizeWarning(int value); void setBufferSize(int value); void resetBufferSize(); @@ -180,7 +179,6 @@ private: AswMap m_audioIfaceSetupWidgets; trMap m_audioIfaceNames; bool m_NaNHandler; - bool m_hqAudioDev; int m_bufferSize; QSlider * m_bufferSizeSlider; QLabel * m_bufferSizeLbl; diff --git a/include/SongEditor.h b/include/SongEditor.h index ee9e83f44..19d652b4f 100644 --- a/include/SongEditor.h +++ b/include/SongEditor.h @@ -97,8 +97,6 @@ protected: void mouseReleaseEvent(QMouseEvent * me) override; private slots: - void setHighQuality( bool ); - void setMasterVolume( int new_val ); void showMasterVolumeFloat(); void updateMasterVolumeFloat( int new_val ); diff --git a/src/core/audio/AudioAlsa.cpp b/src/core/audio/AudioAlsa.cpp index d80bc8912..eda0f7a31 100644 --- a/src/core/audio/AudioAlsa.cpp +++ b/src/core/audio/AudioAlsa.cpp @@ -240,48 +240,6 @@ void AudioAlsa::stopProcessing() stopProcessingThread( this ); } - - - -void AudioAlsa::applyQualitySettings() -{ - if( hqAudio() ) - { - setSampleRate( Engine::audioEngine()->processingSampleRate() ); - - if( m_handle != nullptr ) - { - snd_pcm_close( m_handle ); - } - - if (int err = snd_pcm_open(&m_handle, probeDevice().toLatin1().constData(), SND_PCM_STREAM_PLAYBACK, 0); - err < 0) - { - printf( "Playback open error: %s\n", - snd_strerror( err ) ); - return; - } - - if (int err = setHWParams(channels(), SND_PCM_ACCESS_RW_INTERLEAVED); err < 0) - { - printf( "Setting of hwparams failed: %s\n", - snd_strerror( err ) ); - return; - } - if (int err = setSWParams(); err < 0) - { - printf( "Setting of swparams failed: %s\n", - snd_strerror( err ) ); - return; - } - } - - AudioDevice::applyQualitySettings(); -} - - - - void AudioAlsa::run() { auto temp = new surroundSampleFrame[audioEngine()->framesPerPeriod()]; diff --git a/src/core/audio/AudioDevice.cpp b/src/core/audio/AudioDevice.cpp index 743716622..80f6439b8 100644 --- a/src/core/audio/AudioDevice.cpp +++ b/src/core/audio/AudioDevice.cpp @@ -250,13 +250,4 @@ void AudioDevice::clearS16Buffer( int_sample_t * _outbuf, const fpp_t _frames ) memset( _outbuf, 0, _frames * channels() * BYTES_PER_INT_SAMPLE ); } - - - -bool AudioDevice::hqAudio() const -{ - return ConfigManager::inst()->value( "audioengine", "hqaudio" ).toInt(); -} - - } // namespace lmms \ No newline at end of file diff --git a/src/core/audio/AudioJack.cpp b/src/core/audio/AudioJack.cpp index 64819cbeb..4d27602ef 100644 --- a/src/core/audio/AudioJack.cpp +++ b/src/core/audio/AudioJack.cpp @@ -229,24 +229,6 @@ void AudioJack::stopProcessing() m_stopped = true; } - - - -void AudioJack::applyQualitySettings() -{ - if (hqAudio()) - { - setSampleRate(Engine::audioEngine()->processingSampleRate()); - - if (jack_get_sample_rate(m_client) != sampleRate()) { setSampleRate(jack_get_sample_rate(m_client)); } - } - - AudioDevice::applyQualitySettings(); -} - - - - void AudioJack::registerPort(AudioPort* port) { #ifdef AUDIO_PORT_SUPPORT diff --git a/src/core/audio/AudioOss.cpp b/src/core/audio/AudioOss.cpp index 1653e93fa..e18260d61 100644 --- a/src/core/audio/AudioOss.cpp +++ b/src/core/audio/AudioOss.cpp @@ -254,41 +254,6 @@ void AudioOss::stopProcessing() stopProcessingThread( this ); } - - - -void AudioOss::applyQualitySettings() -{ - if( hqAudio() ) - { - setSampleRate( Engine::audioEngine()->processingSampleRate() ); - - unsigned int value = sampleRate(); - if ( ioctl( m_audioFD, SNDCTL_DSP_SPEED, &value ) < 0 ) - { - perror( "SNDCTL_DSP_SPEED" ); - printf( "Couldn't set audio frequency\n" ); - return; - } - if( value != sampleRate() ) - { - value = audioEngine()->baseSampleRate(); - if ( ioctl( m_audioFD, SNDCTL_DSP_SPEED, &value ) < 0 ) - { - perror( "SNDCTL_DSP_SPEED" ); - printf( "Couldn't set audio frequency\n" ); - return; - } - setSampleRate( value ); - } - } - - AudioDevice::applyQualitySettings(); -} - - - - void AudioOss::run() { auto temp = new surroundSampleFrame[audioEngine()->framesPerPeriod()]; diff --git a/src/core/audio/AudioPortAudio.cpp b/src/core/audio/AudioPortAudio.cpp index 1cb8c8eed..bc5d7dd9d 100644 --- a/src/core/audio/AudioPortAudio.cpp +++ b/src/core/audio/AudioPortAudio.cpp @@ -229,38 +229,6 @@ void AudioPortAudio::stopProcessing() } - - -void AudioPortAudio::applyQualitySettings() -{ - if( hqAudio() ) - { - - setSampleRate( Engine::audioEngine()->processingSampleRate() ); - int samples = audioEngine()->framesPerPeriod(); - - PaError err = Pa_OpenStream( - &m_paStream, - supportsCapture() ? &m_inputParameters : nullptr, // The input parameter - &m_outputParameters, // The outputparameter - sampleRate(), - samples, - paNoFlag, // Don't use any flags - _process_callback, // our callback function - this ); - - if( err != paNoError ) - { - printf( "Couldn't open PortAudio: %s\n", Pa_GetErrorText( err ) ); - return; - } - } - - AudioDevice::applyQualitySettings(); -} - - - int AudioPortAudio::process_callback( const float *_inputBuffer, float * _outputBuffer, diff --git a/src/core/audio/AudioPulseAudio.cpp b/src/core/audio/AudioPulseAudio.cpp index 63b81a9e9..b32e6eaf2 100644 --- a/src/core/audio/AudioPulseAudio.cpp +++ b/src/core/audio/AudioPulseAudio.cpp @@ -109,22 +109,6 @@ void AudioPulseAudio::stopProcessing() } - - -void AudioPulseAudio::applyQualitySettings() -{ - if( hqAudio() ) - { -// setSampleRate( engine::audioEngine()->processingSampleRate() ); - - } - - AudioDevice::applyQualitySettings(); -} - - - - /* This routine is called whenever the stream state changes */ static void stream_state_callback( pa_stream *s, void * userdata ) { diff --git a/src/core/audio/AudioSdl.cpp b/src/core/audio/AudioSdl.cpp index da81886ac..0d960c107 100644 --- a/src/core/audio/AudioSdl.cpp +++ b/src/core/audio/AudioSdl.cpp @@ -191,37 +191,6 @@ void AudioSdl::stopProcessing() } } - - - -void AudioSdl::applyQualitySettings() -{ - // Better than if (0) -#if 0 - if( 0 )//hqAudio() ) - { - SDL_CloseAudio(); - - setSampleRate( Engine::audioEngine()->processingSampleRate() ); - - m_audioHandle.freq = sampleRate(); - - SDL_AudioSpec actual; - - // open the audio device, forcing the desired format - if( SDL_OpenAudio( &m_audioHandle, &actual ) < 0 ) - { - qCritical( "Couldn't open SDL-audio: %s\n", SDL_GetError() ); - } - } -#endif - - AudioDevice::applyQualitySettings(); -} - - - - void AudioSdl::sdlAudioCallback( void * _udata, Uint8 * _buf, int _len ) { auto _this = static_cast(_udata); diff --git a/src/core/audio/AudioSndio.cpp b/src/core/audio/AudioSndio.cpp index 7d8e7fa8c..535b885da 100644 --- a/src/core/audio/AudioSndio.cpp +++ b/src/core/audio/AudioSndio.cpp @@ -139,20 +139,6 @@ void AudioSndio::stopProcessing() stopProcessingThread( this ); } - -void AudioSndio::applyQualitySettings() -{ - if( hqAudio() ) - { - setSampleRate( Engine::audioEngine()->processingSampleRate() ); - - /* change sample rate to sampleRate() */ - } - - AudioDevice::applyQualitySettings(); -} - - void AudioSndio::run() { surroundSampleFrame * temp = new surroundSampleFrame[audioEngine()->framesPerPeriod()]; diff --git a/src/gui/editors/SongEditor.cpp b/src/gui/editors/SongEditor.cpp index 1806f2931..d486be5c8 100644 --- a/src/gui/editors/SongEditor.cpp +++ b/src/gui/editors/SongEditor.cpp @@ -142,17 +142,6 @@ SongEditor::SongEditor( Song * song ) : int tempoSpinBoxCol = getGUI()->mainWindow()->addWidgetToToolBar( m_tempoSpinBox, 0 ); -#if 0 - toolButton * hq_btn = new toolButton( embed::getIconPixmap( "hq_mode" ), - tr( "High quality mode" ), - nullptr, nullptr, tb ); - hq_btn->setCheckable( true ); - connect( hq_btn, SIGNAL(toggled(bool)), - this, SLOT(setHighQuality(bool))); - hq_btn->setFixedWidth( 42 ); - getGUI()->mainWindow()->addWidgetToToolBar( hq_btn, 1, col ); -#endif - getGUI()->mainWindow()->addWidgetToToolBar( new TimeDisplayWidget, 1, tempoSpinBoxCol ); getGUI()->mainWindow()->addSpacingToToolBar( 10 ); @@ -333,19 +322,6 @@ QString SongEditor::getSnapSizeString() const } } - - - -void SongEditor::setHighQuality( bool hq ) -{ - Engine::audioEngine()->changeQuality( AudioEngine::qualitySettings( - hq ? AudioEngine::qualitySettings::Mode::HighQuality : - AudioEngine::qualitySettings::Mode::Draft ) ); -} - - - - void SongEditor::scrolled( int new_pos ) { update(); diff --git a/src/gui/modals/SetupDialog.cpp b/src/gui/modals/SetupDialog.cpp index ba7814f31..9e2b1fe4a 100644 --- a/src/gui/modals/SetupDialog.cpp +++ b/src/gui/modals/SetupDialog.cpp @@ -142,8 +142,6 @@ SetupDialog::SetupDialog(ConfigTab tab_to_open) : "ui", "disableautoquit", "1").toInt()), m_NaNHandler(ConfigManager::inst()->value( "app", "nanhandler", "1").toInt()), - m_hqAudioDev(ConfigManager::inst()->value( - "audioengine", "hqaudio").toInt()), m_bufferSize(ConfigManager::inst()->value( "audioengine", "framesperaudiobuffer").toInt()), m_midiAutoQuantize(ConfigManager::inst()->value( @@ -560,10 +558,6 @@ SetupDialog::SetupDialog(ConfigTab tab_to_open) : // audio_layout->addWidget(useNaNHandler); // useNaNHandler->setChecked(m_NaNHandler); - // HQ mode checkbox - auto hqaudio = addCheckBox(tr("HQ mode for output audio device"), audioInterfaceBox, nullptr, - m_hqAudioDev, SLOT(toggleHQAudioDev(bool)), false); - // Buffer size group QGroupBox * bufferSizeBox = new QGroupBox(tr("Buffer size"), audio_w); QVBoxLayout * bufferSizeLayout = new QVBoxLayout(bufferSizeBox); @@ -605,7 +599,6 @@ SetupDialog::SetupDialog(ConfigTab tab_to_open) : // Audio layout ordering. audio_layout->addWidget(audioInterfaceBox); audio_layout->addWidget(as_w); - audio_layout->addWidget(hqaudio); audio_layout->addWidget(bufferSizeBox); audio_layout->addStretch(); @@ -970,8 +963,6 @@ void SetupDialog::accept() m_audioIfaceNames[m_audioInterfaces->currentText()]); ConfigManager::inst()->setValue("app", "nanhandler", QString::number(m_NaNHandler)); - ConfigManager::inst()->setValue("audioengine", "hqaudio", - QString::number(m_hqAudioDev)); ConfigManager::inst()->setValue("audioengine", "framesperaudiobuffer", QString::number(m_bufferSize)); ConfigManager::inst()->setValue("audioengine", "mididev", @@ -1174,17 +1165,6 @@ void SetupDialog::toggleDisableAutoQuit(bool enabled) m_disableAutoQuit = enabled; } - - - -// Audio settings slots. - -void SetupDialog::toggleHQAudioDev(bool enabled) -{ - m_hqAudioDev = enabled; -} - - void SetupDialog::audioInterfaceChanged(const QString & iface) { for(AswMap::iterator it = m_audioIfaceSetupWidgets.begin();