ardour/livetrax
13
0
Fork 0
Code

Replace boost::shared_array<T> with std::shared_ptr<T[]>

Browse Source
This commit is contained in:
Alejandro Domínguez 2024-08-26 07:29:47 +02:00 committed by Robin Gareus
parent a3d4888be3
commit 5223b176f3
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
14 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/ardour/ardour/audiosource.h
View File

@ -24,8 +24,6 @@
#include <memory> #include <memory>
#include <boost/shared_array.hpp>
#include <time.h> #include <time.h>
#include <glibmm/threads.h> #include <glibmm/threads.h>
@ -107,8 +105,8 @@ class LIBARDOUR_API AudioSource : virtual public Source, public ARDOUR::AudioRea
thread, or a lock around calls that use them. thread, or a lock around calls that use them.
*/ */
static std::vector<boost::shared_array<Sample> > _mixdown_buffers; static std::vector<std::shared_ptr<Sample[]> > _mixdown_buffers;
static std::vector<boost::shared_array<gain_t> > _gain_buffers; static std::vector<std::shared_ptr<gain_t[]> > _gain_buffers;
static Glib::Threads::Mutex _level_buffer_lock; static Glib::Threads::Mutex _level_buffer_lock;
std::string _peakpath; std::string _peakpath;

6
libs/ardour/ardour/delayline.h
View File

@ -20,8 +20,6 @@
#include <memory> #include <memory>
#include <boost/shared_array.hpp>
#include "ardour/types.h" #include "ardour/types.h"
#include "ardour/processor.h" #include "ardour/processor.h"
@ -67,8 +65,8 @@ private:
sampleoffset_t _roff, _woff; sampleoffset_t _roff, _woff;
bool _pending_flush; bool _pending_flush;
typedef std::vector<boost::shared_array<Sample> > AudioDlyBuf; typedef std::vector<std::shared_ptr<Sample[]>> AudioDlyBuf;
typedef std::vector<std::shared_ptr<MidiBuffer> > MidiDlyBuf; typedef std::vector<std::shared_ptr<MidiBuffer>> MidiDlyBuf;
AudioDlyBuf _buf; AudioDlyBuf _buf;
MidiDlyBuf _midi_buf; MidiDlyBuf _midi_buf;

2
libs/ardour/delayline.cc
View File

@ -362,7 +362,7 @@ DelayLine::allocate_pending_buffers (samplecnt_t signal_delay, ChanCount const&
AudioDlyBuf pending_buf; AudioDlyBuf pending_buf;
for (uint32_t i = 0; i < cc.n_audio (); ++i) { for (uint32_t i = 0; i < cc.n_audio (); ++i) {
boost::shared_array<Sample> b (new Sample[rbs]); std::shared_ptr<Sample[]> b (new Sample[rbs]);
pending_buf.push_back (b); pending_buf.push_back (b);
memset (b.get (), 0, rbs * sizeof (Sample)); memset (b.get (), 0, rbs * sizeof (Sample));
} }

6
libs/ardour/import.cc
View File

@ -40,8 +40,6 @@
#include "pbd/gstdio_compat.h" #include "pbd/gstdio_compat.h"
#include <glibmm.h> #include <glibmm.h>
#include <boost/shared_array.hpp>
#include "pbd/basename.h" #include "pbd/basename.h"
#include "pbd/convert.h" #include "pbd/convert.h"
@ -266,10 +264,10 @@ write_audio_data_to_new_files (ImportableSource* source, ImportStatus& status,
} }
std::unique_ptr<float[]> data(new float[nframes * channels]); std::unique_ptr<float[]> data(new float[nframes * channels]);
vector<boost::shared_array<Sample> > channel_data; vector<std::shared_ptr<Sample[]> > channel_data;
for (uint32_t n = 0; n < channels; ++n) { for (uint32_t n = 0; n < channels; ++n) {
channel_data.push_back(boost::shared_array<Sample>(new Sample[nframes])); channel_data.push_back(std::shared_ptr<Sample[]>(new Sample[nframes]));
} }
float gain = 1; float gain = 1;

