diff --git a/qtest.pro b/qtest.pro index bf1ff63..35ebcaa 100644 --- a/qtest.pro +++ b/qtest.pro @@ -1,8 +1,7 @@ -CONFIG += debug console QT += widgets -INCLUDEPATH += "$$PWD\src" "$$PWD\src\qt" "$$PWD\src\back" "$$PWD\src\cont" -DESTPATH += "$$PWD\src" "$$PWD\src\qt" "$$PWD\src\back" "$$PWD\src\cont" -VPATH += "$$PWD\src" "$$PWD\src\qt" "$$PWD\src\back" "$$PWD\src\cont" -SOURCES += qtestmain.cpp qtclasses.cpp backlasses.cpp contclasses.cpp -HEADERS += qtclasses.h backlasses.h contclasses.h +INCLUDEPATH += "$$PWD\src" "$$PWD\src\qt" "$$PWD\src\back" +DESTPATH += "$$PWD\src" "$$PWD\src\qt" "$$PWD\src\back" +VPATH += "$$PWD\src" "$$PWD\src\qt" "$$PWD\src\back" +SOURCES += qtestmain.cpp mainwindow.cpp +HEADERS += mainwindow.h #DESTDIR += "build" diff --git a/src/back/backlasses.cpp b/src/back/backlasses.cpp deleted file mode 100644 index c64fa51..0000000 --- a/src/back/backlasses.cpp +++ /dev/null @@ -1,73 +0,0 @@ -#include - -Endpoint::Endpoint(IMMDevice* ep){ - this->endpoint = ep; - if(FAILED(endpoint->Activate(IID_IAudioEndpointVolume, CLSCTX_ALL, NULL, (void**)&endpointVolume))) { log_debugcpp("si"); }; -} - -void Endpoint::setVolume(float volume) { - if(FAILED(endpointVolume->SetMasterVolumeLevelScalar(volume, NULL))) { log_debugcpp("si"); }; -} - - -void Overseer::initCOMLibrary(){ - if(FAILED(CoInitializeEx(NULL, COINIT_APARTMENTTHREADED))) { log_debugcpp("si"); }; - - - //Retrieving endpoint enumerator - //MMDeviceEnumerator es el CLSID de toda la vaina de MMDevicear - if(FAILED(CoCreateInstance( __uuidof(MMDeviceEnumerator), NULL, - CLSCTX_ALL, __uuidof(IMMDeviceEnumerator), - (void**)&deviceEnumerator)) ) - { log_debugcpp("si"); }; - -} - -void Overseer::reloadEndpoints() { - IMMDeviceCollection *deviceCollection; - // | DEVICE_STATE_DISABLED | DEVICE_STATE_NOTPRESENT | DEVICE_STATE_UNPLUGGED - if(FAILED(deviceEnumerator->EnumAudioEndpoints(eRender, DEVICE_STATE_ACTIVE, &deviceCollection) )) - { log_debugcpp("si"); }; - - - //Counting them - if(FAILED(deviceCollection->GetCount(&numPlaybackEndpoints))) { log_debugcpp("si");}; - if(numPlaybackEndpoints == 0) { log_debugcpp("si"); }; - - - //Retrieving actual endpoints and storing them on their own class - for (unsigned int i = 0; i < numPlaybackEndpoints; i++){ - IMMDevice *temp; - if(deviceCollection->Item(i, &temp) != 0) { log_debugcpp("si"); }; - Endpoint *endpoint = new Endpoint(temp); - this->playbackDevices.push_back(endpoint); - //TODO: le porblemx std::cout << "ola" << std::endl; - } - - deviceCollection->Release(); -} - -Overseer::Overseer(){ - //Initializing COM library - initCOMLibrary(); - - //Obtaining playback endpoint collection on this point in time - reloadEndpoints(); -} - -//Overseer::int getDefaultPlaybackEndpoint(Endpoint** defaultEndpoint){ -//if (FAILED(deviceEnumerator->GetDefaultAudioEndpoint(eRender, eConsole, &endpointPtr))) -// return 1; -//return 0; -//} - -//int Overseer::getDefaultCaptureEndpoint(Endpoint** defaultEndpoint); - -std::vector Overseer::getPlaybackEndpoints() { - return playbackDevices; -} - -//int Overseer::getCaptureEndpoints(std::vector *captureEndpoints); - -//IMMDeviceEnumerator** Overseer::setOrigin(); - diff --git a/src/back/backlasses.h b/src/back/backlasses.h deleted file mode 100644 index 19a1539..0000000 --- a/src/back/backlasses.h +++ /dev/null @@ -1,56 +0,0 @@ -#pragma once -#define WIN32_LEAN_AND_MEAN -#define log_debugcpp(str) do { \ - std::cout << "[DEBUG]" << "(" << __FILE__ << ":" << __LINE__ << "): " << str << std::endl; \ - } while (0) - -#include -#include - -#include -#include -#include -#include -#include - -#include -#include -#include -//#include -//#include -#include - -class Endpoint { - - public: - Endpoint(IMMDevice* endpoint); - void setVolume(float volume); - - private: - IMMDevice* endpoint; - IAudioEndpointVolume *endpointVolume; - -}; - -class Overseer { - //TODO singleton? - public: - Overseer(); - std::vector getPlaybackEndpoints(); - void reloadEndpoints(); - //~Overseer(); - //int getDefaultPlaybackEndpoint(Endpoint** defaultEndpoint); - //int getDefaultCaptureEndpoint(Endpoint** defaultEndpoint); - //int getCaptureEndpoints(std::vector *captureEndpoints); - //IMMDeviceEnumerator** setOrigin(); - - private: - unsigned int numPlaybackEndpoints; - IMMDeviceEnumerator *deviceEnumerator; - std::vector playbackDevices; - void initCOMLibrary(); - //IMMDeviceCollection *deviceCollection; - //int numCaptureEndpoints; - //std::vector *captureDevices; -}; - diff --git a/src/cont/contclasses.cpp b/src/cont/contclasses.cpp deleted file mode 100644 index 9d92d42..0000000 --- a/src/cont/contclasses.cpp +++ /dev/null @@ -1,27 +0,0 @@ -#include "contclasses.h" - -Overseer OverseerHandler::os; - -EndpointHandler::EndpointHandler(Endpoint *ept, QObject *parent) : QObject(parent) { - this->ept = ept; -} - -void EndpointHandler::setValue(int value){ - ept->setVolume((float)value / 100); -} - -Overseer OverseerHandler::getOverseer(){ - return os; -} - -OverseerHandler::OverseerHandler(QObject *parent) : QObject(parent) { - -} - -std::vector* OverseerHandler::getEndpointHandlers(){ - return endpointHandlers; -} - -void OverseerHandler::setEndpointHandlers(std::vector *ephs){ - this->endpointHandlers = ephs; -} diff --git a/src/cont/contclasses.h b/src/cont/contclasses.h deleted file mode 100644 index 44f184a..0000000 --- a/src/cont/contclasses.h +++ /dev/null @@ -1,46 +0,0 @@ -#pragma once -#include -#include "backlasses.h" - - -class EndpointHandler : public QObject { - Q_OBJECT - -public: - EndpointHandler(Endpoint *ept, QObject *parent = nullptr); - - -private: - Endpoint *ept; - //QSlider *slidy; - -public slots: - void setValue(int value); - - -//signals: - - -}; - - -class OverseerHandler : public QObject { - Q_OBJECT - -public: - OverseerHandler(QObject *parent = nullptr); - void setEndpointHandlers(std::vector *ephs); - std::vector* getEndpointHandlers(); - static Overseer getOverseer(); - -private: - static Overseer os; - std::vector *endpointHandlers; - //QSlider *slidy; - - //public slots: - //void setValue(int value); - - - -}; diff --git a/src/qt/mainwindow.cpp b/src/qt/mainwindow.cpp new file mode 100644 index 0000000..e406fae --- /dev/null +++ b/src/qt/mainwindow.cpp @@ -0,0 +1,24 @@ +#include "mainwindow.h" + +MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) { + // setWindowState(Qt::WindowFullScreen); + // setCentralWidget(centralWidget); +} + +/* + * void MainWindow::setPlotButton() { + * button = new QPushButton("push"), + * button->setCheckable(true); + * connect(button, SIGNAL(toggled(bool)), this, SLOT(toggled(bool))) + * QHBoxLayout *plotsLayout = new QHBoxLayout; + * plotsLayout->setSpacing(10); + * plotsLayout->addWidget(funPlot); + * QHBoxLayout *buttonsLayout = new QHBoxLayout ; + * buttonsLayout->addWidget(button); + * QVBoxLayout *widgetLayout = new QVBoxLayout; + * widgetLayout->addLayout(plotsLayout); + * widgetLayout->addLayout(buttonsLayout); + * setLayout(widgetLayout); + * ... + */ + diff --git a/src/qt/mainwindow.h b/src/qt/mainwindow.h new file mode 100644 index 0000000..b3ab242 --- /dev/null +++ b/src/qt/mainwindow.h @@ -0,0 +1,16 @@ +#ifndef MAINWINDOW_H +#define MAINWINDOW_H + +#include +#include + +class MainWindow : public QMainWindow { + Q_OBJECT + //QWidget *centralWidget; + + public: + MainWindow(QWidget *parent = nullptr); + + }; + +#endif diff --git a/src/qt/qtclasses.cpp b/src/qt/qtclasses.cpp deleted file mode 100644 index 9a6df6f..0000000 --- a/src/qt/qtclasses.cpp +++ /dev/null @@ -1,48 +0,0 @@ -#include "qtclasses.h" - -MainWindow::MainWindow(std::vector *ephs, QWidget *parent) : QMainWindow(parent) { - // setWindowState(Qt::WindowFullScreen); - // setCentralWidget(centralWidget); - widget = new QWidget(); - layout = new QGridLayout(); - pintas = new QLabel(tr("Defaulto da")); - - widget->setLayout(layout); - setCentralWidget(widget); - layout->addWidget(pintas, 0, 0); - - setWindowTitle("slidea resbala nu c"); - - setEndpointHandlers(ephs); - for (unsigned int i = 0; i < this->ephs->size(); i++){ - QSlider *teSlider = new QSlider(Qt::Horizontal); - teSlider->setFocusPolicy(Qt::StrongFocus); - teSlider->setTickPosition(QSlider::TicksBothSides); - teSlider->setTickInterval(5); - teSlider->setSingleStep(1); - layout->addWidget(teSlider, 0, i + 1); - connect(teSlider, &QSlider::valueChanged, ephs->at(i), &EndpointHandler::setValue); - } -} - -void MainWindow::setEndpointHandlers(std::vector *ephs){ - this->ephs = ephs; -} - -/* - * void MainWindow::setPlotButton() { - * button = new QPushButton("push"), - * button->setCheckable(true); - * connect(button, SIGNAL(toggled(bool)), this, SLOT(toggled(bool))) - * QHBoxLayout *plotsLayout = new QHBoxLayout; - * plotsLayout->setSpacing(10); - * plotsLayout->addWidget(funPlot); - * QHBoxLayout *buttonsLayout = new QHBoxLayout ; - * buttonsLayout->addWidget(button); - * QVBoxLayout *widgetLayout = new QVBoxLayout; - * widgetLayout->addLayout(plotsLayout); - * widgetLayout->addLayout(buttonsLayout); - * setLayout(widgetLayout); - * ... - */ - diff --git a/src/qt/qtclasses.h b/src/qt/qtclasses.h deleted file mode 100644 index edca5b8..0000000 --- a/src/qt/qtclasses.h +++ /dev/null @@ -1,38 +0,0 @@ -#pragma once -#ifndef MAINWINDOW_H -#define MAINWINDOW_H - -#include -#include -#include -#include -#include -#include -#include "contclasses.h" -//#include -//#include - - -class MainWindow : public QMainWindow { - Q_OBJECT - //QWidget *centralWidget; - -public: - MainWindow(std::vector *ephs, QWidget *parent = nullptr); - -private: - std::vector *ephs; - std::vector *sliders; - QWidget *widget; - QGridLayout *layout; - QLabel *pintas; - - //public slots: - // void setEndpointHandlers(std::vector *ephs); - - //signals: - //void valueChanged(int value); - -}; - -#endif diff --git a/src/qtestmain.cpp b/src/qtestmain.cpp index 98372e8..c200413 100644 --- a/src/qtestmain.cpp +++ b/src/qtestmain.cpp @@ -1,20 +1,15 @@ #include #include -//#include -//#include +#include +#include //#include #include #include -#include "qtclasses.h" -//TODO david #include "backlasses.h" +#include "mainwindow.h" - -//INIT BACK -OverseerHandler *osh = new OverseerHandler(); - QApplication* createApplication(int &argc, char *argv[]) { return new QApplication(argc, argv); @@ -22,21 +17,9 @@ QApplication* createApplication(int &argc, char *argv[]) int main (int argc, char* argv[]) { - //QApplication::setStyle("windowsvista"); - //INIT CONT - std::vector epts = OverseerHandler::getOverseer().getPlaybackEndpoints(); - std::vector* ephs = new std::vector; - for(unsigned int i = 0; i < epts.size(); i++){ - EndpointHandler *eph = new EndpointHandler(epts.at(i)); - ephs->push_back(eph); - } - - osh->setEndpointHandlers(ephs); - //INIT FRONT - QScopedPointer app(createApplication(argc, argv)); - MainWindow window = MainWindow(ephs); - window.setEndpointHandlers(ephs); - app->setStyle("windowsvista"); + QApplication::setStyle("windowsvista"); + QScopedPointer app(createApplication(argc, argv)); + MainWindow window = MainWindow(); window.show(); return app->exec(); }