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

Compare commits

base: Hane:01d2611d65089430aa7ae9ba5a0cda99af94b7b9
Branches Tags
Hane:master
Hane:pre-cruft-removal
Hane:poll
Hane:i
Hane:publictest
Hane:davidvertical
Hane:windowsizemultimonito
Hane:windowsizesessionorder
..
compare: Hane:bea0a2af94650ad99ba37e94c2aefd6c8cae7d61
Branches Tags
Hane:master
Hane:pre-cruft-removal
Hane:poll
Hane:i
Hane:publictest
Hane:davidvertical
Hane:windowsizemultimonito
Hane:windowsizesessionorder

No commits in common. "01d2611d65089430aa7ae9ba5a0cda99af94b7b9" and "bea0a2af94650ad99ba37e94c2aefd6c8cae7d61" have entirely different histories.
01d2611d65 ... bea0a2af94

5 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
qtest.pro
View file

@ -1,6 +1,6 @@
QMAKE_CXXFLAGS += --target=x86_64-w64-mingw32 -g -gcodeview QMAKE_CXXFLAGS += --target=x86_64-w64-mingw32
#QMAKE_LINK += clang++ QMAKE_LINKER += clang++
QMAKE_LFLAGS += --target=x86_64-w64-mingw32 -g -gcodeview -Wl,-pdb= -v QMAKE_LFLAGS += -v
DEFINES += DEBUG DEFINES += DEBUG
CONFIG += debug console CONFIG += debug console
QT += widgets QT += widgets

4
src/back/backlasses.cpp
View file

@ -55,7 +55,7 @@ HRESULT EndpointCallback::OnNotify(PAUDIO_VOLUME_NOTIFICATION_DATA pNotify) {
} else { } else {
log_debugcpp("Onnanokotify says Stored: " << guid->data1); log_debugcpp("Onnanokotify says Stored: " << guid->data1);
log_debugcpp("Onnanokotify says Grace of God: " << eventData.guidEventContext.Data1); log_debugcpp("Onnanokotify says Grace of God: " << eventData.guidEventContext.Data1);
osh->toggleFrontEvents(this->ep->getIndex(), true); osh->toggleFrontEvents(this->ep->getIndex(), false);
osh->updateMuteCallback(this->ep->getIndex(), eventData.bMuted); osh->updateMuteCallback(this->ep->getIndex(), eventData.bMuted);
osh->updateMainVolumeCallback(this->ep->getIndex(), eventData.fMasterVolume); osh->updateMainVolumeCallback(this->ep->getIndex(), eventData.fMasterVolume);
log_debugcpp("Onnanokotify says Reported Channel Qty: " << eventData.nChannels); log_debugcpp("Onnanokotify says Reported Channel Qty: " << eventData.nChannels);
@ -66,7 +66,7 @@ HRESULT EndpointCallback::OnNotify(PAUDIO_VOLUME_NOTIFICATION_DATA pNotify) {
} }
else else
osh->updateChannelVolumeCallback(this->ep->getIndex(), (uint32_t)0, pNotify->afChannelVolumes[0]); osh->updateChannelVolumeCallback(this->ep->getIndex(), (uint32_t)0, pNotify->afChannelVolumes[0]);
osh->toggleFrontEvents(this->ep->getIndex(), false); osh->toggleFrontEvents(this->ep->getIndex(), true);
} }
return S_OK; return S_OK;

2
src/cont/contclasses.cpp
View file

@ -127,7 +127,7 @@ void OverseerHandler::updateMainVolumeCallback(uint64_t idx, float newVal){
void OverseerHandler::updateChannelVolumeCallback(uint64_t idx, uint32_t channel, float newVal){ void OverseerHandler::updateChannelVolumeCallback(uint64_t idx, uint32_t channel, float newVal){
//int translatedNewVal = newVal * 100; //int translatedNewVal = newVal * 100;
log_debugcpp("chanel: " << channel << " volcallback float: " << newVal); log_debugcpp("chanel: " << channel << " volcallback float: " << newVal);
epwChannelVolumeFunc f = &EndpointWidget::updateChannelVolume; epwChannelVolumeFunc f = &EndpointWidget::updateChannelVolume;
std::invoke(f, endpointWidgets.at(idx), channel, newVal); std::invoke(f, endpointWidgets.at(idx), channel, newVal);

2
src/qt/qtclasses.cpp
View file

@ -75,7 +75,7 @@ void EndpointWidget::updateMute(bool muted){
log_debugcpp("cliqui callboqui cloqui"); log_debugcpp("cliqui callboqui cloqui");
//TODO: Here to diagnose slider visuals locking when playing DJ with external volume bar. Functionality is restored when mute checkbox is clicked. //TODO: Here to diagnose slider visuals locking when playing DJ with external volume bar. Functionality is restored when mute checkbox is clicked.
//this->muteButton->blockSignals(true); //this->muteButton->blockSignals(true);
//this->eph->setMute(osh->getGuid(), muted); this->eph->setMute(osh->getGuid(), muted);
this->muteButton->setChecked(eph->getMute() ? true : false); this->muteButton->setChecked(eph->getMute() ? true : false);
this->muteButton->setText(this->eph->getMute() ? STRING_UNMUTE : STRING_MUTE); this->muteButton->setText(this->eph->getMute() ? STRING_UNMUTE : STRING_MUTE);
//this->muteButton->blockSignals(false); //this->muteButton->blockSignals(false);

1
src/qt/qtclasses.h
View file

@ -96,6 +96,7 @@ typedef void (EndpointWidget::*epwMainVolumeFunc)(float newValue);
typedef void (EndpointWidget::*epwChannelVolumeFunc)(uint32_t channel, float newValue); typedef void (EndpointWidget::*epwChannelVolumeFunc)(uint32_t channel, float newValue);
typedef void (EndpointWidget::*epwToggleFrontFunc)(bool active); typedef void (EndpointWidget::*epwToggleFrontFunc)(bool active);
class MainWindow : public QMainWindow { class MainWindow : public QMainWindow {
Q_OBJECT Q_OBJECT
//QWidget *centralWidget; //QWidget *centralWidget;