smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-16 11:46:25 +01:00
Code Issues Projects Releases Wiki Activity

Remove using std::min/max from header

Browse source
This commit is contained in:
Robin Gareus 2020-06-18 00:48:58 +02:00
parent c424e4d61c
commit 23feb0491e
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
6 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/ardour/export_graph_builder.cc
View file

@ -444,7 +444,7 @@ ExportGraphBuilder::SFC::SFC (ExportGraphBuilder &parent, FileSpec const & new_c
samplecnt_t sb = config.format->silence_beginning_at (parent.timespan->get_start(), sample_rate); samplecnt_t sb = config.format->silence_beginning_at (parent.timespan->get_start(), sample_rate);
samplecnt_t se = config.format->silence_end_at (parent.timespan->get_end(), sample_rate); samplecnt_t se = config.format->silence_end_at (parent.timespan->get_end(), sample_rate);
samplecnt_t duration = parent.timespan->get_length () + sb + se; samplecnt_t duration = parent.timespan->get_length () + sb + se;
max_samples = min ((samplecnt_t) 8192 * channels, max ((samplecnt_t) 4096 * channels, max_samples)); max_samples = std::min ((samplecnt_t) 8192 * channels, std::max ((samplecnt_t) 4096 * channels, max_samples));
chunker.reset (new Chunker<Sample> (max_samples)); chunker.reset (new Chunker<Sample> (max_samples));
analyser.reset (new Analyser (config.format->sample_rate(), channels, max_samples, analyser.reset (new Analyser (config.format->sample_rate(), channels, max_samples,
(samplecnt_t) ceil (duration * config.format->sample_rate () / (double) sample_rate))); (samplecnt_t) ceil (duration * config.format->sample_rate () / (double) sample_rate)));

6
libs/ardour/luaproc.cc
View file

@ -502,7 +502,7 @@ LuaProc::can_support_io_configuration (const ChanCount& in, ChanCount& out, Chan
} else if (possible_out < -2) { } else if (possible_out < -2) {
/* variable number of outputs up to -N, /* variable number of outputs up to -N,
* invalid if in == -2 but we accept it anyway */ * invalid if in == -2 but we accept it anyway */
FOUNDCFG (min (-possible_out, preferred_out)); FOUNDCFG (std::min (-possible_out, preferred_out));
UPTO (-possible_out) UPTO (-possible_out)
} else { } else {
/* exact number of outputs */ /* exact number of outputs */
@ -518,7 +518,7 @@ LuaProc::can_support_io_configuration (const ChanCount& in, ChanCount& out, Chan
desired_in = possible_in; desired_in = possible_in;
} else { } else {
/* configuration can match up to -possible_in */ /* configuration can match up to -possible_in */
desired_in = min (-possible_in, audio_in); desired_in = std::min (-possible_in, audio_in);
} }
if (!imprecise && audio_in != desired_in) { if (!imprecise && audio_in != desired_in) {
/* skip that configuration, it cannot match /* skip that configuration, it cannot match
@ -534,7 +534,7 @@ LuaProc::can_support_io_configuration (const ChanCount& in, ChanCount& out, Chan
/* variable number of outputs up to -N /* variable number of outputs up to -N
* not specified if in > 0, but we accept it anyway. * not specified if in > 0, but we accept it anyway.
* Really imprecise only if desired_in != audio_in */ * Really imprecise only if desired_in != audio_in */
FOUNDCFG_IMPRECISE (desired_in, min (-possible_out, preferred_out)); FOUNDCFG_IMPRECISE (desired_in, std::min (-possible_out, preferred_out));
UPTO (-possible_out) UPTO (-possible_out)
} else { } else {
/* exact number of outputs /* exact number of outputs

3
libs/pbd/pbd/controllable.h
View file

@ -34,9 +34,6 @@
#include "pbd/statefuldestructible.h" #include "pbd/statefuldestructible.h"
using std::min;
using std::max;
class XMLNode; class XMLNode;
namespace PBD { namespace PBD {

4
libs/surfaces/launch_control_xl/controllers.cc
View file

@ -958,13 +958,13 @@ LaunchControlXL::button_track_mode(TrackMode state)
void void
LaunchControlXL::button_select_left() LaunchControlXL::button_select_left()
{ {
switch_bank (max (0, bank_start - (7 + (fader8master() ? 0 : 1)))); switch_bank (std::max (0, bank_start - (7 + (fader8master() ? 0 : 1))));
} }
void void
LaunchControlXL::button_select_right() LaunchControlXL::button_select_right()
{ {
switch_bank (max (0, bank_start + 7 + (fader8master() ? 0 : 1))); switch_bank (std::max (0, bank_start + 7 + (fader8master() ? 0 : 1)));
} }
void void

4
libs/surfaces/push2/buttons.cc
View file

@ -682,7 +682,7 @@ Push2::button_octave_down ()
return; return;
} }
int os = (max (-4, octave_shift - 1)); int os = (std::max (-4, octave_shift - 1));
if (os != octave_shift) { if (os != octave_shift) {
octave_shift = os; octave_shift = os;
} }
@ -696,7 +696,7 @@ Push2::button_octave_up ()
return; return;
} }
int os = (min (4, octave_shift + 1)); int os = (std::min (4, octave_shift + 1));
if (os != octave_shift) { if (os != octave_shift) {
octave_shift = os; octave_shift = os;
} }

2
libs/surfaces/websockets/transport.cc
View file

@ -32,7 +32,7 @@ ArdourTransport::tempo () const
void void
ArdourTransport::set_tempo (double bpm) ArdourTransport::set_tempo (double bpm)
{ {
bpm = max (0.01, bpm); bpm = std::max (0.01, bpm);
TempoMap& tempo_map = session ().tempo_map (); TempoMap& tempo_map = session ().tempo_map ();
Tempo tempo (bpm, tempo_map.tempo_at_sample (0).note_type (), bpm); Tempo tempo (bpm, tempo_map.tempo_at_sample (0).note_type (), bpm);
tempo_map.add_tempo (tempo, 0.0, 0, AudioTime); tempo_map.add_tempo (tempo, 0.0, 0, AudioTime);