Skip to content
Snippets Groups Projects
Commit ac9ddf05 authored by Tristan Matthews's avatar Tristan Matthews
Browse files

* #30215: mainbuffer: don't make temporary copies of mainbuffer

Also, disallow copying of mainbuffer since we haven't implemented
a proper move or copy constructor (and there's no need).
parent 40eca111
No related branches found
No related tags found
No related merge requests found
...@@ -37,6 +37,8 @@ ...@@ -37,6 +37,8 @@
#include <pthread.h> #include <pthread.h>
#include "audiobuffer.h" #include "audiobuffer.h"
#include "mainbuffer.h"
#include "noncopyable.h"
class RingBuffer; class RingBuffer;
...@@ -99,6 +101,7 @@ class MainBuffer { ...@@ -99,6 +101,7 @@ class MainBuffer {
void dumpInfo(); void dumpInfo();
private: private:
NON_COPYABLE(MainBuffer);
CallIDSet* getCallIDSet(const std::string &call_id); CallIDSet* getCallIDSet(const std::string &call_id);
......
...@@ -93,7 +93,7 @@ void Conference::remove(const std::string &participant_id) ...@@ -93,7 +93,7 @@ void Conference::remove(const std::string &participant_id)
void Conference::bindParticipant(const std::string &participant_id) void Conference::bindParticipant(const std::string &participant_id)
{ {
auto mainBuffer = Manager::instance().getMainBuffer(); auto &mainBuffer = Manager::instance().getMainBuffer();
for (const auto &item : participants_) { for (const auto &item : participants_) {
if (participant_id != item) if (participant_id != item)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment