ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Place Pool in PBD namespace

Browse Source 
A public class named "Pool" in the global namespace just
calls for symbol name conflicts.
This commit is contained in:
Robin Gareus 2022-07-07 05:07:11 +02:00
parent 8418e7c954
commit effc209070
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
7 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/midi_tracer.h
View File

@ -73,7 +73,7 @@ private:
GATOMIC_QUAL gint _update_queued;
PBD::RingBuffer<char *> fifo;
Pool buffer_pool;
PBD::Pool buffer_pool;
static const size_t buffer_size = 256;
void tracer (MIDI::Parser&, MIDI::byte*, size_t, MIDI::samplecnt_t);

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

@ -114,9 +114,9 @@ private:
samplecnt_t _audio_playback_buffer_size;
uint32_t _midi_buffer_size;
PBD::RingBuffer<CrossThreadPool*> pool_trash;
CrossThreadChannel _xthread;
PBD::MPMCQueue<sigc::slot<void> > _delegated_work;
PBD::RingBuffer<PBD::CrossThreadPool*> pool_trash;
CrossThreadChannel _xthread;
PBD::MPMCQueue<sigc::slot<void> > _delegated_work;
};
} // namespace ARDOUR

2
libs/ardour/ardour/click.h
View File

@ -48,7 +48,7 @@ public:
}
private:
static Pool pool;
static PBD::Pool pool;
};
class LIBARDOUR_API ClickIO : public IO

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

@ -150,11 +150,11 @@ public:
static void init_event_pool ();
static guint pool_available ();
CrossThreadPool* event_pool() const { return own_pool; }
PBD::CrossThreadPool* event_pool() const { return own_pool; }
private:
static PerThreadPool* pool;
CrossThreadPool* own_pool;
static PBD::PerThreadPool* pool;
PBD::CrossThreadPool* own_pool;
friend class Butler;
};

4
libs/ardour/ardour/transport_fsm.h
View File

@ -105,8 +105,8 @@ struct TransportFSM
static void init_pool ();
private:
static Pool* pool;
private:
static PBD::Pool* pool;
};

4
libs/ardour/ardour/triggerbox.h
View File

@ -670,7 +670,7 @@ class LIBARDOUR_API TriggerBoxThread
void* operator new (size_t);
void operator delete (void* ptr, size_t);
static MultiAllocSingleReleasePool* pool;
static PBD::MultiAllocSingleReleasePool* pool;
static void init_pool ();
};
@ -875,7 +875,7 @@ class LIBARDOUR_API TriggerBox : public Processor
Request (Type t) : type (t) {}
static MultiAllocSingleReleasePool* pool;
static PBD::MultiAllocSingleReleasePool* pool;
static void init_pool();
void* operator new (size_t);

4
libs/pbd/pbd/pool.h
View File

@ -30,6 +30,8 @@
#include "pbd/libpbd_visibility.h"
#include "pbd/ringbuffer.h"
namespace PBD {
typedef void (*PoolDumpCallback) (size_t, void*);
/** A pool of data items that can be allocated, read from and written to
@ -171,4 +173,6 @@ private:
PBD::RingBuffer<CrossThreadPool*>* _trash;
};
} // namespace PBD
#endif // __qm_pool_h__