Replace tLimit() with qBound() and remove templates.h (#5040)

* Replace tLimit() with qBound() * Remove templates.h
LMMS · Jun 15, 2019 · 5431cc7 · 5431cc7
1 parent f141ae6
commit 5431cc7
Show file tree

Hide file tree

Showing 29 changed files with 45 additions and 100 deletions.
diff --git a/include/BasicFilters.h b/include/BasicFilters.h
@@ -39,7 +39,6 @@
 #include <math.h>
 
 #include "lmms_basics.h"
-#include "templates.h"
 #include "lmms_constants.h"
 #include "interpolation.h"
 #include "MemoryManager.h"

diff --git a/include/Controller.h b/include/Controller.h
@@ -31,7 +31,6 @@
 #include "Engine.h"
 #include "Model.h"
 #include "JournallingObject.h"
-#include "templates.h"
 #include "ValueBuffer.h"
 
 class ControllerDialog;
@@ -112,7 +111,7 @@ class LMMS_EXPORT Controller : public Model, public JournallingObject
 
 	inline static float fittedValue( float _val )
 	{
-		return tLimit<float>( _val, 0.0f, 1.0f );
+		return qBound<float>( 0.0f, _val, 1.0f );
 	}
 
 	static long runningPeriods()

diff --git a/include/DspEffectLibrary.h b/include/DspEffectLibrary.h
@@ -27,7 +27,6 @@
 #define DSP_EFFECT_LIBRARY_H
 
 #include "lmms_math.h"
-#include "templates.h"
 #include "lmms_constants.h"
 #include "lmms_basics.h"
 

diff --git a/include/Knob.h b/include/Knob.h
@@ -30,7 +30,6 @@
 #include <QtCore/QPoint>
 
 #include "AutomatableModelView.h"
-#include "templates.h"
 
 
 class QPixmap;

diff --git a/include/panning.h b/include/panning.h
@@ -28,7 +28,6 @@
 
 #include "lmms_basics.h"
 #include "volume.h"
-#include "templates.h"
 #include "panning_constants.h"
 #include "Midi.h"
 

diff --git a/include/templates.h b/include/templates.h
diff --git a/plugins/bit_invader/bit_invader.cpp b/plugins/bit_invader/bit_invader.cpp
@@ -36,7 +36,6 @@
 #include "NotePlayHandle.h"
 #include "Oscillator.h"
 #include "PixmapButton.h"
-#include "templates.h"
 #include "ToolTip.h"
 #include "Song.h"
 #include "interpolation.h"

diff --git a/plugins/lb302/lb302.cpp b/plugins/lb302/lb302.cpp
@@ -41,7 +41,6 @@
 #include "NotePlayHandle.h"
 #include "Oscillator.h"
 #include "PixmapButton.h"
-#include "templates.h"
 #include "ToolTip.h"
 #include "BandLimitedWave.h"
 

diff --git a/plugins/monstro/Monstro.cpp b/plugins/monstro/Monstro.cpp
@@ -28,7 +28,6 @@
 #include "Monstro.h"
 #include "Engine.h"
 #include "InstrumentTrack.h"
-#include "templates.h"
 #include "gui_templates.h"
 #include "ToolTip.h"
 #include "Song.h"

diff --git a/plugins/nes/Nes.cpp b/plugins/nes/Nes.cpp
@@ -27,7 +27,6 @@
 #include "Nes.h"
 #include "Engine.h"
 #include "InstrumentTrack.h"
-#include "templates.h"
 #include "ToolTip.h"
 #include "Song.h"
 #include "lmms_math.h"

diff --git a/plugins/organic/organic.cpp b/plugins/organic/organic.cpp
@@ -37,7 +37,6 @@
 #include "NotePlayHandle.h"
 #include "Oscillator.h"
 #include "PixmapButton.h"
-#include "templates.h"
 #include "ToolTip.h"
 
 #include "embed.h"

diff --git a/plugins/sfxr/sfxr.cpp b/plugins/sfxr/sfxr.cpp
@@ -45,7 +45,6 @@ float frnd(float range)
 #include "Knob.h"
 #include "NotePlayHandle.h"
 #include "PixmapButton.h"
-#include "templates.h"
 #include "ToolTip.h"
 #include "Song.h"
 #include "MidiEvent.h"

diff --git a/plugins/vibed/vibed.cpp b/plugins/vibed/vibed.cpp
@@ -35,7 +35,6 @@
 #include "CaptionMenu.h"
 #include "Oscillator.h"
 #include "string_container.h"
-#include "templates.h"
 #include "volume.h"
 #include "Song.h"
 

diff --git a/plugins/vibed/vibrating_string.cpp b/plugins/vibed/vibrating_string.cpp
@@ -24,7 +24,6 @@
 #include <math.h>
 
 #include "vibrating_string.h"
-#include "templates.h"
 #include "interpolation.h"
 #include "Mixer.h"
 #include "Engine.h"
@@ -145,9 +144,9 @@ void vibratingString::resample( float *_src, f_cnt_t _src_frames,
 							_dst_frames;
 		const float frac_pos = src_frame_float -
 				static_cast<f_cnt_t>( src_frame_float );
-		const f_cnt_t src_frame = tLimit<f_cnt_t>(
-				static_cast<f_cnt_t>( src_frame_float ),
-							1, _src_frames - 3 );
+		const f_cnt_t src_frame = qBound<f_cnt_t>(
+				1, static_cast<f_cnt_t>( src_frame_float ),
+							_src_frames - 3 );
 		m_impulse[frame] = cubicInterpolate(
 						_src[src_frame - 1],
 						_src[src_frame + 0],

diff --git a/plugins/vst_base/VstPlugin.cpp b/plugins/vst_base/VstPlugin.cpp
@@ -60,7 +60,6 @@
 #include "MainWindow.h"
 #include "Mixer.h"
 #include "Song.h"
-#include "templates.h"
 #include "FileDialog.h"
 
 #ifdef LMMS_BUILD_LINUX

diff --git a/plugins/watsyn/Watsyn.cpp b/plugins/watsyn/Watsyn.cpp
@@ -28,7 +28,6 @@
 #include "base64.h"
 #include "Engine.h"
 #include "InstrumentTrack.h"
-#include "templates.h"
 #include "ToolTip.h"
 #include "Song.h"
 #include "lmms_math.h"

diff --git a/src/core/AutomatableModel.cpp b/src/core/AutomatableModel.cpp
@@ -439,7 +439,7 @@ void AutomatableModel::setStep( const float step )
 
 float AutomatableModel::fittedValue( float value ) const
 {
-	value = tLimit<float>( value, m_minValue, m_maxValue );
+	value = qBound<float>( m_minValue, value, m_maxValue );
 
 	if( m_step != 0 && m_hasStrictStepSize )
 	{

diff --git a/src/core/SampleBuffer.cpp b/src/core/SampleBuffer.cpp
@@ -936,7 +936,7 @@ void SampleBuffer::visualize( QPainter & _p, const QRect & _dr,
 	const float y_space = h*0.5f;
 	const int nb_frames = focus_on_range ? _to_frame - _from_frame : m_frames;
 
-	const int fpp = tLimit<int>( nb_frames / w, 1, 20 );
+	const int fpp = qBound<int>( 1, nb_frames / w, 20 );
 	QPointF * l = new QPointF[nb_frames / fpp + 1];
 	QPointF * r = new QPointF[nb_frames / fpp + 1];
 	int n = 0;

diff --git a/src/core/audio/AudioAlsa.cpp b/src/core/audio/AudioAlsa.cpp
@@ -37,10 +37,10 @@
 
 
 AudioAlsa::AudioAlsa( bool & _success_ful, Mixer*  _mixer ) :
-	AudioDevice( tLimit<ch_cnt_t>(
+	AudioDevice( qBound<ch_cnt_t>(
+		DEFAULT_CHANNELS,
 		ConfigManager::inst()->value( "audioalsa", "channels" ).toInt(),
-					DEFAULT_CHANNELS, SURROUND_CHANNELS ),
-								_mixer ),
+		SURROUND_CHANNELS ), _mixer ),
 	m_handle( NULL ),
 	m_hwParams( NULL ),
 	m_swParams( NULL ),

diff --git a/src/core/audio/AudioJack.cpp b/src/core/audio/AudioJack.cpp
@@ -32,7 +32,6 @@
 
 #include "Engine.h"
 #include "GuiApplication.h"
-#include "templates.h"
 #include "gui_templates.h"
 #include "ConfigManager.h"
 #include "LcdSpinBox.h"
@@ -44,10 +43,10 @@
 
 
 AudioJack::AudioJack( bool & _success_ful, Mixer*  _mixer ) :
-	AudioDevice( tLimit<int>( ConfigManager::inst()->value(
-					"audiojack", "channels" ).toInt(),
-					DEFAULT_CHANNELS, SURROUND_CHANNELS ),
-								_mixer ),
+	AudioDevice( qBound<int>(
+		DEFAULT_CHANNELS,
+		ConfigManager::inst()->value( "audiojack", "channels" ).toInt(),
+		SURROUND_CHANNELS ), _mixer ),
 	m_client( NULL ),
 	m_active( false ),
 	m_midiClient( NULL ),

diff --git a/src/core/audio/AudioOss.cpp b/src/core/audio/AudioOss.cpp
@@ -69,10 +69,10 @@
 
 
 AudioOss::AudioOss( bool & _success_ful, Mixer*  _mixer ) :
-	AudioDevice( tLimit<ch_cnt_t>(
+	AudioDevice( qBound<ch_cnt_t>(
+		DEFAULT_CHANNELS,
 		ConfigManager::inst()->value( "audiooss", "channels" ).toInt(),
-					DEFAULT_CHANNELS, SURROUND_CHANNELS ),
-								_mixer ),
+		SURROUND_CHANNELS ), _mixer ),
 	m_convertEndian( false )
 {
 	_success_ful = false;

diff --git a/src/core/audio/AudioPortAudio.cpp b/src/core/audio/AudioPortAudio.cpp
@@ -48,16 +48,15 @@ void AudioPortAudioSetupUtil::updateChannels()
 #include "Engine.h"
 #include "ConfigManager.h"
 #include "gui_templates.h"
-#include "templates.h"
 #include "ComboBox.h"
 #include "Mixer.h"
 
 
 AudioPortAudio::AudioPortAudio( bool & _success_ful, Mixer * _mixer ) :
-	AudioDevice( tLimit<ch_cnt_t>(
+	AudioDevice( qBound<ch_cnt_t>(
+		DEFAULT_CHANNELS,
 		ConfigManager::inst()->value( "audioportaudio", "channels" ).toInt(),
-					DEFAULT_CHANNELS, SURROUND_CHANNELS ),
-								_mixer ),
+		SURROUND_CHANNELS ), _mixer ),
 	m_paStream( NULL ),
 	m_wasPAInitError( false ),
 	m_outBuf( new surroundSampleFrame[mixer()->framesPerPeriod()] ),

diff --git a/src/core/audio/AudioPulseAudio.cpp b/src/core/audio/AudioPulseAudio.cpp
@@ -45,10 +45,10 @@ static void stream_write_callback(pa_stream *s, size_t length, void *userdata)
 
 
 AudioPulseAudio::AudioPulseAudio( bool & _success_ful, Mixer*  _mixer ) :
-	AudioDevice( tLimit<ch_cnt_t>(
+	AudioDevice( qBound<ch_cnt_t>(
+		DEFAULT_CHANNELS,
 		ConfigManager::inst()->value( "audiopa", "channels" ).toInt(),
-					DEFAULT_CHANNELS, SURROUND_CHANNELS ),
-								_mixer ),
+		SURROUND_CHANNELS ), _mixer ),
 	m_s( NULL ),
 	m_quit( false ),
 	m_convertEndian( false )

diff --git a/src/core/audio/AudioSndio.cpp b/src/core/audio/AudioSndio.cpp
@@ -36,7 +36,6 @@
 #include "Mixer.h"
 #include "Engine.h"
 #include "gui_templates.h"
-#include "templates.h"
 
 #ifdef LMMS_HAVE_UNISTD_H
 #include <unistd.h>
@@ -50,10 +49,11 @@
 
 
 AudioSndio::AudioSndio(bool & _success_ful, Mixer * _mixer) :
-	AudioDevice( tLimit<ch_cnt_t>(
-	    ConfigManager::inst()->value( "audiosndio", "channels" ).toInt(),
-	    DEFAULT_CHANNELS, SURROUND_CHANNELS ), _mixer ),
-            m_convertEndian ( false )
+	AudioDevice( qBound<ch_cnt_t>(
+		DEFAULT_CHANNELS,
+		ConfigManager::inst()->value( "audiosndio", "channels" ).toInt(),
+		SURROUND_CHANNELS ), _mixer ),
+	m_convertEndian ( false )
 {
 	_success_ful = false;
 

diff --git a/src/core/audio/AudioSoundIo.cpp b/src/core/audio/AudioSoundIo.cpp
@@ -33,14 +33,14 @@
 #include "debug.h"
 #include "ConfigManager.h"
 #include "gui_templates.h"
-#include "templates.h"
 #include "ComboBox.h"
 #include "Mixer.h"
 
 AudioSoundIo::AudioSoundIo( bool & outSuccessful, Mixer * _mixer ) :
-	AudioDevice( tLimit<ch_cnt_t>(
-		ConfigManager::inst()->value( "audiosoundio", "channels" ).toInt(), DEFAULT_CHANNELS, SURROUND_CHANNELS ),
-								_mixer )
+	AudioDevice( qBound<ch_cnt_t>(
+		DEFAULT_CHANNELS,
+		ConfigManager::inst()->value( "audiosoundio", "channels" ).toInt(),
+		SURROUND_CHANNELS ), _mixer )
 {
 	outSuccessful = false;
 	m_soundio = NULL;

diff --git a/src/gui/PianoView.cpp b/src/gui/PianoView.cpp
@@ -355,7 +355,7 @@ int PianoView::getKeyFromMouse( const QPoint & _p ) const
 	}
 
 	// some range-checking-stuff
-	return tLimit( key_num, 0, NumKeys - 1 );
+	return qBound( 0, key_num, NumKeys - 1 );
 }
 
 

diff --git a/src/gui/PluginBrowser.cpp b/src/gui/PluginBrowser.cpp
@@ -34,7 +34,6 @@
 
 #include "embed.h"
 #include "Engine.h"
-#include "templates.h"
 #include "gui_templates.h"
 #include "StringPairDrag.h"
 #include "PluginFactory.h"
@@ -231,7 +230,7 @@ void PluginDescWidget::paintEvent( QPaintEvent * )
 	style()->drawPrimitive( QStyle::PE_Widget, &o, &p, this );
 
 	// Draw the rest
-	const int s = 16 + ( 32 * ( tLimit( height(), 24, 60 ) - 24 ) ) /
+	const int s = 16 + ( 32 * ( qBound( 24, height(), 60 ) - 24 ) ) /
 								( 60 - 24 );
 	const QSize logo_size( s, s );
 	QPixmap logo = m_logo.scaled( logo_size, Qt::KeepAspectRatio,
-Original file line number
+Diff line change
@@ Expand Up / @@ -355,7 +355,7 @@ int PianoView::getKeyFromMouse( const QPoint & _p ) const @@
     	}
     	// some range-checking-stuff
-    	return tLimit( key_num, 0, NumKeys - 1 );
+    	return qBound( 0, key_num, NumKeys - 1 );
     }
@@ Expand Down @@