Remove high quality mode from codebase (#7219)

Many, many years ago (93a456c), high quality mode was merely disabled after it was noted that it can be problematic rather than being completely removed. Remove it from the codebase so we can get rid of some code and clean things up a bit.
LMMS · Apr 27, 2024 · a53e5ba · a53e5ba
1 parent 71dd300
commit a53e5ba
Show file tree

Hide file tree

Showing 20 changed files with 1 addition and 257 deletions.
diff --git a/include/AudioAlsa.h b/include/AudioAlsa.h
@@ -84,7 +84,6 @@ class AudioAlsa : public QThread, public AudioDevice
 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
@@ -89,9 +89,7 @@ class AudioDevice
 
 	virtual void stopProcessing();
 
-	virtual void applyQualitySettings();
-
-
+	void applyQualitySettings();
 
 protected:
 	// subclasses can re-implement this for being used in conjunction with
@@ -129,8 +127,6 @@ class AudioDevice
 		return m_audioEngine;
 	}
 
-	bool hqAudio() const;
-
 	static void stopProcessingThread( QThread * thread );
 
 

diff --git a/include/AudioJack.h b/include/AudioJack.h
@@ -93,7 +93,6 @@ private slots:
 
 	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
@@ -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
@@ -109,7 +109,6 @@ class AudioPortAudio : public AudioDevice
 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
@@ -88,7 +88,6 @@ class AudioPulseAudio : public QThread, public AudioDevice
 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
@@ -74,7 +74,6 @@ class AudioSdl : public AudioDevice
 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
@@ -75,7 +75,6 @@ class AudioSndio : public QThread, public AudioDevice
 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
@@ -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 slots:
 	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
@@ -97,8 +97,6 @@ public slots:
 	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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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<AudioSdl*>(_udata);

diff --git 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
@@ -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();