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

various fixes

Browse source
This commit is contained in:
Hane 2023-08-31 01:46:52 +02:00
commit 24110624fb
9 changed files with 163 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/cont/contclasses.cpp
View file

@ -2,9 +2,6 @@
#include "contclasses.h"
//TODO: pragma once
//TODO: ?????
Overseer OverseerHandler::os;
EndpointHandler::EndpointHandler(uint64_t idx) {
//std::vector<Endpoint*> endpoints = osh->getPlaybackEndpoints().at(idx);
this->ep = osh->getPlaybackEndpoints().at(idx);
@ -39,13 +36,13 @@ uint64_t EndpointHandler::getIndex(){
/*
* -1 for master volume
*/
void EndpointHandler::setVolume(NGuid* guid, int channel, int value){
void EndpointHandler::setVolume(NGuid guid, int channel, int value){
if (channel == AudioChannel::CHANNEL_MAIN)
ep->setVolume(guid, channel, (float)value / 100);
else ep->setVolume(guid, channel, (float)value / 100);
}
void EndpointHandler::setMute(NGuid* guid, bool muted){
void EndpointHandler::setMute(NGuid guid, bool muted){
ep->setMute(guid, muted);
}
@ -79,8 +76,12 @@ EndpointHandler::~EndpointHandler() {
delete ep;
}
OverseerHandler::OverseerHandler() {
this->os = new Overseer();
}
std::vector<Endpoint*> OverseerHandler::getPlaybackEndpoints() {
return this->os.getPlaybackEndpoints();
return this->os->getPlaybackEndpoints();
}
@ -89,7 +90,7 @@ std::vector<EndpointHandler*> OverseerHandler::getEndpointHandlers(){
}
uint64_t OverseerHandler::getPlaybackEndpointsCount(){
return this->os.getPlaybackEndpoints().size();
return this->os->getPlaybackEndpoints().size();
}
void OverseerHandler::reloadEndpointHandlers(){
@ -113,8 +114,8 @@ void OverseerHandler::reloadEndpointHandlers(){
//setEndpointHandlers(ephs);
}
NGuid* OverseerHandler::getGuid() {
return this->os.getGuid();
NGuid OverseerHandler::getGuid() {
return this->os->getGuid();
}
void OverseerHandler::setEndpointHandlers(std::vector<EndpointHandler*> ephs){