Place Pool in PBD namespace
A public class named "Pool" in the global namespace just calls for symbol name conflicts.
This commit is contained in:
parent
8418e7c954
commit
effc209070
@ -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);
|
||||
|
@ -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
|
||||
|
@ -48,7 +48,7 @@ public:
|
||||
}
|
||||
|
||||
private:
|
||||
static Pool pool;
|
||||
static PBD::Pool pool;
|
||||
};
|
||||
|
||||
class LIBARDOUR_API ClickIO : public IO
|
||||
|
@ -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;
|
||||
};
|
||||
|
@ -105,8 +105,8 @@ struct TransportFSM
|
||||
|
||||
static void init_pool ();
|
||||
|
||||
private:
|
||||
static Pool* pool;
|
||||
private:
|
||||
static PBD::Pool* pool;
|
||||
|
||||
};
|
||||
|
||||
|
@ -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);
|
||||
|
@ -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__
|
||||
|
Loading…
Reference in New Issue
Block a user