2
libs/canvas/canvas/image.h
View File

@ -23,8 +23,6 @@
#include <cstdint> #include <cstdint>
#include <memory> #include <memory>
#include <boost/shared_array.hpp>
#include "canvas/visibility.h" #include "canvas/visibility.h"
#include "canvas/item.h" #include "canvas/item.h"

2
libs/ctrl-interface/midi_surface/midi_surface/midi_byte_array.h
View File

@ -21,8 +21,6 @@
#include <iostream> #include <iostream>
#include <vector> #include <vector>
#include <boost/shared_array.hpp>
//#include <midi++/types.h> //#include <midi++/types.h>
namespace MIDI { namespace MIDI {
typedef unsigned char byte; typedef unsigned char byte;

2
libs/surfaces/launch_control_xl/midi_byte_array.h
View File

@ -21,8 +21,6 @@
#include <iostream> #include <iostream>
#include <vector> #include <vector>
#include <boost/shared_array.hpp>
//#include <midi++/types.h> //#include <midi++/types.h>
namespace MIDI { namespace MIDI {
typedef unsigned char byte; typedef unsigned char byte;

1
libs/surfaces/mackie/mackie_control_protocol.cc
View File

@ -35,7 +35,6 @@
#include <sys/time.h> #include <sys/time.h>
#include <errno.h> #include <errno.h>
#include <boost/shared_array.hpp>
#include <glibmm/miscutils.h> #include <glibmm/miscutils.h>
#include "midi++/types.h" #include "midi++/types.h"

2
libs/surfaces/mackie/midi_byte_array.h
View File

@ -22,8 +22,6 @@
#include <iostream> #include <iostream>
#include <vector> #include <vector>
#include <boost/shared_array.hpp>
//#include <midi++/types.h> //#include <midi++/types.h>
namespace MIDI { namespace MIDI {
typedef unsigned char byte; typedef unsigned char byte;

1
libs/surfaces/mackie/surface_port.cc
View File

@ -25,7 +25,6 @@
#include <cerrno> #include <cerrno>
#include <sigc++/sigc++.h> #include <sigc++/sigc++.h>
#include <boost/shared_array.hpp>
#include "pbd/failed_constructor.h" #include "pbd/failed_constructor.h"

2
libs/surfaces/push2/midi_byte_array.h
View File

@ -21,8 +21,6 @@
#include <iostream> #include <iostream>
#include <vector> #include <vector>
#include <boost/shared_array.hpp>
//#include <midi++/types.h> //#include <midi++/types.h>
namespace MIDI { namespace MIDI {
typedef unsigned char byte; typedef unsigned char byte;

2
libs/surfaces/us2400/midi_byte_array.h
View File

@ -21,8 +21,6 @@
#include <iostream> #include <iostream>
#include <vector> #include <vector>
#include <boost/shared_array.hpp>
//#include <midi++/types.h> //#include <midi++/types.h>
namespace MIDI { namespace MIDI {
typedef unsigned char byte; typedef unsigned char byte;

1
libs/surfaces/us2400/surface_port.cc
View File

@ -21,7 +21,6 @@
#include <cerrno> #include <cerrno>
#include <sigc++/sigc++.h> #include <sigc++/sigc++.h>
#include <boost/shared_array.hpp>
#include "pbd/failed_constructor.h" #include "pbd/failed_constructor.h"

1
libs/surfaces/us2400/us2400_control_protocol.cc
View File

@ -29,7 +29,6 @@
#include <sys/time.h> #include <sys/time.h>
#include <errno.h> #include <errno.h>
#include <boost/shared_array.hpp>
#include <glibmm/miscutils.h> #include <glibmm/miscutils.h>
#include "midi++/types.h" #include "midi++/types.h"