Hane/mixer
1
1
Fork 0
Code Issues 8 Pull requests Projects Releases 1 Packages Wiki Activity

Refactored program structure

Browse source
This commit is contained in:
Hane 2023-08-11 16:39:10 +02:00
commit 4e10385a3b
10 changed files with 140 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

74
src/cont/contclasses.cpp
View file

@ -1,4 +1,4 @@
#incluse "backlasses.h"
#include "backlasses.h"
#include "contclasses.h"
Overseer OverseerHandler::os;
@ -7,12 +7,12 @@ EndpointHandler::EndpointHandler(uint64_t idx) {
std::vector<Endpoint*> endpoints = osh->getPlaybackEndpoints();
this->ep = endpoints.at(idx);
epc = new EndpointCallback(ep);
epName = QString::fromStdWString(ept->getName());
ep->setCallback(*epc);
//epName = ep->getName();
//ep->setCallback(*epc);
}
void EndpointHandler::setIndex(uint64_t idx){
this.idx = idx;
this->idx = idx;
}
uint64_t EndpointHandler::getIndex(){
@ -25,36 +25,36 @@ uint64_t EndpointHandler::getIndex(){
*/
void EndpointHandler::setValue(int channel, int value){
if (channel == ENDPOINT_MASTER_VOLUME)
ept->setVolume(channel, (float)value / 100);
else ept->setVolume(channel, (float)value / 100);
ep->setVolume(channel, (float)value / 100);
else ep->setVolume(channel, (float)value / 100);
}
void EndpointHandler::setMute(){
//Qt momento, de ahi el param?
log_debugcpp("kinda handling the muting tbh");
ept->setMute();
ep->setMute();
}
QString EndpointHandler::getName(){
return eptName;
std::wstring EndpointHandler::getName(){
return ep->getName();
}
float EndpointHandler::getVolume(int channel){
return ept->getVolume(channel);
return ep->getVolume(channel);
}
bool EndpointHandler::getMute(){
return ept->getMute();
return ep->getMute();
}
EndpointHandler::~EndpointHandler() {
ep->removeCallback(*epc);
ep->removeCallback(epc);
delete epc;
delete ep;
}
std::vector<Endpoint*> OverseerHandler::getPlaybackEndpoints() {
return os->getPlaybackEndpoints();
return os.getPlaybackEndpoints();
}
/*
@ -64,38 +64,46 @@ std::vector<Endpoint*> OverseerHandler::getPlaybackEndpoints() {
*/
std::vector<EndpointHandler*>* OverseerHandler::getEndpointHandlers(){
return &endpointHandlers;
std::vector<EndpointHandler*> OverseerHandler::getEndpointHandlers(){
return endpointHandlers;
}
uint64_t OverseerHandler::getPlaybackEndpointsCount(){
return os->getplaybackEndpoints().size();
return os.getPlaybackEndpoints().size();
}
void OverseerHandler::reloadEndpointHandlers(){
//std::vector<EndpointHandler*>* ephs = new std::vector<EndpointHandler*>;
log_debugcpp(" VSize: " << this->getPlaybackEndpointsCount());
for(uint64_t i = 0; i < this->getPlaybackEndpointsCount(); i++){
log_debugcpp("Creating handler " << i);
if(i < (this->endpointHandlers.size()) &&
this->endpointHandlers.at(i) != nullptr)
delete endpointHandlers.at(i);
for(uint64_t i = 0; i < osh->getPlaybackEndpointsCount(); i++){
if(i < osh->getPlaybackEndpointsCount().size() &&
osh->getPlaybackEndpointsCount().at(i) != nullptr)
delete ephs.at(i);
EndpointHandler* eph = new EndpointHandler(i);
if (i >= osh->getPlaybackEndpointsCount().size())
ephs.push_back(eph);
else epsh.at(i) = eph;
log_debugcpp("Created handler " << i << ", adding to vector. " << " VSize: " << this->getPlaybackEndpointsCount());
if (i >= this->endpointHandlers.size())
endpointHandlers.push_back(eph);
else endpointHandlers.at(i) = eph;
}
//setEndpointHandlers(ephs);
}
void OverseerHandler::parseExternalEndpointCallback(EndpointCallback *fEpc, PAUDIO_VOLUME_NOTIFICATION_DATA pNotify){
log_debugcpp("parsing in da ovasiar");
for (uint64_t i = 0; i < endpointHandlers.size(); i++){
if(endpointHandlers.at(i)->eph->epc == fEpc) {
endpointHandlers.at(i)->muteButton->setText(endpointHandlers.at(i)->eph->getMute() ? STRING_UNMUTE : STRING_MUTE);
break;
}
}
/*
* void OverseerHandler::parseExternalEndpointCallback(EndpointCallback *fEpc, PAUDIO_VOLUME_NOTIFICATION_DATA pNotify){
* log_debugcpp("parsing in da ovasiar");
* for (uint64_t i = 0; i < endpointHandlers.size(); i++){
* if(endpointHandlers.at(i)->eph->epc == fEpc) {
* endpointHandlers.at(i)->muteButton->setText(endpointHandlers.at(i)->eph->getMute() ? STRING_UNMUTE : STRING_MUTE);
* break;
* }
* }
*/
/*
* connect(mainSlider, &QSlider::valueChanged, [this](int newValue){this->eph->setValue(ENDPOINT_MASTER_VOLUME, newValue); });
@ -104,7 +112,7 @@ void OverseerHandler::parseExternalEndpointCallback(EndpointCallback *fEpc, PAUD
* connect(muteButton, &QPushButton::clicked, [this](bool clicked){ log_debugcpp("cliqui" << clicked << "cloqui"); this->eph->setMute(); this->muteButton->setText(this->eph->getMute() ? STRING_UNMUTE : STRING_MUTE); });
* log_debugcpp("ENDPOINT_WIDGETED");
*/
}
void OverseerHandler::setEndpointHandlers(std::vector<EndpointHandler*> ews){
this->endpointHandlers = ews;