From 16db33f2bf1f1a68bbefa455d09e81f9b77cd374 Mon Sep 17 00:00:00 2001 From: Johannes Lorenz Date: Sat, 3 Oct 2020 12:13:06 +0200 Subject: [PATCH] Use STL version of `std::make_shared` now As all is compiled with C++14 now, no need to use `std::make_shared` from stdshims.h now. --- plugins/DualFilter/DualFilterControls.cpp | 89 +++++++++++------------ plugins/monstro/Monstro.h | 53 +++++++------- src/core/InstrumentFunctions.cpp | 17 ++--- src/core/InstrumentSoundShaping.cpp | 47 ++++++------ src/core/RenderManager.cpp | 3 +- src/core/lv2/Lv2ControlBase.cpp | 3 +- src/gui/editors/PianoRoll.cpp | 7 +- 7 files changed, 106 insertions(+), 113 deletions(-) diff --git a/plugins/DualFilter/DualFilterControls.cpp b/plugins/DualFilter/DualFilterControls.cpp index 0992d478c..35cbaab3a 100644 --- a/plugins/DualFilter/DualFilterControls.cpp +++ b/plugins/DualFilter/DualFilterControls.cpp @@ -32,7 +32,6 @@ #include "embed.h" #include "Engine.h" #include "Song.h" -#include "stdshims.h" DualFilterControls::DualFilterControls( DualFilterEffect* effect ) : EffectControls( effect ), @@ -52,51 +51,51 @@ DualFilterControls::DualFilterControls( DualFilterEffect* effect ) : m_res2Model( 0.5, BasicFilters<>::minQ(), 10.0, 0.01, this, tr( "Q/Resonance 2" ) ), m_gain2Model( 100.0f, 0.0f, 200.0f, 0.1f, this, tr( "Gain 2" ) ) { - m_filter1Model.addItem( tr( "Low-pass" ), make_unique( "filter_lp" ) ); - m_filter1Model.addItem( tr( "Hi-pass" ), make_unique( "filter_hp" ) ); - m_filter1Model.addItem( tr( "Band-pass csg" ), make_unique( "filter_bp" ) ); - m_filter1Model.addItem( tr( "Band-pass czpg" ), make_unique( "filter_bp" ) ); - m_filter1Model.addItem( tr( "Notch" ), make_unique( "filter_notch" ) ); - m_filter1Model.addItem( tr( "All-pass" ), make_unique( "filter_ap" ) ); - m_filter1Model.addItem( tr( "Moog" ), make_unique( "filter_lp" ) ); - m_filter1Model.addItem( tr( "2x Low-pass" ), make_unique( "filter_2lp" ) ); - m_filter1Model.addItem( tr( "RC Low-pass 12 dB/oct" ), make_unique( "filter_lp" ) ); - m_filter1Model.addItem( tr( "RC Band-pass 12 dB/oct" ), make_unique( "filter_bp" ) ); - m_filter1Model.addItem( tr( "RC High-pass 12 dB/oct" ), make_unique( "filter_hp" ) ); - m_filter1Model.addItem( tr( "RC Low-pass 24 dB/oct" ), make_unique( "filter_lp" ) ); - m_filter1Model.addItem( tr( "RC Band-pass 24 dB/oct" ), make_unique( "filter_bp" ) ); - m_filter1Model.addItem( tr( "RC High-pass 24 dB/oct" ), make_unique( "filter_hp" ) ); - m_filter1Model.addItem( tr( "Vocal Formant" ), make_unique( "filter_hp" ) ); - m_filter1Model.addItem( tr( "2x Moog" ), make_unique( "filter_2lp" ) ); - m_filter1Model.addItem( tr( "SV Low-pass" ), make_unique( "filter_lp" ) ); - m_filter1Model.addItem( tr( "SV Band-pass" ), make_unique( "filter_bp" ) ); - m_filter1Model.addItem( tr( "SV High-pass" ), make_unique( "filter_hp" ) ); - m_filter1Model.addItem( tr( "SV Notch" ), make_unique( "filter_notch" ) ); - m_filter1Model.addItem( tr( "Fast Formant" ), make_unique( "filter_hp" ) ); - m_filter1Model.addItem( tr( "Tripole" ), make_unique( "filter_lp" ) ); + m_filter1Model.addItem( tr( "Low-pass" ), std::make_unique( "filter_lp" ) ); + m_filter1Model.addItem( tr( "Hi-pass" ), std::make_unique( "filter_hp" ) ); + m_filter1Model.addItem( tr( "Band-pass csg" ), std::make_unique( "filter_bp" ) ); + m_filter1Model.addItem( tr( "Band-pass czpg" ), std::make_unique( "filter_bp" ) ); + m_filter1Model.addItem( tr( "Notch" ), std::make_unique( "filter_notch" ) ); + m_filter1Model.addItem( tr( "All-pass" ), std::make_unique( "filter_ap" ) ); + m_filter1Model.addItem( tr( "Moog" ), std::make_unique( "filter_lp" ) ); + m_filter1Model.addItem( tr( "2x Low-pass" ), std::make_unique( "filter_2lp" ) ); + m_filter1Model.addItem( tr( "RC Low-pass 12 dB/oct" ), std::make_unique( "filter_lp" ) ); + m_filter1Model.addItem( tr( "RC Band-pass 12 dB/oct" ), std::make_unique( "filter_bp" ) ); + m_filter1Model.addItem( tr( "RC High-pass 12 dB/oct" ), std::make_unique( "filter_hp" ) ); + m_filter1Model.addItem( tr( "RC Low-pass 24 dB/oct" ), std::make_unique( "filter_lp" ) ); + m_filter1Model.addItem( tr( "RC Band-pass 24 dB/oct" ), std::make_unique( "filter_bp" ) ); + m_filter1Model.addItem( tr( "RC High-pass 24 dB/oct" ), std::make_unique( "filter_hp" ) ); + m_filter1Model.addItem( tr( "Vocal Formant" ), std::make_unique( "filter_hp" ) ); + m_filter1Model.addItem( tr( "2x Moog" ), std::make_unique( "filter_2lp" ) ); + m_filter1Model.addItem( tr( "SV Low-pass" ), std::make_unique( "filter_lp" ) ); + m_filter1Model.addItem( tr( "SV Band-pass" ), std::make_unique( "filter_bp" ) ); + m_filter1Model.addItem( tr( "SV High-pass" ), std::make_unique( "filter_hp" ) ); + m_filter1Model.addItem( tr( "SV Notch" ), std::make_unique( "filter_notch" ) ); + m_filter1Model.addItem( tr( "Fast Formant" ), std::make_unique( "filter_hp" ) ); + m_filter1Model.addItem( tr( "Tripole" ), std::make_unique( "filter_lp" ) ); - m_filter2Model.addItem( tr( "Low-pass" ), make_unique( "filter_lp" ) ); - m_filter2Model.addItem( tr( "Hi-pass" ), make_unique( "filter_hp" ) ); - m_filter2Model.addItem( tr( "Band-pass csg" ), make_unique( "filter_bp" ) ); - m_filter2Model.addItem( tr( "Band-pass czpg" ), make_unique( "filter_bp" ) ); - m_filter2Model.addItem( tr( "Notch" ), make_unique( "filter_notch" ) ); - m_filter2Model.addItem( tr( "All-pass" ), make_unique( "filter_ap" ) ); - m_filter2Model.addItem( tr( "Moog" ), make_unique( "filter_lp" ) ); - m_filter2Model.addItem( tr( "2x Low-pass" ), make_unique( "filter_2lp" ) ); - m_filter2Model.addItem( tr( "RC Low-pass 12 dB/oct" ), make_unique( "filter_lp" ) ); - m_filter2Model.addItem( tr( "RC Band-pass 12 dB/oct" ), make_unique( "filter_bp" ) ); - m_filter2Model.addItem( tr( "RC High-pass 12 dB/oct" ), make_unique( "filter_hp" ) ); - m_filter2Model.addItem( tr( "RC Low-pass 24 dB/oct" ), make_unique( "filter_lp" ) ); - m_filter2Model.addItem( tr( "RC Band-pass 24 dB/oct" ), make_unique( "filter_bp" ) ); - m_filter2Model.addItem( tr( "RC High-pass 24 dB/oct" ), make_unique( "filter_hp" ) ); - m_filter2Model.addItem( tr( "Vocal Formant" ), make_unique( "filter_hp" ) ); - m_filter2Model.addItem( tr( "2x Moog" ), make_unique( "filter_2lp" ) ); - m_filter2Model.addItem( tr( "SV Low-pass" ), make_unique( "filter_lp" ) ); - m_filter2Model.addItem( tr( "SV Band-pass" ), make_unique( "filter_bp" ) ); - m_filter2Model.addItem( tr( "SV High-pass" ), make_unique( "filter_hp" ) ); - m_filter2Model.addItem( tr( "SV Notch" ), make_unique( "filter_notch" ) ); - m_filter2Model.addItem( tr( "Fast Formant" ), make_unique( "filter_hp" ) ); - m_filter2Model.addItem( tr( "Tripole" ), make_unique( "filter_lp" ) ); + m_filter2Model.addItem( tr( "Low-pass" ), std::make_unique( "filter_lp" ) ); + m_filter2Model.addItem( tr( "Hi-pass" ), std::make_unique( "filter_hp" ) ); + m_filter2Model.addItem( tr( "Band-pass csg" ), std::make_unique( "filter_bp" ) ); + m_filter2Model.addItem( tr( "Band-pass czpg" ), std::make_unique( "filter_bp" ) ); + m_filter2Model.addItem( tr( "Notch" ), std::make_unique( "filter_notch" ) ); + m_filter2Model.addItem( tr( "All-pass" ), std::make_unique( "filter_ap" ) ); + m_filter2Model.addItem( tr( "Moog" ), std::make_unique( "filter_lp" ) ); + m_filter2Model.addItem( tr( "2x Low-pass" ), std::make_unique( "filter_2lp" ) ); + m_filter2Model.addItem( tr( "RC Low-pass 12 dB/oct" ), std::make_unique( "filter_lp" ) ); + m_filter2Model.addItem( tr( "RC Band-pass 12 dB/oct" ), std::make_unique( "filter_bp" ) ); + m_filter2Model.addItem( tr( "RC High-pass 12 dB/oct" ), std::make_unique( "filter_hp" ) ); + m_filter2Model.addItem( tr( "RC Low-pass 24 dB/oct" ), std::make_unique( "filter_lp" ) ); + m_filter2Model.addItem( tr( "RC Band-pass 24 dB/oct" ), std::make_unique( "filter_bp" ) ); + m_filter2Model.addItem( tr( "RC High-pass 24 dB/oct" ), std::make_unique( "filter_hp" ) ); + m_filter2Model.addItem( tr( "Vocal Formant" ), std::make_unique( "filter_hp" ) ); + m_filter2Model.addItem( tr( "2x Moog" ), std::make_unique( "filter_2lp" ) ); + m_filter2Model.addItem( tr( "SV Low-pass" ), std::make_unique( "filter_lp" ) ); + m_filter2Model.addItem( tr( "SV Band-pass" ), std::make_unique( "filter_bp" ) ); + m_filter2Model.addItem( tr( "SV High-pass" ), std::make_unique( "filter_hp" ) ); + m_filter2Model.addItem( tr( "SV Notch" ), std::make_unique( "filter_notch" ) ); + m_filter2Model.addItem( tr( "Fast Formant" ), std::make_unique( "filter_hp" ) ); + m_filter2Model.addItem( tr( "Tripole" ), std::make_unique( "filter_lp" ) ); connect( Engine::mixer(), SIGNAL( sampleRateChanged() ), this, SLOT( updateFilters() ) ); } diff --git a/plugins/monstro/Monstro.h b/plugins/monstro/Monstro.h index fc0cc13b0..0bb1a8dcc 100644 --- a/plugins/monstro/Monstro.h +++ b/plugins/monstro/Monstro.h @@ -39,7 +39,6 @@ #include "Oscillator.h" #include "lmms_math.h" #include "BandLimitedWave.h" -#include "stdshims.h" // // UI Macros @@ -310,35 +309,35 @@ class MonstroInstrument : public Instrument Q_OBJECT #define setwavemodel( name ) \ - name .addItem( tr( "Sine wave" ), make_unique( "sin" ) ); \ - name .addItem( tr( "Bandlimited Triangle wave" ), make_unique( "tri" ) ); \ - name .addItem( tr( "Bandlimited Saw wave" ), make_unique( "saw" ) ); \ - name .addItem( tr( "Bandlimited Ramp wave" ), make_unique( "ramp" ) ); \ - name .addItem( tr( "Bandlimited Square wave" ), make_unique( "sqr" ) ); \ - name .addItem( tr( "Bandlimited Moog saw wave" ), make_unique( "moog" ) ); \ - name .addItem( tr( "Soft square wave" ), make_unique( "sqrsoft" ) ); \ - name .addItem( tr( "Absolute sine wave" ), make_unique( "sinabs" ) ); \ - name .addItem( tr( "Exponential wave" ), make_unique( "exp" ) ); \ - name .addItem( tr( "White noise" ), make_unique( "noise" ) ); \ - name .addItem( tr( "Digital Triangle wave" ), make_unique( "tri" ) ); \ - name .addItem( tr( "Digital Saw wave" ), make_unique( "saw" ) ); \ - name .addItem( tr( "Digital Ramp wave" ), make_unique( "ramp" ) ); \ - name .addItem( tr( "Digital Square wave" ), make_unique( "sqr" ) ); \ - name .addItem( tr( "Digital Moog saw wave" ), make_unique( "moog" ) ); + name .addItem( tr( "Sine wave" ), std::make_unique( "sin" ) ); \ + name .addItem( tr( "Bandlimited Triangle wave" ), std::make_unique( "tri" ) ); \ + name .addItem( tr( "Bandlimited Saw wave" ), std::make_unique( "saw" ) ); \ + name .addItem( tr( "Bandlimited Ramp wave" ), std::make_unique( "ramp" ) ); \ + name .addItem( tr( "Bandlimited Square wave" ), std::make_unique( "sqr" ) ); \ + name .addItem( tr( "Bandlimited Moog saw wave" ), std::make_unique( "moog" ) ); \ + name .addItem( tr( "Soft square wave" ), std::make_unique( "sqrsoft" ) ); \ + name .addItem( tr( "Absolute sine wave" ), std::make_unique( "sinabs" ) ); \ + name .addItem( tr( "Exponential wave" ), std::make_unique( "exp" ) ); \ + name .addItem( tr( "White noise" ), std::make_unique( "noise" ) ); \ + name .addItem( tr( "Digital Triangle wave" ), std::make_unique( "tri" ) ); \ + name .addItem( tr( "Digital Saw wave" ), std::make_unique( "saw" ) ); \ + name .addItem( tr( "Digital Ramp wave" ), std::make_unique( "ramp" ) ); \ + name .addItem( tr( "Digital Square wave" ), std::make_unique( "sqr" ) ); \ + name .addItem( tr( "Digital Moog saw wave" ), std::make_unique( "moog" ) ); #define setlfowavemodel( name ) \ - name .addItem( tr( "Sine wave" ), make_unique( "sin" ) ); \ - name .addItem( tr( "Triangle wave" ), make_unique( "tri" ) ); \ - name .addItem( tr( "Saw wave" ), make_unique( "saw" ) ); \ - name .addItem( tr( "Ramp wave" ), make_unique( "ramp" ) ); \ - name .addItem( tr( "Square wave" ), make_unique( "sqr" ) ); \ - name .addItem( tr( "Moog saw wave" ), make_unique( "moog" ) ); \ - name .addItem( tr( "Soft square wave" ), make_unique( "sqrsoft" ) ); \ - name .addItem( tr( "Abs. sine wave" ), make_unique( "sinabs" ) ); \ - name .addItem( tr( "Exponential wave" ), make_unique( "exp" ) ); \ - name .addItem( tr( "Random" ), make_unique( "rand" ) ); \ - name .addItem( tr( "Random smooth" ), make_unique( "rand" ) ); + name .addItem( tr( "Sine wave" ), std::make_unique( "sin" ) ); \ + name .addItem( tr( "Triangle wave" ), std::make_unique( "tri" ) ); \ + name .addItem( tr( "Saw wave" ), std::make_unique( "saw" ) ); \ + name .addItem( tr( "Ramp wave" ), std::make_unique( "ramp" ) ); \ + name .addItem( tr( "Square wave" ), std::make_unique( "sqr" ) ); \ + name .addItem( tr( "Moog saw wave" ), std::make_unique( "moog" ) ); \ + name .addItem( tr( "Soft square wave" ), std::make_unique( "sqrsoft" ) ); \ + name .addItem( tr( "Abs. sine wave" ), std::make_unique( "sinabs" ) ); \ + name .addItem( tr( "Exponential wave" ), std::make_unique( "exp" ) ); \ + name .addItem( tr( "Random" ), std::make_unique( "rand" ) ); \ + name .addItem( tr( "Random smooth" ), std::make_unique( "rand" ) ); public: MonstroInstrument( InstrumentTrack * _instrument_track ); diff --git a/src/core/InstrumentFunctions.cpp b/src/core/InstrumentFunctions.cpp index 70e2c5e80..c8ec24d6e 100644 --- a/src/core/InstrumentFunctions.cpp +++ b/src/core/InstrumentFunctions.cpp @@ -30,7 +30,6 @@ #include "InstrumentTrack.h" #include "Mixer.h" #include "PresetPreviewPlayHandle.h" -#include "stdshims.h" InstrumentFunctionNoteStacking::ChordTable::Init InstrumentFunctionNoteStacking::ChordTable::s_initTable[] = @@ -316,16 +315,16 @@ InstrumentFunctionArpeggio::InstrumentFunctionArpeggio( Model * _parent ) : m_arpModel.addItem( chord_table[i].getName() ); } - m_arpDirectionModel.addItem( tr( "Up" ), make_unique( "arp_up" ) ); - m_arpDirectionModel.addItem( tr( "Down" ), make_unique( "arp_down" ) ); - m_arpDirectionModel.addItem( tr( "Up and down" ), make_unique( "arp_up_and_down" ) ); - m_arpDirectionModel.addItem( tr( "Down and up" ), make_unique( "arp_up_and_down" ) ); - m_arpDirectionModel.addItem( tr( "Random" ), make_unique( "arp_random" ) ); + m_arpDirectionModel.addItem( tr( "Up" ), std::make_unique( "arp_up" ) ); + m_arpDirectionModel.addItem( tr( "Down" ), std::make_unique( "arp_down" ) ); + m_arpDirectionModel.addItem( tr( "Up and down" ), std::make_unique( "arp_up_and_down" ) ); + m_arpDirectionModel.addItem( tr( "Down and up" ), std::make_unique( "arp_up_and_down" ) ); + m_arpDirectionModel.addItem( tr( "Random" ), std::make_unique( "arp_random" ) ); m_arpDirectionModel.setInitValue( ArpDirUp ); - m_arpModeModel.addItem( tr( "Free" ), make_unique( "arp_free" ) ); - m_arpModeModel.addItem( tr( "Sort" ), make_unique( "arp_sort" ) ); - m_arpModeModel.addItem( tr( "Sync" ), make_unique( "arp_sync" ) ); + m_arpModeModel.addItem( tr( "Free" ), std::make_unique( "arp_free" ) ); + m_arpModeModel.addItem( tr( "Sort" ), std::make_unique( "arp_sort" ) ); + m_arpModeModel.addItem( tr( "Sync" ), std::make_unique( "arp_sync" ) ); } diff --git a/src/core/InstrumentSoundShaping.cpp b/src/core/InstrumentSoundShaping.cpp index 2c221cdcc..b9e32427a 100644 --- a/src/core/InstrumentSoundShaping.cpp +++ b/src/core/InstrumentSoundShaping.cpp @@ -33,7 +33,6 @@ #include "Instrument.h" #include "InstrumentTrack.h" #include "Mixer.h" -#include "stdshims.h" const float CUT_FREQ_MULTIPLIER = 6000.0f; @@ -78,28 +77,28 @@ InstrumentSoundShaping::InstrumentSoundShaping( tr( targetNames[i][2] ) ); } - m_filterModel.addItem( tr( "Low-pass" ), make_unique( "filter_lp" ) ); - m_filterModel.addItem( tr( "Hi-pass" ), make_unique( "filter_hp" ) ); - m_filterModel.addItem( tr( "Band-pass csg" ), make_unique( "filter_bp" ) ); - m_filterModel.addItem( tr( "Band-pass czpg" ), make_unique( "filter_bp" ) ); - m_filterModel.addItem( tr( "Notch" ), make_unique( "filter_notch" ) ); - m_filterModel.addItem( tr( "All-pass" ), make_unique( "filter_ap" ) ); - m_filterModel.addItem( tr( "Moog" ), make_unique( "filter_lp" ) ); - m_filterModel.addItem( tr( "2x Low-pass" ), make_unique( "filter_2lp" ) ); - m_filterModel.addItem( tr( "RC Low-pass 12 dB/oct" ), make_unique( "filter_lp" ) ); - m_filterModel.addItem( tr( "RC Band-pass 12 dB/oct" ), make_unique( "filter_bp" ) ); - m_filterModel.addItem( tr( "RC High-pass 12 dB/oct" ), make_unique( "filter_hp" ) ); - m_filterModel.addItem( tr( "RC Low-pass 24 dB/oct" ), make_unique( "filter_lp" ) ); - m_filterModel.addItem( tr( "RC Band-pass 24 dB/oct" ), make_unique( "filter_bp" ) ); - m_filterModel.addItem( tr( "RC High-pass 24 dB/oct" ), make_unique( "filter_hp" ) ); - m_filterModel.addItem( tr( "Vocal Formant" ), make_unique( "filter_hp" ) ); - m_filterModel.addItem( tr( "2x Moog" ), make_unique( "filter_2lp" ) ); - m_filterModel.addItem( tr( "SV Low-pass" ), make_unique( "filter_lp" ) ); - m_filterModel.addItem( tr( "SV Band-pass" ), make_unique( "filter_bp" ) ); - m_filterModel.addItem( tr( "SV High-pass" ), make_unique( "filter_hp" ) ); - m_filterModel.addItem( tr( "SV Notch" ), make_unique( "filter_notch" ) ); - m_filterModel.addItem( tr( "Fast Formant" ), make_unique( "filter_hp" ) ); - m_filterModel.addItem( tr( "Tripole" ), make_unique( "filter_lp" ) ); + m_filterModel.addItem( tr( "Low-pass" ), std::make_unique( "filter_lp" ) ); + m_filterModel.addItem( tr( "Hi-pass" ), std::make_unique( "filter_hp" ) ); + m_filterModel.addItem( tr( "Band-pass csg" ), std::make_unique( "filter_bp" ) ); + m_filterModel.addItem( tr( "Band-pass czpg" ), std::make_unique( "filter_bp" ) ); + m_filterModel.addItem( tr( "Notch" ), std::make_unique( "filter_notch" ) ); + m_filterModel.addItem( tr( "All-pass" ), std::make_unique( "filter_ap" ) ); + m_filterModel.addItem( tr( "Moog" ), std::make_unique( "filter_lp" ) ); + m_filterModel.addItem( tr( "2x Low-pass" ), std::make_unique( "filter_2lp" ) ); + m_filterModel.addItem( tr( "RC Low-pass 12 dB/oct" ), std::make_unique( "filter_lp" ) ); + m_filterModel.addItem( tr( "RC Band-pass 12 dB/oct" ), std::make_unique( "filter_bp" ) ); + m_filterModel.addItem( tr( "RC High-pass 12 dB/oct" ), std::make_unique( "filter_hp" ) ); + m_filterModel.addItem( tr( "RC Low-pass 24 dB/oct" ), std::make_unique( "filter_lp" ) ); + m_filterModel.addItem( tr( "RC Band-pass 24 dB/oct" ), std::make_unique( "filter_bp" ) ); + m_filterModel.addItem( tr( "RC High-pass 24 dB/oct" ), std::make_unique( "filter_hp" ) ); + m_filterModel.addItem( tr( "Vocal Formant" ), std::make_unique( "filter_hp" ) ); + m_filterModel.addItem( tr( "2x Moog" ), std::make_unique( "filter_2lp" ) ); + m_filterModel.addItem( tr( "SV Low-pass" ), std::make_unique( "filter_lp" ) ); + m_filterModel.addItem( tr( "SV Band-pass" ), std::make_unique( "filter_bp" ) ); + m_filterModel.addItem( tr( "SV High-pass" ), std::make_unique( "filter_hp" ) ); + m_filterModel.addItem( tr( "SV Notch" ), std::make_unique( "filter_notch" ) ); + m_filterModel.addItem( tr( "Fast Formant" ), std::make_unique( "filter_hp" ) ); + m_filterModel.addItem( tr( "Tripole" ), std::make_unique( "filter_lp" ) ); } @@ -161,7 +160,7 @@ void InstrumentSoundShaping::processAudioBuffer( sampleFrame* buffer, if( n->m_filter == nullptr ) { - n->m_filter = make_unique>( Engine::mixer()->processingSampleRate() ); + n->m_filter = std::make_unique>( Engine::mixer()->processingSampleRate() ); } n->m_filter->setFilterType( m_filterModel.value() ); diff --git a/src/core/RenderManager.cpp b/src/core/RenderManager.cpp index 69255442c..62b278888 100644 --- a/src/core/RenderManager.cpp +++ b/src/core/RenderManager.cpp @@ -29,7 +29,6 @@ #include "Song.h" #include "BBTrackContainer.h" #include "BBTrack.h" -#include "stdshims.h" RenderManager::RenderManager( @@ -140,7 +139,7 @@ void RenderManager::renderProject() void RenderManager::render(QString outputPath) { - m_activeRenderer = make_unique( + m_activeRenderer = std::make_unique( m_qualitySettings, m_outputSettings, m_format, diff --git a/src/core/lv2/Lv2ControlBase.cpp b/src/core/lv2/Lv2ControlBase.cpp index 3f50325e7..cc986dafe 100644 --- a/src/core/lv2/Lv2ControlBase.cpp +++ b/src/core/lv2/Lv2ControlBase.cpp @@ -31,7 +31,6 @@ #include "Engine.h" #include "Lv2Manager.h" #include "Lv2Proc.h" -#include "stdshims.h" @@ -54,7 +53,7 @@ Lv2ControlBase::Lv2ControlBase(Model* that, const QString &uri) : int channelsLeft = DEFAULT_CHANNELS; // LMMS plugins are stereo while (channelsLeft > 0) { - std::unique_ptr newOne = make_unique(m_plugin, that); + std::unique_ptr newOne = std::make_unique(m_plugin, that); if (newOne->isValid()) { channelsLeft -= std::max( diff --git a/src/gui/editors/PianoRoll.cpp b/src/gui/editors/PianoRoll.cpp index 0eb049ddc..3ce684ece 100644 --- a/src/gui/editors/PianoRoll.cpp +++ b/src/gui/editors/PianoRoll.cpp @@ -61,7 +61,6 @@ #include "MainWindow.h" #include "Pattern.h" #include "SongEditor.h" -#include "stdshims.h" #include "StepRecorderWidget.h" #include "TextFloat.h" #include "TimeLineWidget.h" @@ -352,7 +351,7 @@ PianoRoll::PianoRoll() : // Set up note length model m_noteLenModel.addItem( tr( "Last note" ), - make_unique( "edit_draw" ) ); + std::make_unique( "edit_draw" ) ); const QString pixmaps[] = { "whole", "half", "quarter", "eighth", "sixteenth", "thirtysecond", "triplethalf", "tripletquarter", "tripleteighth", @@ -360,12 +359,12 @@ PianoRoll::PianoRoll() : for( int i = 0; i < NUM_EVEN_LENGTHS; ++i ) { - auto loader = make_unique( "note_" + pixmaps[i] ); + auto loader = std::make_unique( "note_" + pixmaps[i] ); m_noteLenModel.addItem( "1/" + QString::number( 1 << i ), ::move(loader) ); } for( int i = 0; i < NUM_TRIPLET_LENGTHS; ++i ) { - auto loader = make_unique( "note_" + pixmaps[i+NUM_EVEN_LENGTHS] ); + auto loader = std::make_unique( "note_" + pixmaps[i+NUM_EVEN_LENGTHS] ); m_noteLenModel.addItem( "1/" + QString::number( (1 << i) * 3 ), ::move(loader) ); } m_noteLenModel.setValue( 0 );