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

no copies objetos, anda

Browse source
This commit is contained in:
Hane 2023-02-11 03:12:45 +01:00
commit 826373aee4
5 changed files with 20 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/back/backlasses.cpp
View file

@ -25,12 +25,13 @@ void Endpoint::setVolume(float volume) {
if(FAILED(endpointVolume->SetMasterVolumeLevelScalar(volume, NULL))) { log_debugcpp("si"); }; if(FAILED(endpointVolume->SetMasterVolumeLevelScalar(volume, NULL))) { log_debugcpp("si"); };
} }
//Endpoint::~Endpoint(){ Endpoint::~Endpoint(){
// free(friendlyName); log_debugcpp("cum");
// properties->Release(); free(friendlyName);
// endpointVolume->Release(); properties->Release();
// endpoint->Release(); endpointVolume->Release();
//} endpoint->Release();
}
void Overseer::initCOMLibrary(){ void Overseer::initCOMLibrary(){
@ -90,12 +91,13 @@ std::vector<Endpoint*> Overseer::getPlaybackEndpoints() {
return playbackDevices; return playbackDevices;
} }
//Overseer::~Overseer(){ Overseer::~Overseer(){
// deviceEnumerator->Release(); log_debugcpp("cum");
// for(unsigned long long i = 0; i < playbackDevices.size(); i++){ deviceEnumerator->Release();
//delete(playbackDevices.at(i)); for(unsigned long long i = 0; i < playbackDevices.size(); i++){
//} delete(playbackDevices.at(i));
//} }
}
//int Overseer::getCaptureEndpoints(std::vector<Endpoint*> *captureEndpoints); //int Overseer::getCaptureEndpoints(std::vector<Endpoint*> *captureEndpoints);

4
src/back/backlasses.h
View file

@ -25,7 +25,7 @@ class Endpoint {
void setVolume(float volume); void setVolume(float volume);
float getVolume(); float getVolume();
LPWSTR getName(); LPWSTR getName();
//~Endpoint(); ~Endpoint();
private: private:
IMMDevice* endpoint; IMMDevice* endpoint;
@ -46,7 +46,7 @@ class Overseer {
//int getDefaultCaptureEndpoint(Endpoint** defaultEndpoint); //int getDefaultCaptureEndpoint(Endpoint** defaultEndpoint);
//int getCaptureEndpoints(std::vector<Endpoint*> *captureEndpoints); //int getCaptureEndpoints(std::vector<Endpoint*> *captureEndpoints);
//IMMDeviceEnumerator** setOrigin(); //IMMDeviceEnumerator** setOrigin();
//~Overseer(); ~Overseer();
private: private:
unsigned int numPlaybackEndpoints; unsigned int numPlaybackEndpoints;

4
src/cont/contclasses.cpp
View file

@ -19,8 +19,8 @@ float EndpointHandler::getVolume(){
return ept->getVolume(); return ept->getVolume();
} }
Overseer OverseerHandler::getOverseer(){ Overseer* OverseerHandler::getOverseer(){
return os; return &os;
} }
OverseerHandler::OverseerHandler(QObject *parent) : QObject(parent) { OverseerHandler::OverseerHandler(QObject *parent) : QObject(parent) {

2
src/cont/contclasses.h
View file

@ -34,7 +34,7 @@ public:
OverseerHandler(QObject *parent = nullptr); OverseerHandler(QObject *parent = nullptr);
void setEndpointHandlers(std::vector<EndpointHandler*> *ephs); void setEndpointHandlers(std::vector<EndpointHandler*> *ephs);
std::vector<EndpointHandler*>* getEndpointHandlers(); std::vector<EndpointHandler*>* getEndpointHandlers();
static Overseer getOverseer(); static Overseer* getOverseer();
private: private:
static Overseer os; static Overseer os;

2
src/qtestmain.cpp
View file

@ -24,7 +24,7 @@ QApplication* createApplication(int &argc, char *argv[])
int main (int argc, char* argv[]) { int main (int argc, char* argv[]) {
//QApplication::setStyle("windowsvista"); //QApplication::setStyle("windowsvista");
//INIT CONT //INIT CONT
std::vector<Endpoint*> epts = OverseerHandler::getOverseer().getPlaybackEndpoints(); std::vector<Endpoint*> epts = OverseerHandler::getOverseer()->getPlaybackEndpoints();
std::vector<EndpointHandler*>* ephs = new std::vector<EndpointHandler*>; std::vector<EndpointHandler*>* ephs = new std::vector<EndpointHandler*>;
for(unsigned int i = 0; i < epts.size(); i++){ for(unsigned int i = 0; i < epts.size(); i++){
EndpointHandler *eph = new EndpointHandler(epts.at(i)); EndpointHandler *eph = new EndpointHandler(epts.at(i));