reverted failed attempt, fixed callback release
This commit is contained in:
parent
c8d64481e8
commit
a565190e6f
7 changed files with 51 additions and 30 deletions
|
|
@ -1,6 +1,9 @@
|
|||
#include "backlasses.h"
|
||||
#include "qtclasses.h"
|
||||
#include "contclasses.h"
|
||||
//TODO: pragma once
|
||||
|
||||
//TODO: ?????
|
||||
Overseer OverseerHandler::os;
|
||||
|
||||
EndpointHandler::EndpointHandler(uint64_t idx) {
|
||||
|
|
@ -49,12 +52,12 @@ bool EndpointHandler::getMute(){
|
|||
|
||||
EndpointHandler::~EndpointHandler() {
|
||||
ep->removeCallback(epc);
|
||||
delete epc;
|
||||
epc->Release();
|
||||
delete ep;
|
||||
}
|
||||
|
||||
std::vector<Endpoint*> OverseerHandler::getPlaybackEndpoints() {
|
||||
return os.getPlaybackEndpoints();
|
||||
return this->os.getPlaybackEndpoints();
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -69,7 +72,7 @@ std::vector<EndpointHandler*> OverseerHandler::getEndpointHandlers(){
|
|||
}
|
||||
|
||||
uint64_t OverseerHandler::getPlaybackEndpointsCount(){
|
||||
return os.getPlaybackEndpoints().size();
|
||||
return this->os.getPlaybackEndpoints().size();
|
||||
}
|
||||
|
||||
void OverseerHandler::reloadEndpointHandlers(){
|
||||
|
|
@ -83,7 +86,6 @@ void OverseerHandler::reloadEndpointHandlers(){
|
|||
this->endpointHandlers.at(i) != nullptr)
|
||||
delete endpointHandlers.at(i);
|
||||
|
||||
|
||||
EndpointHandler* eph = new EndpointHandler(i);
|
||||
log_debugcpp("Created handler " << i << ", adding to vector. " << " VSize: " << this->getPlaybackEndpointsCount());
|
||||
|
||||
|
|
@ -96,11 +98,16 @@ void OverseerHandler::reloadEndpointHandlers(){
|
|||
|
||||
|
||||
NGuid* OverseerHandler::getGuid() {
|
||||
return os.getGuid();
|
||||
return this->os.getGuid();
|
||||
}
|
||||
|
||||
|
||||
void OverseerHandler::setEndpointHandlers(std::vector<EndpointHandler*> ews){
|
||||
this->endpointHandlers = ews;
|
||||
void OverseerHandler::setEndpointHandlers(std::vector<EndpointHandler*> ephs){
|
||||
this->endpointHandlers = ephs;
|
||||
}
|
||||
|
||||
/*
|
||||
* void OverseerHandler::setEndpointWidgets(std::vector<EndpointWidget*> ews){
|
||||
* this->endpointWidgets = ews;
|
||||
* }
|
||||
*/
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue