diff --git a/.gitignore b/.gitignore
index a4ce7f0..fde2162 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,6 @@
build
*.rdbg
*.pdb
-*.ps1
-*.exe
Makefile
Makefile.Debug
Makefile.Release
\ No newline at end of file
diff --git a/README.md b/README.md
deleted file mode 100644
index cf1a785..0000000
--- a/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Mixer
-
-## Build
-
-* Toolchain: [llvm-mingw UCRT 20220906](https://github.com/mstorsjo/llvm-mingw/releases/tag/20220906).
-
-* Clone [this](https://code.qt.io/cgit/qt/qt5.git/tag/?h=v6.3.2) Qt branch
-
-* Build Qt from sources following [this](https://wiki.qt.io/Building_Qt_6_from_Git) guide and executing `configure.bat` as such:
-
-```
-..\qt6\configure.bat -prefix ..\install -static -debug -opensource -confirm-license -qt-zlib -qt-libpng -qt-webp -qt-libjpeg -qt-freetype -skip qt3d -skip qtactiveqt -skip qtandroidextras -skip qtcharts -skip qtconnectivity -skip qtdatavis3d -skip qtdoc -skip qtgamepad -skip qtlocation -skip qtlottie -skip qtmacextras -skip qtmultimedia -skip qtnetworkauth -skip qtpurchasing -skip qtquick3d -skip qtquick3dphysics -skip qtquicktimeline -skip qtremoteobjects -skip qtscript -skip qtsensors -skip qtwayland -skip qtwebglplugin -skip qtwebview -skip webengine -nomake examples -nomake tests
-```
-
-* Clone this repo and execute `bueno.bat`.
\ No newline at end of file
diff --git a/assets.qrc b/assets.qrc
index 2206a8a..8b63932 100644
--- a/assets.qrc
+++ b/assets.qrc
@@ -1,10 +1,5 @@
- assets/selawk.ttf
- assets/notificationAreaIcon.png
- assets/style.qss
- assets/logo.ico
- assets/mute.svg
- assets/unmute.svg
+ assets/notificationAreaIcon.png
diff --git a/assets/SoundVolumeView.exe b/assets/SoundVolumeView.exe
new file mode 100644
index 0000000..4c7a7d2
Binary files /dev/null and b/assets/SoundVolumeView.exe differ
diff --git a/assets/installer.ico b/assets/installer.ico
deleted file mode 100644
index b4e6f82..0000000
Binary files a/assets/installer.ico and /dev/null differ
diff --git a/assets/installer.xcf b/assets/installer.xcf
deleted file mode 100644
index 96669f1..0000000
Binary files a/assets/installer.xcf and /dev/null differ
diff --git a/assets/logo.ico b/assets/logo.ico
deleted file mode 100644
index daac4a4..0000000
Binary files a/assets/logo.ico and /dev/null differ
diff --git a/assets/logo.png b/assets/logo.png
deleted file mode 100644
index 259e37b..0000000
Binary files a/assets/logo.png and /dev/null differ
diff --git a/assets/logo.xcf b/assets/logo.xcf
deleted file mode 100644
index 69cafac..0000000
Binary files a/assets/logo.xcf and /dev/null differ
diff --git a/assets/selawk.ttf b/assets/selawk.ttf
deleted file mode 100644
index 736bac3..0000000
Binary files a/assets/selawk.ttf and /dev/null differ
diff --git a/assets/style.qss b/assets/style.qss
deleted file mode 100644
index 4f6466c..0000000
--- a/assets/style.qss
+++ /dev/null
@@ -1,6 +0,0 @@
-QMainWindow { background: rgba(100,100,100,100); }
-
-
-
-
-QCheckBox:hover, QCheckBox:checked { color: white }
\ No newline at end of file
diff --git a/assets/uninstaller.ico b/assets/uninstaller.ico
deleted file mode 100644
index 24278c2..0000000
Binary files a/assets/uninstaller.ico and /dev/null differ
diff --git a/bueno.bat b/bueno.bat
index 540be60..2c8ac1c 100644
--- a/bueno.bat
+++ b/bueno.bat
@@ -1,7 +1,4 @@
-taskkill /F /IM "MixerQ.exe"
-taskkill /F /IM "MixerQd.exe"
-qmake -o build\Makefile .\qtest.pro
-REM mingw32-make.exe -C .\build -f Makefile.Release
-mingw32-make.exe -C .\build -f Makefile.Debug
-REM makensis /DBUILDTYPE=release install\installer.nsi
-REM makensis /DBUILDTYPE=debug install\installer.nsi
+qmake -o build\Makefile .\qtest.pro
+copy /Y /B .\assets\SoundVolumeView.exe .\build\debug
+copy /Y /B .\assets\SoundVolumeView.exe .\build\release
+mingw32-make.exe -C .\build -f Makefile
diff --git a/install/installer.nsi b/install/installer.nsi
deleted file mode 100644
index 7e62045..0000000
--- a/install/installer.nsi
+++ /dev/null
@@ -1,265 +0,0 @@
-;Auto versioning-------------------------------
-
- !makensis "/DBUILDTYPE=${BUILDTYPE} version.nsi"
- !system "GetVersion.exe"
- !include "Version.txt"
- ;optional cleanup
- !delfile "GetVersion.exe"
- !delfile "Version.txt"
-
-;Includes--------------------------------
-
- !include "MUI2.nsh"
- !include "nsDialogs.nsh"
- !include "LogicLib.nsh"
- !include "${NSISDIR}\Contrib\Language files\English.nsh"
- !include "${NSISDIR}\Contrib\Language files\Spanish.nsh"
- ;!include "${NSISDIR}\Contrib\Language files\English.nsh"
-
-
-;Defines----------------------------------
- !define MUI_LANGDLL_ALLLANGUAGES
- !define MUI_UNICON "..\assets\uninstaller.ico"
- !define MUI_ICON "..\assets\installer.ico"
-
-
-;--------------------------------
-;General
-
- ;Name and file
- !if ${BUILDTYPE} == "release"
- Name "MixerQ"
- !else
- Name "MixerQd"
- !endif
- OutFile "..\build\bin\MixerQ-installer-${version}.exe"
-
- ;Get installation folder from registry if available
- ;InstallDirRegKey HKCU "Software\Modern UI Test" ""
-
- Unicode True
- Var Is_Admin
- Var Install_Type
-
- ;Request application privileges for UAC. If admin is not available, only user-level install will be available
- RequestExecutionLevel highest
-;--------------------------------
-;Interface Settings
-
- !define MUI_ABORTWARNING
-
-;--------------------------------
-;Pages
- !insertmacro MUI_PAGE_WELCOME
- !insertmacro MUI_PAGE_LICENSE "..\LICENSE.txt"
- ;!insertmacro MULTIUSER_PAGE_INSTALLMODE
- Page Custom InstallTargetPage
- ;!insertmacro MUI_PAGE_COMPONENTS
- !define MUI_PAGE_CUSTOMFUNCTION_PRE Skip_Directory_Func
- !insertmacro MUI_PAGE_DIRECTORY
- !insertmacro MUI_PAGE_INSTFILES
- !insertmacro MUI_PAGE_FINISH
-
- !insertmacro MUI_UNPAGE_WELCOME
- !insertmacro MUI_UNPAGE_CONFIRM
- !insertmacro MUI_UNPAGE_INSTFILES
- !insertmacro MUI_UNPAGE_FINISH
-
-;--------------------------------
-;Languages
-
- !insertmacro MUI_LANGUAGE "English"
- !insertmacro MUI_LANGUAGE "Spanish"
- !insertmacro MUI_LANGUAGE "SpanishInternational"
-
- ;English----------------------------
- LangString Header_Title ${LANG_ENGLISH} "Configure Install"
- LangString Header_Subtitle ${LANG_ENGLISH} "Customize install settings"
- LangString Option_Scope ${LANG_ENGLISH} "Select for whom will $(^Name) be installed: "
- LangString Scope_Machine ${LANG_ENGLISH} "All users"
- LangString Scope_User ${LANG_ENGLISH} "Current user"
-
- ;Spanish/SpanishInternational----------------------------
- LangString Header_Title ${LANG_SPANISH} "Configurar instalación"
- LangString Header_Subtitle ${LANG_SPANISH} "Elija los ajustes de la instalación"
- LangString Option_Scope ${LANG_SPANISH} "$(^Name) será instalado para: "
- LangString Scope_Machine ${LANG_SPANISH} "Todos los usuarios"
- LangString Scope_User ${LANG_SPANISH} "Usuario actual"
-
- LangString Header_Title ${LANG_SPANISHINTERNATIONAL} "Configurar instalación"
- LangString Header_Subtitle ${LANG_SPANISHINTERNATIONAL} "Elija los ajustes de la instalación"
- LangString Option_Scope ${LANG_SPANISHINTERNATIONAL} "$(^Name) será instalado para: "
- LangString Scope_Machine ${LANG_SPANISHINTERNATIONAL} "Todos los usuarios"
- LangString Scope_User ${LANG_SPANISHINTERNATIONAL} "Usuario actual"
-
-;Functions------------------------------
- Function Skip_Directory_Func
- ;StrCmp $Install_Type "user" dontSkip
- Abort # skip the page
- ;dontSkip:
- FunctionEnd
-
- !macro ONINIT un
- Function ${un}.onInit
- ; The value of SetShellVarContext detetmines whether SHCTX is HKLM or HKCU
- ; and whether SMPROGRAMS refers to all users or just the current
- !insertmacro MUI_LANGDLL_DISPLAY
- UserInfo::GetAccountType
- Pop $0
- ${If} $0 == "Admin"
- ; If we're an admin, default to installing to C:\Program Files
- SetShellVarContext all
- ; StrCpy $INSTDIR "$PROGRAMFILES64\$(^Name)"
- StrCpy $Is_Admin "true"
- ${Else}
- ; If we're just a user, default to installing to ~\AppData\Local
- SetShellVarContext current
- ; StrCpy $INSTDIR "$LOCALAPPDATA\$(^Name)"
- StrCpy $Is_Admin "false"
- ${EndIf}
-
- ; ${If} $INSTDIR == ""
- ; ; This only happens in the installer, because the uninstaller already knows INSTDIR
- ; ReadRegStr $0 SHCTX "Software\${PRODUCT_NAME}" ""
-
- ; ${If} $0 != ""
- ; ; If we're already installed, use the existing directory
- ; StrCpy $INSTDIR "$0"
- ; ${Else}
- ; StrCpy $INSTDIR "$INSTDIR_BASE\${PRODUCT_NAME}"
- ; ${Endif}
- ; ${Endif}
- FunctionEnd
- !macroend
-
-!insertmacro ONINIT ""
-!insertmacro ONINIT "un"
-
-;NSDialog InstallTarget Page definition---------------------------------
-
-Function InstallTargetPage
- !insertmacro MUI_HEADER_TEXT $(Header_Title) $(Header_Subtitle)
- ;MessageBox MB_OK "Install type $Install_Type"
- ;MessageBox MB_OK "Build type ${BUILDTYPE}"
- nsDialogs::Create 1018
- Pop $0
-
- FindWindow $0 "#32770"
- GetDlgItem $1 $0 1 ;next/install button
- SendMessage $1 ${WM_SETTEXT} 1 "STR:$(^InstallBtn)"
- Pop $0
-
- ${NSD_CreateLabel} 0 0 100% 10% $(Option_Scope)
- Pop $3
-
- ${NSD_CreateFirstRadioButton} 0 12% 40% 6% $(Scope_Machine)
- Pop $1
- ${If} $Is_Admin == "false"
- EnableWindow $1 0
- StrCpy $INSTDIR "$LOCALAPPDATA\$(^Name)"
- ${Else}
- SendMessage $1 ${BM_CLICK} "" "" ;Set default
- StrCpy $INSTDIR "$PROGRAMFILES64\$(^Name)"
- ${EndIf}
- ${NSD_OnClick} $1 All_Users_Click
-
- ${NSD_CreateAdditionalRadioButton} 0 24% 40% 6% $(Scope_User)
- Pop $2
- ${IfThen} $Is_Admin == "false" ${|} SendMessage $2 ${BM_CLICK} "" "" ${|}
- ${NSD_OnClick} $2 Current_User_Click
-
- nsDialogs::Show
-FunctionEnd
-
-Function All_Users_Click
- Pop $0
- SetShellVarContext all
- StrCpy $INSTDIR "$PROGRAMFILES64\$(^Name)"
- StrCpy $Install_Type "machine"
- ;${NSD_SetText} $0 "machine"
- ;FindWindow $0 "#32770"
- ;GetDlgItem $1 $0 1 ;next/install button
- ;SendMessage $1 ${WM_SETTEXT} 1 "STR:$(^InstallBtn)"
-FunctionEnd
-
-Function Current_User_Click
- Pop $0
- SetShellVarContext current
- StrCpy $INSTDIR "$LOCALAPPDATA\$(^Name)"
- StrCpy $Install_Type "user"
- ;${NSD_SetText} $0 "user"
- ;FindWindow $0 "#32770"
- ;GetDlgItem $1 $0 1 ;next/install button
- ;SendMessage $1 ${WM_SETTEXT} 1 "STR:$(^NextBtn)"
-FunctionEnd
-
-;Default section----------------------
-Section
- SetRegView 64
- SetOutPath $INSTDIR
-
- !if ${BUILDTYPE} == "release"
- File "..\build\bin\MixerQ.exe"
- !else
- File "..\build\bin\MixerQd.exe"
- !endif
- File "..\LICENSE.txt"
-
- ;Start menu shortcut
- createDirectory "$SMPROGRAMS\$(^Name)"
- createShortCut "$SMPROGRAMS\$(^Name)\$(^Name).lnk" "$INSTDIR\$(^Name).exe"
- createShortCut "$SMPROGRAMS\$(^Name)\Uninstall$(^Name).lnk" "$INSTDIR\Uninstall$(^Name).exe"
-
- ;Store installation folder
- WriteRegStr SHCTX "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" "DisplayName" "$(^Name)"
- WriteRegStr SHCTX "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" "UninstallString" '"$INSTDIR\Uninstall$(^Name).exe"'
- WriteRegDWORD SHCTX "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" "NoModify" 1
- WriteRegDWORD SHCTX "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" "NoRepair" 1
- WriteRegStr SHCTX "SOFTWARE\Microsoft\Windows\CurrentVersion\Run" "$(^Name)" "$INSTDIR\$(^Name)"
-
- ;Create uninstaller
- WriteUninstaller "$INSTDIR\Uninstall$(^Name).exe"
-
-SectionEnd
-
-
-;--------------------------------
-;Descriptions
-
- ; ;Language strings
- ; LangString DESC_SecDummy ${LANG_ENGLISH} "A test section."
-
- ; ;Assign language strings to sections
- ; !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
- ; !insertmacro MUI_DESCRIPTION_TEXT ${SecDummy} $(DESC_SecDummy)
- ; !insertmacro MUI_FUNCTION_DESCRIPTION_END
-
-;--------------------------------
-;Uninstaller Section
-
-Section "Uninstall"
- SetRegView 64
-
- SetShellVarContext current
- DeleteRegValue HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Run" "$(^Name)"
- DeleteRegKey HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)"
- Delete "$SMPROGRAMS\$(^Name)\$(^Name).lnk"
- Delete "$SMPROGRAMS\$(^Name)\Uninstall$(^Name).lnk"
- RMDir "$SMPROGRAMS\$(^Name)"
-
- ${If} $Is_Admin == "true"
- SetShellVarContext all
- DeleteRegValue HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Run" "$(^Name)"
- DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)"
- Delete "$SMPROGRAMS\$(^Name)\$(^Name).lnk"
- Delete "$SMPROGRAMS\$(^Name)\Uninstall$(^Name).lnk"
- RMDir "$SMPROGRAMS\$(^Name)"
- ${EndIf}
-
- Delete "$INSTDIR\$(^Name).exe"
- Delete "$INSTDIR\LICENSE.txt"
- Delete "$INSTDIR\Uninstall$(^Name).exe"
- ;!define PRODUCT_UNINST_ROOT_KEY "HKLM"
- RMDir "$INSTDIR"
-
-SectionEnd
diff --git a/install/version.nsi b/install/version.nsi
deleted file mode 100644
index 5e85c8c..0000000
--- a/install/version.nsi
+++ /dev/null
@@ -1,26 +0,0 @@
-!if ${BUILDTYPE} == "release"
- !define File "..\build\bin\MixerQ.exe"
-!else
- !define File "..\build\bin\MixerQd.exe"
-!endif
-
-OutFile "GetVersion.exe"
-SilentInstall silent
-RequestExecutionLevel user ; don't write $EXEDIR\Version.txt with admin permissions and prevent invoking UAC
-
-Section
-
- ## Get file version
- GetDllVersion "${File}" $R0 $R1
- IntOp $R2 $R0 / 0x00010000
- IntOp $R3 $R0 & 0x0000FFFF
- IntOp $R4 $R1 / 0x00010000
- IntOp $R5 $R1 & 0x0000FFFF
- StrCpy $R1 "$R2.$R3.$R4.$R5"
-
- ## Write it to a !define for use in main script
- FileOpen $R0 "$EXEDIR\Version.txt" w
- FileWrite $R0 '!define version "$R1"'
- FileClose $R0
-
-SectionEnd
\ No newline at end of file
diff --git a/qtest.pro b/qtest.pro
index 42a1165..046d8d8 100644
--- a/qtest.pro
+++ b/qtest.pro
@@ -1,28 +1,16 @@
-TEMPLATE = app
-QMAKE_CXXFLAGS += --target=x86_64-w64-mingw32 -Werror=return-type
-QMAKE_LFLAGS += --target=x86_64-w64-mingw32 -v
-CONFIG(release, debug|release) {
- TARGET = MixerQ
- DESTDIR = bin
- VERSION = 0.9.0.0
- #QMAKE_CXXFLAGS += -O2 < Default. Modifying requires removing.
-} else {
- TARGET = MixerQd
- DESTDIR = bin
- VERSION = 0.9.0.1
- QMAKE_CXXFLAGS += -g -gcodeview -O0
- QMAKE_LFLAGS += -g -Wl,-pdb=
-}
+QMAKE_CXXFLAGS += --target=x86_64-w64-mingw32 -g -gcodeview
+QMAKE_LFLAGS += --target=x86_64-w64-mingw32 -g -Wl,-pdb= -v
+LIBS += -LC:/capybara/libclang/x86_64-w64-mingw32/lib -lWinmm -lodbc32 -lodbccp32 -luuid -loleaut32 -lole32 -lshell32 -ladvapi32 -lcomdlg32 -lwinspool -lgdi32 -luser32 -lkernel32
+#"kernel32.lib" "user32.lib" "gdi32.lib" "winspool.lib" "comdlg32.lib" "advapi32.lib" "shell32.lib" "ole32.lib" "oleaut32.lib" "uuid.lib" "odbc32.lib" "odbccp32.lib" -luuid -loleaut32 -lole32 -lshell32 -ladvapi32 -lcomdlg32 -lwinspool -lgdi32 -luser32 -lkernel32
+DEFINES += DEBUG QT_LOGGING_TO_CONSOLE=1 WIN32_LEAN_AND_MEAN
+CONFIG += debug
-LIBS += -lWinmm -lodbc32 -lodbccp32 -luuid -loleaut32 -lole32 -lshell32 -ladvapi32 -lcomdlg32 -lwinspool -lgdi32 -luser32 -lkernel32 -lpropsys -static -stdlib=libc++ -lunwind
-DEFINES += QT_LOGGING_TO_CONSOLE=1 WIN32_LEAN_AND_MEAN _WIN32_WINNT=0x0602
-DEFINES_DEBUG += DEBUG
+QT += widgets network
+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 backsessionclasses.cpp contclasses.cpp contsessionclasses.cpp
+HEADERS += qtclasses.h backlasses.h backsessionclasses.h contclasses.h contsessionclasses.h global.h debug.h backfuncs.h ipolicyconfig.h msinclude.h
+RESOURCES = assets.qrc
-QT += widgets network svg
-INCLUDEPATH += "$$PWD\src" "$$PWD\src\qt" "$$PWD\src\back" "$$PWD\src\back\reimpl" "$$PWD\src\cont"
-VPATH += "$$PWD\src" "$$PWD\src\qt" "$$PWD\src\back" "$$PWD\src\back\reimpl" "$$PWD\src\cont"
-
-SOURCES += qtestmain.cpp qtclasses.cpp backlasses.cpp backsessionclasses.cpp contclasses.cpp contsessionclasses.cpp settings.cpp
-HEADERS += qtclasses.h backlasses.h backsessionclasses.h contclasses.h contsessionclasses.h global.h debug.h backfuncs.h ipolicyconfig.h msinclude.h meterslider.h qtvisuals.h settings.h
-RESOURCES = assets.qrc
-RC_ICONS += assets/logo.ico
+#DESTDIR += "build"
diff --git a/src/back/backlasses.cpp b/src/back/backlasses.cpp
index 74af6a0..8960c49 100644
--- a/src/back/backlasses.cpp
+++ b/src/back/backlasses.cpp
@@ -1,7 +1,5 @@
-#include "backlasses.h"
-#include "backfuncs.h"
-
-using namespace Environment;
+#include
+#include
EndpointNewSessionCallback::EndpointNewSessionCallback(EndpointHandler* eph){
this->eph = eph;
@@ -41,27 +39,23 @@ HRESULT EndpointNewSessionCallback::QueryInterface(REFIID riid, VOID **ppvInterf
HRESULT EndpointNewSessionCallback::OnSessionCreated(IAudioSessionControl *NewSession) {
if (eph->getFlow() == Flows::FLOW_CAPTURE) return S_OK;
+ HRESULT result = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE);
IAudioSessionControl2* sessionControl;
//ISimmpleAudioVolume* sessionVolume;
if (FAILED(NewSession->QueryInterface(__uuidof(IAudioSessionControl2), (void**)&sessionControl))) { log_wdebugcpp(L"no nueva sesion......"); };
if (sessionControl) {
+ sessionControl->AddRef();
+ //sessionControl->QueryInterface(__uuidof(ISimpleAudioVolume), (void**)&sessionVolume);
Session* newSession = new Session(this->eph->getEndpoint(), sessionControl);
-
- SessionThreadParams tp = { .eph = this->eph, .session = newSession, .isDelete = false };
- wait = true;
- std::thread newSessionThread(&EndpointNewSessionCallback::createSessionThread, this, tp);
- newSessionThread.detach();
- while(wait);
+ eph->addSessionSendFront(newSession);
}
+ if (result == S_OK)
+ CoUninitialize();
+
return S_OK;
}
-void EndpointNewSessionCallback::createSessionThread(SessionThreadParams params) {
- params.eph->addSessionSendFront(params.session);
- this->wait = false;
-}
-
EndpointVolumeCallback::EndpointVolumeCallback(Endpoint* ep){
this->ep = ep;
}
@@ -100,75 +94,59 @@ HRESULT EndpointVolumeCallback::QueryInterface(REFIID riid, VOID **ppvInterface)
HRESULT EndpointVolumeCallback::OnNotify(PAUDIO_VOLUME_NOTIFICATION_DATA pNotify) {
if (pNotify == NULL) return E_INVALIDARG;
- AUDIO_VOLUME_NOTIFICATION_DATA paramCopy;
- memcpy(¶mCopy, pNotify, sizeof(AUDIO_VOLUME_NOTIFICATION_DATA));
- float* channelVolumes = (float*)malloc(pNotify->nChannels * sizeof(float));
- for (int i = 0; i < pNotify->nChannels; i++) {
- channelVolumes[i] = pNotify->afChannelVolumes[i];
- }
- wait = true;
- std::thread updateVolumeThread(&EndpointVolumeCallback::updateVolumeInfo, this, paramCopy, channelVolumes);
- updateVolumeThread.detach();
- while(wait);
- return S_OK;
-}
-
-void EndpointVolumeCallback::updateVolumeInfo(AUDIO_VOLUME_NOTIFICATION_DATA newVolume, float* channelVolumes) {
//delete osh->getPlaybackEndpointHandlers().at(this->ep->getIndex())->getCallbackInfo()->caller;
//osh->getPlaybackEndpointHandlers().at(this->ep->getIndex())->getCallbackInfo()->caller.freeData4();
//Could've made a function or = override to hide this within Nguid, but back in cont = bad.
- osh->handlersPlaybackMutex.lock();
- osh->handlersCaptureMutex.lock();
- osh->lockEndpoints();
osh->getPlaybackEndpointHandlers().at(this->ep->getIndex())->getCallbackInfo()->caller.data1 \
- = newVolume.guidEventContext.Data1;
+ = pNotify->guidEventContext.Data1;
osh->getPlaybackEndpointHandlers().at(this->ep->getIndex())->getCallbackInfo()->caller.data2 \
- = newVolume.guidEventContext.Data2;
+ = pNotify->guidEventContext.Data2;
osh->getPlaybackEndpointHandlers().at(this->ep->getIndex())->getCallbackInfo()->caller.data3 \
- = newVolume.guidEventContext.Data3;
+ = pNotify->guidEventContext.Data3;
for(int i = 0; i < 8 /* Data4 size */; i++){
- osh->getPlaybackEndpointHandlers().at(this->ep->getIndex())->getCallbackInfo()->caller.data4[i] = newVolume.guidEventContext.Data4[i];
+ osh->getPlaybackEndpointHandlers().at(this->ep->getIndex())->getCallbackInfo()->caller.data4[i] = pNotify->guidEventContext.Data4[i];
}
- //memcpy(&osh->getPlaybackEndpointHandlers().at(this->ep->getIndex())->getCallbackInfo()->caller, &newVolume.guidEventContext,sizeof(NGuid) );
- Flows flow = this->ep->getFlow();
- EndpointHandler* eph = nullptr;
- if (flow & Flows::FLOW_PLAYBACK) {
- eph = osh->getPlaybackEndpointHandlers().at(this->ep->getIndex());
- } else {
- eph = osh->getCaptureEndpointHandlers().at(this->ep->getIndex());
- }
+ //memcpy(&osh->getPlaybackEndpointHandlers().at(this->ep->getIndex())->getCallbackInfo()->caller, &pNotify->guidEventContext,sizeof(NGuid) );
+ Flows flow = this->ep->getFlow();
+ EndpointHandler* eph = nullptr;
+ if (flow & Flows::FLOW_PLAYBACK) {
+ eph = osh->getPlaybackEndpointHandlers().at(this->ep->getIndex());
+ } else {
+ eph = osh->getCaptureEndpointHandlers().at(this->ep->getIndex());
+ }
- eph->getCallbackInfo()->muted = newVolume.bMuted;
- eph->getCallbackInfo()->mainVolume = newVolume.fMasterVolume;
- eph->getCallbackInfo()->channels = newVolume.nChannels;
+ eph->getCallbackInfo()->muted = pNotify->bMuted;
+ eph->getCallbackInfo()->mainVolume = pNotify->fMasterVolume;
+ eph->getCallbackInfo()->channels = pNotify->nChannels;
- UINT j = 0;
- //todo: do while here caused stack corruption; sus
- while(j < newVolume.nChannels) {
- if (flow & Flows::FLOW_PLAYBACK)
- eph->getCallbackInfo()->channelVolumes[j] = channelVolumes[j];
- else
- eph->getCallbackInfo()->channelVolumes[j] = channelVolumes[j];
- j++;
- }
- free(channelVolumes);
- osh->unlockEndpoints();
- osh->handlersPlaybackMutex.unlock();
- osh->handlersCaptureMutex.unlock();
- wait = false;
+ UINT j = 0;
+ //todo: do while here caused stack corruption; sus
+ while(j < pNotify->nChannels) {
+ if (flow & Flows::FLOW_PLAYBACK)
+ eph->getCallbackInfo()->channelVolumes[j] = pNotify->afChannelVolumes[j];
+ else
+ eph->getCallbackInfo()->channelVolumes[j] = pNotify->afChannelVolumes[j];
+ j++;
+ }
+ return S_OK;
}
-void EndpointVolumeCallback::reportFinished() {
- this->wait = false;
+/*
+ * EndpointSituationCallback::EndpointSituationCallback(IMMDeviceEnumerator *deviceEnumerator, std::vector playbackDevices){
+ * this->deviceEnumerator = deviceEnumerator;
+ * this->playbackDevices = playbackDevices;
+ * }
+ *
+ */
+//todo: not on construct since it expects them to already exist; smells like refactor!
+void EndpointSituationCallback::fill(IMMDeviceEnumerator *deviceEnumerator, std::vector playbackDevices, std::vector captureDevices){
+ this->deviceEnumerator = deviceEnumerator;
+ this->playbackDevices = playbackDevices;
+ this->captureDevices = captureDevices;
}
-EndpointSituationCallback::EndpointSituationCallback(Overseer* os){
- this->os = os;
-}
-
-
ULONG EndpointSituationCallback::AddRef(){
return InterlockedIncrement(&ref);
}
@@ -202,7 +180,6 @@ HRESULT EndpointSituationCallback::QueryInterface(REFIID riid, VOID **ppvInterfa
HRESULT EndpointSituationCallback::OnDefaultDeviceChanged(EDataFlow flow, ERole role,LPCWSTR pwstrDeviceId) {
if (flow == EDataFlow::eCapture) return E_INVALIDARG;
- if (!pwstrDeviceId) return E_INVALIDARG;
Roles nRole;
switch (role) {
@@ -218,7 +195,8 @@ HRESULT EndpointSituationCallback::OnDefaultDeviceChanged(EDataFlow flow, ERole
}
std::wstring wstringEndpointId = pwstrDeviceId;
log_wdebugcpp(L"we got za defol 4 " + wstringEndpointId);
- osh->roleBucketEntryCallback(nRole, wstringEndpointId);
+ osh->changeFrontDefaultsCallback(nRole, wstringEndpointId);
+
return S_OK;
}
@@ -234,162 +212,131 @@ HRESULT EndpointSituationCallback::OnDeviceRemoved(LPCWSTR pwstrDeviceId) {
HRESULT EndpointSituationCallback::OnDeviceStateChanged(LPCWSTR pwstrDeviceId, DWORD dwNewState) {
std::wstring endpointId = std::wstring(pwstrDeviceId);
- log_wdebugcpp(L"Endpoint state change for " + endpointId);
- EndpointState newState;
- switch (dwNewState) {
+ switch (dwNewState){
case DEVICE_STATE_ACTIVE:
- newState = EndpointState::ENDPOINT_ACTIVE;
+ osh->reviseEndpointShowing(endpointId, EndpointState::ENDPOINT_ACTIVE);
break;
case DEVICE_STATE_DISABLED:
- newState = EndpointState::ENDPOINT_DISABLED;
+ osh->reviseEndpointShowing(endpointId, EndpointState::ENDPOINT_DISABLED);
break;
case DEVICE_STATE_NOTPRESENT:
- newState = EndpointState::ENDPOINT_NOTPRESENT;
+ osh->reviseEndpointShowing(endpointId, EndpointState::ENDPOINT_NOTPRESENT);
break;
case DEVICE_STATE_UNPLUGGED:
- newState = EndpointState::ENDPOINT_UNPLUGGED;
+ osh->reviseEndpointShowing(endpointId, EndpointState::ENDPOINT_UNPLUGGED);
break;
}
- isEpStateChanging.exchange(true);
- std::thread newEndpointThread(&OverseerHandler::reviseEndpointShowing, osh,
- endpointId, newState);
- newEndpointThread.detach();
- while(isEpStateChanging);
+
return S_OK;
}
-HRESULT EndpointSituationCallback::OnPropertyValueChanged(LPCWSTR pwstrDeviceId, const PROPERTYKEY key) {
- isEpStateChanging.exchange(true);
- std::thread propertyThread(&Overseer::updateEndpointInfo, os, std::wstring(pwstrDeviceId));
- propertyThread.detach();
- while(isEpStateChanging);
+HRESULT EndpointSituationCallback::OnPropertyValueChanged(LPCWSTR pwstrDeviceId, const PROPERTYKEY key) {
+
+ /*
+ * log_debugcpp(" -->Changed device property " +
+ * key.fmtid.Data1 + key.fmtid.Data2 + key.fmtid.Data3 + "\n" +
+ * key.fmtid.Data4[0]+ key.fmtid.Data4[1]+ "\n"+
+ * key.fmtid.Data4[2]+ key.fmtid.Data4[3] + "\n"+
+ * key.fmtid.Data4[4]+ key.fmtid.Data4[5] + "\n"+
+ * key.fmtid.Data4[6]+ key.fmtid.Data4[7]+ "\n"+
+ * " pid " + key.pid);
+ */
+
return S_OK;
}
-void EndpointSituationCallback::reportFinishedStateChange() {
- this->isEpStateChanging.exchange(false);
- return;
-}
-
-Endpoint::Endpoint(IMMDevice* ep, IPolicyConfig7* policyConfig, uint64_t idx) {
+Endpoint::Endpoint(IMMDevice* ep, uint64_t idx){
this->endpoint = ep;
this->idx = idx;
- this->policyConfig = policyConfig;
+
/*
* It can't multiflag, it's that stupid. MS momento.
* Only shows most relevant flag according to MS, i.e. 0110 sends 0010
*/
- DWORD state;
- if(FAILED(endpoint->GetState(&state))) {exit(-2);};
- this->endpointState = (EndpointState)state;
-
+ //todo: preguntitas owindows dword no es uint32_t even tho mingw mingas
+ if(FAILED(endpoint->GetState(&this->endpointState))) {exit(-1);};
+
if(this->endpointState == EndpointState::ENDPOINT_ACTIVE) {
activateEndpointVolume();
-
- //if(FAILED(endpoint->Activate(__uuidof(IAudioClient),
- // CLSCTX_ALL, NULL, (void**)&audioClient))) { log_debugcpp("audioclntbros..."); }
- //audioClient->GetDevicePeriod(&defTime, &minTime);
-
}
- //todo: atexit into exit Gather ID
+ reloadEndpointChannels();
+
+ /* todo: check header
+ * if(FAILED(endpoint->Activate(__uuidof(IAudioMeterInformation),
+ * CLSCTX_ALL, NULL, (void**)&endpointPeakMeter))) { log_debugcpp("peakbros..."); }
+ */
+
+ //todo:: atexit into exit Gather ID
LPWSTR tempString = nullptr;
- if (FAILED(endpoint->GetId(&tempString))) { exit(-1); };
+ if (FAILED(endpoint->GetId(&tempString))) {exit(-1);};
endpointId = std::wstring(tempString);
log_wdebugcpp(endpointId);
CoTaskMemFree(tempString);
- endpoint->OpenPropertyStore(STGM_READ, &properties);
- this->updateName();
- this->setFlow();
-
- reloadEndpointChannels();
-}
-
-void Endpoint::updateName() {
+ endpoint->OpenPropertyStore(STGM_READ, &properties);
PROPVARIANT pv;
- #define store_name(key, propvariant, wstr) do { \
- properties->GetValue(key, &propvariant); \
- if (pv.pwszVal == nullptr) wstr = L"Unnamed Not Present Endpoint"; \
- else wstr = std::wstring(pv.pwszVal); \
- } while (0)
+ properties->GetValue(PKEY_Device_FriendlyName , &pv);
+ if (pv.pwszVal == nullptr)
+ friendlyName = L"Unnamed Not Present Endpoint";
+ else
+ friendlyName = std::wstring(pv.pwszVal);
- store_name(PKEY_Device_FriendlyName, pv, friendlyName);
- store_name(PKEY_Device_DeviceDesc, pv, descriptionName);
- store_name(PKEY_DeviceInterface_FriendlyName, pv, deviceName);
- #undef store_name
- log_wdebugcpp(L"Endpoint name: " + friendlyName);
-}
-
-void Endpoint::activateEndpointSessions() {
- if (this->flow != Flows::FLOW_PLAYBACK) {
- log_debugcpp("recording. No seshes for u :(");
- return;
+ this->setFlow();
+ if (this->flow == Flows::FLOW_PLAYBACK) {
+ activateEndpointSessions();
}
-
- if (!sessionManager) {
- if (FAILED(endpoint->Activate(__uuidof(IAudioSessionManager2),
- CLSCTX_ALL, NULL, (void**) &sessionManager))) {
- log_debugcpp("Couldn't open session manager2, huh");
- return;
- }
- }
-
- IAudioSessionEnumerator* sessionEnumerator = nullptr;
- if (FAILED(sessionManager->GetSessionEnumerator(&sessionEnumerator))) { log_wdebugcpp(L"sesEnumeratorBros..."); exit(-5); return; }
-
- endpointSessions.resize(1, nullptr);
- int sessionCount;
- sessionEnumerator->GetCount(&sessionCount);
- for (int i = 0; i < sessionCount; i++) {
- IAudioSessionControl* sessionControlTmp;
- if (FAILED(sessionEnumerator->GetSession(i, (IAudioSessionControl**)&sessionControlTmp))) {
- exit(-6);
- }
- IAudioSessionControl2* sessionControl;
- if(FAILED(sessionControlTmp->QueryInterface(__uuidof(IAudioSessionControl2), (void**)&sessionControl))){
- exit(-7);
- }
- sessionControlTmp->Release();
- Session* session = new Session(this, sessionControl, (size_t)i);
- if (sessionControl->IsSystemSoundsSession() == S_OK) endpointSessions[0] = session;
- else endpointSessions.push_back(session);
- }
- sessionEnumerator->Release();
}
/*
- * void Endpoint::deleteSessionManager() {
- * sessionManager->Release();
- * sessionManager = nullptr;
- * }
+ * Endpoint::Endpoint(IMMDevice* endpoint) : Endpoint(endpoint, 0) {};
*/
+void Endpoint::activateEndpointSessions() {
+ //sessionManager;
+ if (FAILED(endpoint->Activate(__uuidof(IAudioSessionManager2), CLSCTX_ALL, NULL, (void**) &sessionManager))) { log_wdebugcpp(L"sesionbros..."); return; }
+
+ IAudioSessionEnumerator* sessionEnumerator = nullptr;
+ if (FAILED(sessionManager->GetSessionEnumerator(&sessionEnumerator))) { log_wdebugcpp(L"sesEnumeratorBros..."); return; }
+
+ int sessionCount;
+ sessionEnumerator->GetCount(&sessionCount);
+ for (int i = 0; i < sessionCount; i++) {
+ IAudioSessionControl* sessionControlTmp;
+ sessionEnumerator->GetSession(i, (IAudioSessionControl**)&sessionControlTmp);
+ //todo:: asegurar lo del dynamic_cast
+ IAudioSessionControl2* sessionControl;
+ sessionControlTmp->QueryInterface(__uuidof(IAudioSessionControl2), (void**)&sessionControl);
+ sessionControl->AddRef();
+ sessionControlTmp->Release();
+ Session* session = new Session(this, sessionControl, (size_t)i);
+ endpointSessions.push_back(session);
+ }
+ sessionEnumerator->Release();
+}
+
void Endpoint::addSession(Session* session) {
session->setIndex(this->getSessionCount());
endpointSessions.push_back(session);
}
void Endpoint::activateEndpointVolume() {
- //If this EP is created after init, COM won't be initialized on the executing thread.
- HRESULT result = CoInitializeEx(NULL, COINIT_MULTITHREADED | COINIT_DISABLE_OLE1DDE);
- if (this->endpointVolume == nullptr) {
- if(FAILED(endpoint->Activate(
- IID_IAudioEndpointVolume,
- CLSCTX_ALL,
- NULL,
- (void**)&this->endpointVolume))) {
- log_debugcpp("No volume, huh");
- }
-
- //todo: check header
- if(FAILED(endpoint->Activate(__uuidof(IAudioMeterInformation),
- CLSCTX_ALL, NULL, (void**)&endpointPeakMeter))) {
- log_debugcpp("peakbros...");
- }
+ //bool extraThread = false;
+ /*
+ * Forgive me, for MS has sinned, and now I must too.
+ */
+ if (this->endpointVolume == nullptr){
+ HRESULT result = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE);
+ endpoint->Activate(IID_IAudioEndpointVolume, CLSCTX_ALL, NULL, (void**)&this->endpointVolume);
+ //if (endpointVolume == nullptr) { //why they returning 0 after dealing with the error jfc CO_E_NOTINITIALIZED) {
+ //CoInitializeEx(NULL, COINIT_MULTITHREADED | COINIT_DISABLE_OLE1DDE);
+ //extraThread = true;
+ //goto initialized;
+ //}
+ //log_debugcpp(std::string("no endpointVolume (IAudioEndpointVolume)"));
+ if (result == S_OK)
+ CoUninitialize();
}
- if (result == S_OK)
- CoUninitialize();
}
void Endpoint::reloadEndpointChannels() {
@@ -414,13 +361,6 @@ std::wstring Endpoint::getId(){
return endpointId;
}
-float Endpoint::getPeakVolume() {
- float peakVol;
- if(endpointPeakMeter) endpointPeakMeter->GetPeakValue(&peakVol);
- else return 0;
- return peakVol;
-}
-
float Endpoint::getVolume(int channel){
float volume;
if (channel == AudioChannel::CHANNEL_MAIN) {
@@ -435,6 +375,7 @@ uint32_t Endpoint::getChannelCount(){
return (uint32_t)channelCount;
}
+
bool Endpoint::getMute(){
BOOL mut;
if(FAILED(endpointVolume->GetMute(&mut))) { /* TIP: Below */ }
@@ -442,7 +383,7 @@ bool Endpoint::getMute(){
return mute;
}
-void Endpoint::setState(EndpointState state){
+void Endpoint::setState(uint8_t state){
this->endpointState = state;
if(state == EndpointState::ENDPOINT_ACTIVE) {
this->activateEndpointVolume();
@@ -450,7 +391,7 @@ void Endpoint::setState(EndpointState state){
}
}
-EndpointState Endpoint::getState(){
+size_t Endpoint::getState(){
return this->endpointState;
}
@@ -458,13 +399,9 @@ void Endpoint::setVolume(NGuid guid, int channel, float volume) {
//TIP: There used to be log messages here. Now, it's a ghost town.
GUID tempMsGuid = NGuidToGUID(guid);
if (channel == AudioChannel::CHANNEL_MAIN) {
- if(FAILED(endpointVolume->SetMasterVolumeLevelScalar(volume, &tempMsGuid))) {
- log_wdebugcpp(L"Master volume failed for endpoint: " + friendlyName);
- };
+ if(FAILED(endpointVolume->SetMasterVolumeLevelScalar(volume, &tempMsGuid))) {};
} else {
- if(FAILED(endpointVolume->SetChannelVolumeLevelScalar(channel, volume, &tempMsGuid))) {
- log_wdebugcpp(L"Channel " + std::to_wstring(channel) + L" volume failed for endpoint: " + friendlyName);
- };
+ if(FAILED(endpointVolume->SetChannelVolumeLevelScalar(channel, volume, &tempMsGuid))) {};
}
}
@@ -489,29 +426,70 @@ Roles Endpoint::getRoles(){
}
void Endpoint::setRoles(Roles role){
- if (!policyConfig) return;
+ //otro exe momento
+ STARTUPINFOEXW startupConfig;
+ PROCESS_INFORMATION processInfo;
+ SecureZeroMemory(&startupConfig, sizeof(STARTUPINFOEXW));
+ SecureZeroMemory(&startupConfig.StartupInfo, sizeof(STARTUPINFOW));
+ startupConfig.StartupInfo.cb = sizeof(STARTUPINFOEXW);
+ SecureZeroMemory(&processInfo, sizeof(PROCESS_INFORMATION));
- bool allRoles = false;
- ERole val;
- switch(role) {
+ std::wstring command = L"SoundVolumeView.exe /SetDefault " + endpointId + L" ";
+ std::wstring troublePair = L"0";
+ switch (role) {
+ case Roles::ROLE_ALL:
+ /*
+ * console or multimedia, one sends both, at least for now;
+ * either cos of ms or dis guy;
+ * no choice but to treat them as one for now.
+ * command += L"all"; and nothing else would've been nice...
+ */
+ troublePair = command + troublePair;
+ if(CreateProcessW(
+ NULL,
+ (wchar_t*)troublePair.c_str(),
+ NULL,
+ NULL,
+ false,
+ CREATE_UNICODE_ENVIRONMENT,
+ NULL,
+ NULL,
+ (LPSTARTUPINFOW)&startupConfig,
+ &processInfo
+ ) == true) {
+ WaitForSingleObject(processInfo.hProcess, INFINITE );
+ CloseHandle(processInfo.hProcess);
+ CloseHandle(processInfo.hThread);
+ }
+ command += L"2";
+ break;
case Roles::ROLE_CONSOLE:
- val = eConsole;
+ command += std::to_wstring(0);
break;
case Roles::ROLE_MULTIMEDIA:
- val = eMultimedia;
+ command += std::to_wstring(1);
break;
case Roles::ROLE_COMMUNICATIONS:
- val = eCommunications;
- break;
- default:
- allRoles = true;
+ command += std::to_wstring(2);
break;
}
- if (allRoles) {
- policyConfig->SetDefaultEndpoint(endpointId.c_str(), eMultimedia);
- //policyConfig->SetDefaultEndpoint(endpointId.c_str(), eConsole);
- policyConfig->SetDefaultEndpoint(endpointId.c_str(), eCommunications);
- } else policyConfig->SetDefaultEndpoint(endpointId.c_str(), val);
+
+ if(CreateProcessW(
+ NULL,
+ (wchar_t*)command.c_str(),
+ NULL,
+ NULL,
+ false,
+ CREATE_UNICODE_ENVIRONMENT,
+ NULL,
+ NULL,
+ (LPSTARTUPINFOW)&startupConfig,
+ &processInfo
+ ) == true) {
+ WaitForSingleObject(processInfo.hProcess, INFINITE );
+ CloseHandle(processInfo.hProcess);
+ CloseHandle(processInfo.hThread);
+ }
}
void Endpoint::assignRoles(Roles role){
@@ -526,12 +504,24 @@ void Endpoint::removeRoles(Roles role){
void Endpoint::setFlow() {
IMMEndpoint* flowGetter;
- if(FAILED(this->endpoint->QueryInterface(__uuidof(IMMEndpoint), (void**)&flowGetter)))
+ //this should be as simple as writing IID_IMMEndpoint, but it just won't find the macro, so I copied it. Sad.
+ GUID manual;
+ manual.Data1 = 0x1be09788;
+ manual.Data2 = 0x6894;
+ manual.Data3 = 0x4089;
+ manual.Data4[0] = 0x85;
+ manual.Data4[1] = 0x86;
+ manual.Data4[2] = 0x9a;
+ manual.Data4[3] = 0x2a;
+ manual.Data4[4] = 0x6c;
+ manual.Data4[5] = 0x26;
+ manual.Data4[6] = 0x5a;
+ manual.Data4[7] = 0xc5;
+ if(FAILED(this->endpoint->QueryInterface((const _GUID)manual, (void**)&flowGetter)))
{ log_debugcpp("no flow..."); }
EDataFlow MSflow;
- flowGetter->GetDataFlow(&MSflow);
+ HRESULT vafllar = flowGetter->GetDataFlow(&MSflow);
this->flow = (MSflow == EDataFlow::eRender ? Flows::FLOW_PLAYBACK : Flows::FLOW_CAPTURE);
- log_debugcpp("Endpoint flow: " + std::to_string(flow));
flowGetter->Release();
}
@@ -545,9 +535,7 @@ std::vector Endpoint::getSessions() {
}
size_t Endpoint::getSessionCount() {
- size_t sessionCount;
- sessionCount = endpointSessions.size();
- return sessionCount;
+ return endpointSessions.size();
}
void Endpoint::registerNewSessionNotification(EndpointNewSessionCallback* ensc){
@@ -558,28 +546,18 @@ void Endpoint::unregisterNewSessionNotification(EndpointNewSessionCallback* ensc
sessionManager->UnregisterSessionNotification(ensc);
}
-void Endpoint::deleteSessions() {
- for (auto session : endpointSessions) {
- delete session;
- }
- endpointSessions.resize(0);
-}
-
Endpoint::~Endpoint(){
- //EPs are never deleted.
log_wdebugcpp(L"murio endpoint-san uwu");
properties->Release();
endpointVolume->Release();
endpoint->Release();
sessionManager->Release();
- for (auto session : endpointSessions) {
- delete session;
- }
}
void Overseer::initCOMLibrary() {
+ OutputDebugStringW(L"EPWidget creation\n");
if(FAILED(CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE))) {
- log_debugcpp("Not even COM?"); };
+ log_debugcpp("si"); };
//Retrieving endpoint enumerator
@@ -587,23 +565,21 @@ void Overseer::initCOMLibrary() {
if(FAILED(CoCreateInstance( __uuidof(MMDeviceEnumerator), NULL,
CLSCTX_ALL, __uuidof(IMMDeviceEnumerator),
(void**)&deviceEnumerator)) )
- { log_debugcpp("No MMDeviceEnum. Weird."); };
+ { log_debugcpp("si"); };
GUID tempGuid;
if(FAILED(CoCreateGuid(&tempGuid))) { log_debugcpp("Failed to obtain GUID: " ); };
//todo: wtf? why is it working? floats are ptrs...
this->guid = GUIDToNGuid(&tempGuid);
- HRESULT hre = CoCreateInstance(__uuidof(CPolicyConfigClient),
- NULL, CLSCTX_ALL,
- __uuidof(IPolicyConfig7), (LPVOID *)&policyConfig);
- if (hre != S_OK) exit(-1);
+ //if(FAILED(CoCreateInstance(__uuidof(CPolicyConfigClient),
+ // NULL, CLSCTX_ALL, __uuidof(IPolicyConfig10), (LPVOID *)&policyConfig))) {exit(-1);}
//TODO: Release lpguid?
//TODO: Uninitialize COM
}
-void Overseer::createEndpoints(Flows flow) {
+void Overseer::reloadEndpoints(Flows flow) {
IMMDeviceCollection *deviceCollection;
unsigned int numEndpoints;
EDataFlow MSflow = (flow == Flows::FLOW_PLAYBACK ? EDataFlow::eRender : EDataFlow::eCapture);
@@ -615,16 +591,17 @@ void Overseer::createEndpoints(Flows flow) {
/*
* Counting them
*/
- if(FAILED(deviceCollection->GetCount(&numEndpoints))) { log_debugcpp("si");};
- if(numEndpoints == 0) { log_debugcpp("si"); };
+ if(FAILED(deviceCollection->GetCount(&numEndpoints))) { log_debugcpp("si");};
+ if(numEndpoints == 0) { log_debugcpp("si"); };
/*
- * Retrieving actual endpoints and storing them on their own collection
+ * Retrieving actual endpoints and storing them on their own class
*/
IMMDevice *temp;
for (unsigned int i = 0; i < numEndpoints; i++){
if(deviceCollection->Item(i, &temp) != 0) { log_debugcpp("si"); };
- Endpoint *endpoint = new Endpoint(temp, policyConfig, i);
+ Endpoint *endpoint = new Endpoint(temp, i);
+
if (flow == Flows::FLOW_PLAYBACK)
this->playbackDevices.push_back(endpoint);
else
@@ -652,8 +629,6 @@ void Overseer::createEndpoints(Flows flow) {
break;
}
deviceEnumerator->GetDefaultAudioEndpoint(MSflow, val, &temp);
- if (!temp) continue;
-
LPWSTR id = nullptr;
if (flow == Flows::FLOW_PLAYBACK) {
@@ -662,8 +637,9 @@ void Overseer::createEndpoints(Flows flow) {
temp->GetId(&id);
int comparison = CompareStringEx(LOCALE_NAME_USER_DEFAULT, 0, eptId.c_str(), -987, id, -987, NULL, NULL, 0);
if (comparison - 2 == 0) {
- log_wdebugcpp(L"ola defaul playback de " + std::to_wstring(i) + L" es " + id);
- playbackDevices.at(j)->assignRoles((Roles)(1 << i));
+ log_wdebugcpp(L"ola defaul playback de "
+ + std::to_wstring(i) + L" es " + id);
+ playbackDevices.at(j)->assignRoles((Roles)(1 << i));
}
}
} else {
@@ -677,23 +653,16 @@ void Overseer::createEndpoints(Flows flow) {
captureDevices.at(j)->assignRoles((Roles)(1 << i));
}
}
-
}
}
}
Endpoint* Overseer::addEndpoint(std::wstring endpointId, /* out */Flows* flow = nullptr) {
- //This method is only called from the new endpoint callback and its subsequent thread,
- //so another STA can be safely instantiated
- if(FAILED(CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE))) {
- log_debugcpp("EP Callback Thread failed. Sad!");
- return nullptr;
- }
IMMDevice* newep;
if(FAILED(deviceEnumerator->GetDevice((LPCWSTR)endpointId.c_str(), &newep)))
- log_debugcpp("ay caramba con la hot metida. Sad!");
+ log_debugcpp("ay caramba con la hot metida.");
- Endpoint *endpoint = new Endpoint(newep, policyConfig);
+ Endpoint *endpoint = new Endpoint(newep);
Flows getFlow = endpoint->getFlow();
if (getFlow == Flows::FLOW_PLAYBACK) {
@@ -704,47 +673,27 @@ Endpoint* Overseer::addEndpoint(std::wstring endpointId, /* out */Flows* flow =
this->captureDevices.push_back(endpoint);
}
if (flow != nullptr) *flow = getFlow;
- CoUninitialize();
return endpoint;
}
-void Overseer::reportFinishedStateChange() {
- epsc.reportFinishedStateChange();
-}
-
-Overseer::Overseer() : epsc(this) {
- log_debugcpp("Initializing Overseer");
-
- //Storing exe path for later use (mainly "Run on startup")
- log_debugcpp("-Caching exe path");
- uint32_t cPathLen = 0;
- wchar_t* cPath = getExeAbsPath(&cPathLen);
- exeAbsPath = cPath;
-
- //Detecting install scope
- wchar_t *machine = wcsstr(cPath, L"Program Files");
- if (!machine)
- Environment::scope = HKEY_CURRENT_USER;
- else Environment::scope = HKEY_LOCAL_MACHINE;
- free(cPath);
-
+Overseer::Overseer() { //: epsc(deviceEnumerator, playbackDevices){
//Initializing COM library
- log_debugcpp("-Initializing COM");
+ log_debugcpp("Initializing Overseer");
initCOMLibrary();
- //Obtaining playback endpoint collection
- createEndpoints(Flows::FLOW_PLAYBACK);
+ //Obtaining playback endpoint collection on this point in time
+ reloadEndpoints(Flows::FLOW_PLAYBACK);
//reloadEndpoints(Flows::FLOW_CAPTURE);
-}
-NGuid Overseer::getGuid() {
- return guid;
-}
-
-void Overseer::registerEndpointSituationCallback() {
+ //Registering for endpoint information callback
+ this->epsc.fill(deviceEnumerator, playbackDevices, captureDevices);
if(FAILED(deviceEnumerator->RegisterEndpointNotificationCallback(((IMMNotificationClient*)&epsc)))) { log_debugcpp("when no enchufas......"); }
}
+NGuid Overseer::getGuid() {
+ return guid;
+}
+
std::vector Overseer::getPlaybackEndpoints() {
return playbackDevices;
}
@@ -753,297 +702,14 @@ std::vector Overseer::getCaptureEndpoints() {
return captureDevices;
}
-void Overseer::updateEndpointInfo(std::wstring endpointId) {
- //todo: reintroduce capture devices
- playbackMutex.lock();
- log_wdebugcpp(L"new name Endpoint id: " + endpointId);
- for(auto ep : playbackDevices) {
- if (ep->getId() == endpointId && ep->getState() == EndpointState::ENDPOINT_ACTIVE) {
- ep->updateName();
- osh->updateFrontEndpointName(ep);
- break;
- }
- }
- playbackMutex.unlock();
- epsc.reportFinishedStateChange();
-}
-
Overseer::~Overseer(){
- //Overseer is never deleted. This is to annotate what would need to be taken care of.
- log_debugcpp("jej");
+ log_debugcpp("cum");
deviceEnumerator->Release();
for(unsigned long long i = 0; i < playbackDevices.size(); i++){
delete(playbackDevices.at(i));
}
}
-wchar_t* Environment::getExeAbsPath(uint32_t *exeAbsPathLength) {
- wchar_t *exeAbsPath = (wchar_t*)calloc(UNICODE_STRING_MAX_CHARS, sizeof(wchar_t));
- *exeAbsPathLength = GetModuleFileNameW(
- NULL,
- exeAbsPath,
- UNICODE_STRING_MAX_CHARS
- );
- return exeAbsPath;
-}
-
-std::string Environment::createSettingsPath(SettingsTargetDirectory target) {
- wchar_t* settingsPath = nullptr;
- wchar_t settingsFile[] = L"\\settings.ini";
- uint32_t settingsFileLen = (sizeof(settingsFile) / sizeof(wchar_t)) - 1;
- wchar_t maxPathBypass[] = L"\\\\?\\";
- uint32_t exePathLength = 0;
- wchar_t folderPath[] = L"\\" LAPP_NAME;
- uint32_t maxPathBypassLen = (sizeof(maxPathBypass)/ sizeof(wchar_t)) - 1;
- uint32_t folderPathLen = (sizeof(folderPath) / sizeof(wchar_t)) - 1;
- wchar_t* roamingPath = nullptr;
-
- log_wdebugcpp(L"Bypass size: " + std::to_wstring((sizeof(maxPathBypass)/sizeof(maxPathBypass[0]))));
-
- switch(target) {
- case HOME_DIR:
- {
- if(SHGetKnownFolderPath(
- FOLDERID_RoamingAppData,
- 0,
- NULL,
- &roamingPath)
- == S_OK) {
- //Retrieve path len
- uint32_t pathLen = 0;
- wchar_t currentChar = roamingPath[pathLen];
- while(currentChar != '\0') {
- pathLen++;
- currentChar = roamingPath[pathLen];
- }
-
- settingsPath = (wchar_t*)calloc(pathLen +
- maxPathBypassLen +
- folderPathLen +
- settingsFileLen,
- sizeof(wchar_t));
- memcpy(settingsPath, maxPathBypass, sizeof(wchar_t) * maxPathBypassLen);
- memcpy(settingsPath + (maxPathBypassLen), roamingPath, sizeof(wchar_t) * pathLen);
- CoTaskMemFree(roamingPath);
- memcpy(settingsPath + (maxPathBypassLen + pathLen),
- folderPath, sizeof(wchar_t) * folderPathLen);
- log_wdebugcpp(L"Settings folder path: " + std::wstring(settingsPath));
-
- if(CreateDirectoryW(settingsPath, NULL) || GetLastError() == ERROR_ALREADY_EXISTS) {
- memcpy(settingsPath + (maxPathBypassLen + pathLen + folderPathLen),
- settingsFile, sizeof(wchar_t) * settingsFileLen);
- std::string utf8path = utf16ToUtf8(settingsPath);
- free(settingsPath);
- return utf8path;
- }
- }
- }
- return nullptr;
- break;
- case APP_PATH:
- {
- //Executable dir
- settingsPath = getExeAbsPath(&exePathLength);
-
- //reverse wcsstr
- while(exePathLength >= 0) {
- if(settingsPath[exePathLength] == '\\') {
- memset(settingsPath + exePathLength,
- 0,
- (UNICODE_STRING_MAX_CHARS - exePathLength) * sizeof(wchar_t));
- break;
- } else exePathLength--;
- }
- log_wdebugcpp(L"Exe folder: " + std::wstring(settingsPath));
- if((UNICODE_STRING_MAX_CHARS - exePathLength) > (settingsFileLen + 1)) {
- memcpy(settingsPath + exePathLength, settingsFile, sizeof(wchar_t) * settingsFileLen);
- std::string utf8path = utf16ToUtf8(settingsPath);
- free(settingsPath);
- return utf8path;
- }
- }
- return nullptr;
- break;
- default:
- return nullptr;
- break;
- }
- return nullptr;
-}
-
-void Environment::populateSystemValues() {
- updateColors();
- Environment::startup = checkStartup(scope);
-}
-
-void Environment::openControlPanel() {
- STARTUPINFOEXW startupConfig;
- PROCESS_INFORMATION processInfo;
- SecureZeroMemory(&startupConfig, sizeof(STARTUPINFOEXW));
- SecureZeroMemory(&startupConfig.StartupInfo, sizeof(STARTUPINFOW));
- startupConfig.StartupInfo.cb = sizeof(STARTUPINFOEXW);
- SecureZeroMemory(&processInfo, sizeof(PROCESS_INFORMATION));
-
- std::wstring command = L"rundll32 shell32, Control_RunDLL mmsys.cpl";
- if(CreateProcessW(
- NULL,
- (wchar_t*)command.c_str(),
- NULL,
- NULL,
- false,
- CREATE_UNICODE_ENVIRONMENT,
- NULL,
- NULL,
- (LPSTARTUPINFOW)&startupConfig,
- &processInfo
- ) == true) {
- CloseHandle(processInfo.hProcess);
- CloseHandle(processInfo.hThread);
- }
-}
-
-ProcessedNativeEvent Environment::processTopLevelWindowMessage(void* msg) {
-#ifdef WIN32
- MSG *message = static_cast(msg);
- switch(message->message) {
- case WM_SETTINGCHANGE:
- //TODO: This looks like a future pain point. Ex handler would come in clutch
- if(message->lParam && !wcscmp(((wchar_t*)message->lParam), L"ImmersiveColorSet"))
- return updateColors();
- break;
- default:
- return ProcessedNativeEvent::NONE;
- break;
- }
- return ProcessedNativeEvent::NONE;
- //if (message->message != WM_SETTINGCHANGE) {return false;}
-#endif
-}
-
-ProcessedNativeEvent Environment::updateColors() {
- // DwmGetColorizationColor( WM_DWMCOLORIZATIONCOLORCHANGED
- DWORD value = 0;
- DWORD size = sizeof(DWORD);
-
- LSTATUS result;
-
- //Theme bg color
- result = RegGetValueW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize", L"AppsUseLightTheme", RRF_RT_REG_DWORD, nullptr, &value, &size);
- lightMode = (bool)value;
-
- //Accent color
- result = RegGetValueW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\DWM", L"ColorizationColor", RRF_RT_REG_DWORD, nullptr, &value, &size);
- if (result == ERROR_SUCCESS) {
- accentColor = value;
- } else accentColor = 0xffffffff;
-
- return ProcessedNativeEvent::COLORS;
-}
-
-bool Environment::checkStartup(HKEY rootKeyFlags) {
- //LSTATUS result;
- DWORD typeReturned;
-
- //Checking if app entry exists
- if(RegGetValueW(rootKeyFlags, L"Software\\Microsoft\\Windows\\CurrentVersion\\Run", LAPP_NAME, RRF_RT_REG_SZ, &typeReturned, nullptr, nullptr) != ERROR_SUCCESS && typeReturned != REG_SZ)
- return false;
- else return true;
-}
-
-void Environment::updateStartupConfig(bool onStartup) {
- wchar_t regSubKey[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Run\\";
-
- if(!onStartup) {
- HKEY runKey;
- if (RegOpenKeyExW(
- scope,
- regSubKey,
- 0,
- KEY_SET_VALUE,
- &runKey
- )
- == ERROR_SUCCESS) {
- RegDeleteValueW(runKey, LAPP_NAME);
- RegCloseKey(runKey);
- }
- } else {
- LSTATUS result;
- uint32_t cPathLen = 0;
- wchar_t* cPath = getExeAbsPath(&cPathLen);
- wchar_t* regPath = (wchar_t*)calloc(UNICODE_STRING_MAX_CHARS + 2, sizeof(wchar_t));
- //char* v = 0xFF'00'00'00'00'00'00'21;
- regPath[0] = L'"';
- memcpy(regPath + 1, cPath, sizeof(wchar_t) * cPathLen);
- memcpy(regPath + cPathLen + 1, L"\"", sizeof(wchar_t) * 2);
-
- result = RegSetKeyValueW(
- scope,
- regSubKey,
- LAPP_NAME,
- REG_SZ,
- (void*)regPath,
- (cPathLen + 3) * sizeof(wchar_t));
- /*
- * if (result != ERROR_SUCCESS) {
- * wchar_t* error;
- * FormatMessageW(
- * FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
- * nullptr,
- * (DWORD)result,
- * LANG_USER_DEFAULT,
- * error,
- * 1,
- * nullptr);
- * LocalFree(error);
- * }
- */
- free(cPath);
- }
- return;
-}
-
-void Environment::setStartupConfig(bool onStartup) {
- //TODO: Use the cache!!!! lol
- uint32_t cPathLen = 0;
- wchar_t* cPath = getExeAbsPath(&cPathLen);
- wchar_t startupParam[] = L"--change-startup";
- uint32_t startupParamLen = (sizeof(startupParam) / sizeof(wchar_t)) - 1;
- wchar_t* completeParam = (wchar_t*)calloc(startupParamLen + 3, sizeof(wchar_t));
- memcpy(completeParam, startupParam, sizeof(wchar_t) * startupParamLen);
- if (onStartup)
- memcpy(completeParam + startupParamLen, L" 1", sizeof(wchar_t) * 3);
- else
- memcpy(completeParam + startupParamLen, L" 0", sizeof(wchar_t) * 3);
-
- if(scope == HKEY_LOCAL_MACHINE) {
- ShellExecuteW(
- NULL,
- L"runas",
- cPath,
- completeParam,
- NULL, // default dir
- SW_SHOWNORMAL
- );
- } else {
- Environment::updateStartupConfig(onStartup);
- }
- free(cPath);
- free(completeParam);
- return;
-}
-
-bool Environment::isLightMode() {
- return lightMode;
-}
-
-bool Environment::isToRunAtStartup() {
- return startup;
-}
-
-uint32_t Environment::getAccentColor() {
- return accentColor;
-}
-
//int Overseer::getCaptureEndpoints(std::vector *captureEndpoints);
//IMMDeviceEnumerator** Overseer::setOrigin();
diff --git a/src/back/backlasses.h b/src/back/backlasses.h
index 5acedba..f70e6d1 100644
--- a/src/back/backlasses.h
+++ b/src/back/backlasses.h
@@ -4,52 +4,16 @@
#include "backsessionclasses.h"
#include "global.h"
#include "contclasses.h"
-//#include "environment.h"
class EndpointVolumeCallback;
class Session;
-// Convert a wide UTF16LE string to an UTF8 string
-static inline std::string utf16ToUtf8(const wchar_t* wstr) {
- if(!wstr || wstr[0] == '\0') return std::string();
- int size_needed = WideCharToMultiByte(CP_UTF8,
- 0,
- wstr,
- -1,
- NULL,
- 0,
- NULL,
- NULL);
- std::string str(size_needed, 0);
- WideCharToMultiByte(CP_UTF8,
- 0,
- wstr,
- -1,
- &str[0],
- size_needed,
- NULL,
- NULL);
- return str;
-}
-
-// Convert an UTF8 string to a wide UTF16LE String
-/*
- * std::wstring utf8_decode(const std::string &str)
- * {
- * if( str.empty() ) return std::wstring();
- * int size_needed = MultiByteToWideChar(CP_UTF8, 0, &str[0], (int)str.size(), NULL, 0);
- * std::wstring wstrTo( size_needed, 0 );
- * MultiByteToWideChar (CP_UTF8, 0, &str[0], (int)str.size(), &wstrTo[0], size_needed);
- * return wstrTo;
- * }
- */
-
class Endpoint {
public:
- Endpoint(IMMDevice* endpoint, IPolicyConfig7* policyConfig, uint64_t idx = 0);
+ Endpoint(IMMDevice* endpoint, uint64_t idx);
//todo: how to forward declare delegate constructors?
- //Endpoint(IMMDevice* endpoint) : Endpoint(endpoint, 0) {};
+ Endpoint(IMMDevice* endpoint) : Endpoint(endpoint, 0) {};
void reloadEndpointChannels();
uint64_t getIndex();
void setIndex(uint64_t idx);
@@ -58,18 +22,16 @@ class Endpoint {
float getVolume(int channel);
void setMute(NGuid guid, bool muted);
bool getMute();
- void setState(EndpointState state);
- EndpointState getState();
+ void setState(uint8_t state);
+ size_t getState();
Roles getRoles();
void setRoles(Roles role);
void assignRoles(Roles role);
void removeRoles(Roles role);
void setFlow();
Flows getFlow();
- float getPeakVolume();
std::wstring getId();
std::wstring getName();
- void updateName();
void setVolumeCallback(EndpointVolumeCallback *epc);
void removeVolumeCallback(EndpointVolumeCallback *epc);
@@ -80,34 +42,28 @@ class Endpoint {
void addSession(Session* session);
void registerNewSessionNotification(EndpointNewSessionCallback* ensc);
void unregisterNewSessionNotification(EndpointNewSessionCallback* ensc);
- void deleteSessions();
- void activateEndpointSessions();
- //void deleteSessionManager();
- std::mutex endpointSessionsMutex;
+
~Endpoint();
private:
void inline activateEndpointVolume();
+ void inline activateEndpointSessions();
std::vector endpointSessions;
uint32_t channelCount = 0;
- IMMDevice *endpoint;
- IAudioEndpointVolume *endpointVolume = nullptr;
- IPropertyStore *properties;
- IAudioMeterInformation *endpointPeakMeter = nullptr;
- //IAudioClient *audioClient;
- int64_t defTime, minTime;
- IAudioSessionManager2 *sessionManager = nullptr;
+ IMMDevice* endpoint;
+ IAudioSessionManager2 *sessionManager;
Flows flow;
+ IAudioEndpointVolume *endpointVolume = nullptr;
+ IPropertyStore *properties;
std::wstring friendlyName;
- std::wstring descriptionName;
- std::wstring deviceName;
std::wstring endpointId;
- EndpointState endpointState;
+ unsigned long endpointState;
Roles endpointRoles = (Roles)0;
uint64_t idx;
- //Not implemented in llvm-mingw. Sad! todo: mingw patch
- IPolicyConfig7* policyConfig;
+ /* Not implemented in llvm-mingw. Sad!
+ * IAudioMeterInformation *endpointPeakMeter = nullptr;
+ */
};
class EndpointVolumeCallback : public IAudioEndpointVolumeCallback {
@@ -119,19 +75,16 @@ class EndpointVolumeCallback : public IAudioEndpointVolumeCallback {
ULONG Release();
HRESULT QueryInterface(REFIID riid, VOID **ppvInterface);
HRESULT OnNotify(PAUDIO_VOLUME_NOTIFICATION_DATA update);
- void updateVolumeInfo(AUDIO_VOLUME_NOTIFICATION_DATA newVolume, float* channelVolumes);
- void reportFinished();
//~EndpointVolumeCallback();
private:
ULONG ref = 1;
Endpoint* ep;
- std::atomic wait = false;
};
class EndpointSituationCallback : public IMMNotificationClient {
public:
- EndpointSituationCallback(Overseer* os);
+ //EndpointSituationCallback(IMMDeviceEnumerator *deviceEnumerator, std::vector playbackDevices);
ULONG AddRef();
ULONG Release();
HRESULT QueryInterface(REFIID riid, VOID **ppvInterface);
@@ -140,31 +93,25 @@ class EndpointSituationCallback : public IMMNotificationClient {
HRESULT OnDeviceRemoved(LPCWSTR pwstrDeviceId);
HRESULT OnDeviceStateChanged(LPCWSTR pwstrDeviceId, DWORD dwNewState);
HRESULT OnPropertyValueChanged(LPCWSTR pwstrDeviceId, const PROPERTYKEY key);
- void reportFinishedStateChange();
+
+ void fill(IMMDeviceEnumerator *deviceEnumerator, std::vector playbackDevices, std::vector captureDevices);
private:
ULONG ref = 1;
- Overseer* os;
- std::atomic isEpStateChanging = false;
+ IMMDeviceEnumerator *deviceEnumerator;
+ std::vector playbackDevices;
+ std::vector captureDevices;
};
class Overseer {
-
+ //TODO singleton?
public:
Overseer();
- void registerEndpointSituationCallback();
- NGuid getGuid();
-
std::vector getPlaybackEndpoints();
std::vector getCaptureEndpoints();
- void updateEndpointInfo(std::wstring endpointId);
- void createEndpoints(Flows flow);
+ void reloadEndpoints(Flows flow);
Endpoint* addEndpoint(std::wstring endpointId, /* out */ Flows* flow);
-
- void reportFinishedStateChange();
-
- std::mutex playbackMutex;
- std::mutex captureMutex;
+ NGuid getGuid();
//void setEndpointStatusCallback();
//void setEndpointStatusCallback();
@@ -176,65 +123,28 @@ class Overseer {
~Overseer();
private:
- void initCOMLibrary();
-
NGuid guid;
IMMDeviceEnumerator *deviceEnumerator;
EndpointSituationCallback epsc;
-
+ //IPolicyConfig *policyConfig;
std::vector playbackDevices;
std::vector captureDevices;
- IPolicyConfig7* policyConfig;
- friend class Endpoint;
+ void initCOMLibrary();
//IMMDeviceCollection *deviceCollection;
//int numCaptureEndpoints;
//std::vector *captureDevices;
};
class EndpointNewSessionCallback : public IAudioSessionNotification {
- private:
- struct SessionThreadParams;
-
public:
EndpointNewSessionCallback(EndpointHandler *eph);
ULONG AddRef();
ULONG Release();
HRESULT QueryInterface(REFIID riid, VOID **ppvInterface);
HRESULT OnSessionCreated(IAudioSessionControl *NewSession);
- void createSessionThread(SessionThreadParams params);
private:
- std::atomic wait = false;
ULONG ref = 1;
EndpointHandler *eph;
-
- struct SessionThreadParams {
- EndpointHandler *eph;
- Session *session;
- bool isDelete;
- };
-};
-
-namespace Environment {
- wchar_t* getExeAbsPath(uint32_t *exeAbsPathLength);
- std::string createSettingsPath(SettingsTargetDirectory target);
- void populateSystemValues();
- void openControlPanel();
- ProcessedNativeEvent processTopLevelWindowMessage(void* msg);
- ProcessedNativeEvent updateColors();
- bool checkStartup(HKEY rootKeyFlags);
- void updateStartupConfig(bool onStartup);
- void setStartupConfig(bool onStartup);
- bool isLightMode();
- bool isToRunAtStartup();
- uint32_t getAccentColor();
-
- //todo: binary path cache unused
- static std::wstring exeAbsPath;
- static uint32_t exeAbsPathLen;
- static bool lightMode;
- static bool startup = false;
- static HKEY scope;
- static uint32_t accentColor;
};
diff --git a/src/back/backsessionclasses.cpp b/src/back/backsessionclasses.cpp
index c9aaa85..ced7fb1 100644
--- a/src/back/backsessionclasses.cpp
+++ b/src/back/backsessionclasses.cpp
@@ -37,11 +37,6 @@ HRESULT SessionStateCallback::QueryInterface(REFIID riid, VOID **ppvInterface) {
}
HRESULT SessionStateCallback::OnDisplayNameChanged(LPCWSTR NewDisplayName, LPCGUID EventContext) {
- //TODO: Preguntar
- while(sh->getVolumeInfo()->isNameChanged == true);
-
- sh->setName(std::wstring(NewDisplayName));
- sh->getVolumeInfo()->isNameChanged = true;
return S_OK;
}
@@ -94,10 +89,8 @@ HRESULT SessionStateCallback::OnStateChanged(AudioSessionState NewState) {
}
HRESULT SessionStateCallback::OnSessionDisconnected(AudioSessionDisconnectReason DisconnectReason) {
- if (DisconnectReason != DisconnectReasonDeviceRemoval) {
- sh->setState(SessionState::DISCONNECTED);
- sh->reviseSessionShowing(SessionState::DISCONNECTED);
- }
+ sh->setState(SessionState::DISCONNECTED);
+ sh->reviseSessionShowing(SessionState::DISCONNECTED);
return S_OK;
}
@@ -105,10 +98,7 @@ Session::Session(Endpoint* ep, IAudioSessionControl2* sessionControl, size_t idx
this->ep = ep;
this->sessionControl = sessionControl;
this->idx = idx;
- //https://matthewvaneerde.wordpress.com/2012/06/08/getting-audio-peak-meter-values-for-all-active-audio-sessions/
- if (FAILED(sessionControl->QueryInterface(__uuidof(IAudioMeterInformation), (void**)&meterInformation))) { log_wdebugcpp(L"sPeakbros......"); };
- //meterInformation = (IAudioMeterInformation*)sessionControl;
-
+
AudioSessionState msState;
sessionControl->GetState(&msState);
switch (msState) {
@@ -131,19 +121,10 @@ Session::Session(Endpoint* ep, IAudioSessionControl2* sessionControl, size_t idx
else {
LPWSTR sessionDisplayName;
this->sessionControl->GetDisplayName(&sessionDisplayName);
- if (!wcscmp(sessionDisplayName, L"")) {
- std::wstring exePath;
- if (getExePath(pid, &exePath)) {
- this->sessionName = exePath;
- if (fetchName(exePath, pid)) goto nameFound;
- }
- if (fetchNameViaWindowName(pid, &this->sessionName)) goto nameFound;
- } else {
+ if (!wcscmp(sessionDisplayName, L""))
+ this->sessionName = this->fetchProcessName(pid);
+ else
this->sessionName = std::wstring(sessionDisplayName);
- goto nameFound;
- }
-
- nameFound:
CoTaskMemFree(sessionDisplayName);
}
}
@@ -159,13 +140,6 @@ float Session::getVolume(int channel){
return volume;
}
-float Session::getPeakVolume() {
- float peakVol;
- if(meterInformation) meterInformation->GetPeakValue(&peakVol);
- else return 0;
- return peakVol;
-}
-
/*
* uint32_t Endpoint::getChannelCount(){
* return (uint32_t)channelCount;
@@ -176,10 +150,6 @@ std::wstring Session::getName() {
return sessionName;
}
-void Session::setName(std::wstring newName) {
- this->sessionName = newName;
-}
-
bool Session::getMute() {
BOOL mut;
if(FAILED(sessionVolume->GetMute(&mut))) { /* TIP: Below */ }
@@ -206,196 +176,87 @@ void Session::setMute(NGuid guid, bool muted) {
if(FAILED(sessionVolume->SetMute(muted, &tempMsGuid))) { log_wdebugcpp(std::wstring(L"SessionVolume null?")); };
}
-bool Session::getExePath(DWORD pid, std::wstring *exePath) {
- //std::wstring msixName;
- HANDLE processHandle;
- wchar_t fileName[UNICODE_STRING_MAX_CHARS];
- processHandle = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, pid);
- if (processHandle != NULL) {
- if (GetModuleFileNameEx(processHandle, NULL, fileName, UNICODE_STRING_MAX_CHARS) == 0) {
- CloseHandle(processHandle);
- return false;
- }
- } else {
- log_wdebugcpp(L"aye no procname. -> " + std::to_wstring(GetLastError()));
- return false;
+std::wstring Session::fetchProcessName(DWORD pid) {
+ /*
+ * https://learn.microsoft.com/en-us/windows/win32/api/tlhelp32/nf-tlhelp32-createtoolhelp32snapshot
+ * https://stackoverflow.com/questions/11843368/how-to-get-process-description
+ */
+
+ /* Executable path retrieval */
+ std::wstring exePath = L"";
+
+ HANDLE processList = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE | TH32CS_SNAPMODULE32, pid);
+ if (processList == INVALID_HANDLE_VALUE) {
+ log_wdebugcpp(L"aye no procname.");
+ return exePath;
}
- *exePath = std::wstring(fileName);
- return true;
-}
+ MODULEENTRY32W me32w;
+ me32w.dwSize = sizeof(MODULEENTRY32W);
+ if(Module32FirstW(processList, &me32w)) {
+ do {
+ if (me32w.th32ProcessID == pid) {
+ exePath = std::wstring(me32w.szExePath);
+ break;
+ /*
+ * However, if the calling process is a 32-bit process, you must call the
+ * QueryFullProcessImageName function to retrieve the full path of the
+ * executable file for a 64-bit process.
+ */
+ }
+ } while(Module32NextW(processList, &me32w));
+ }
+ CloseHandle(processList);
-bool Session::fetchNameViaFD(std::wstring exePath, DWORD pid, std::wstring *sessionName) {
- /* File description retrieval: size and available lang-codepages */
+ /* File description retrieval */
struct LANGANDCODEPAGE {
WORD wLanguage;
WORD wCodePage;
} *translationArray;
DWORD filler;
- DWORD fileVersionInfoSize = GetFileVersionInfoSizeExW
- (FILE_VER_GET_LOCALISED | FILE_VER_GET_NEUTRAL, exePath.c_str(), &filler);
- if (!fileVersionInfoSize) return false;
+ DWORD fileVersionInfoSize = GetFileVersionInfoSizeW(exePath.c_str(), &filler);
+ if (!fileVersionInfoSize) return exePath;
void* fileVersionInfo = malloc(fileVersionInfoSize);
- if(!GetFileVersionInfoExW(FILE_VER_GET_LOCALISED | FILE_VER_GET_NEUTRAL,
- exePath.c_str(),0,fileVersionInfoSize, fileVersionInfo)) {
- return false;
- }
+ if(!GetFileVersionInfoW(exePath.c_str(),0,fileVersionInfoSize, fileVersionInfo))
+ return exePath;
UINT translationArrayLen = 0;
- if (!VerQueryValueW(fileVersionInfo, L"\\VarFileInfo\\Translation", (LPVOID*)&translationArray, &translationArrayLen)) {
- free(fileVersionInfo);
- return false;
- }
- //File descriptor parsing
- //TODO: https://learn.microsoft.com/en-us/windows/win32/api/winnls/nf-winnls-getuserpreferreduilanguages
- /* It is possible to retrieve user languages and try to use one of those before falling back to whatever
- * is available. Also possible to hardcode en-US or any other lang-codepage combo. When an actual translation
- * sysem is put in place, I'll come finish this up.
- */
- uint64_t availableLangs = (translationArrayLen / sizeof(LANGANDCODEPAGE));
- if (!availableLangs) { free(fileVersionInfo); return false; }
+ if (!VerQueryValueW(fileVersionInfo, L"\\VarFileInfo\\Translation", (LPVOID*)&translationArray, &translationArrayLen))
+ return exePath;
- int8_t syslangIdx = -1;
- wchar_t metadataStringKey[256];
- wchar_t* metadataString = NULL;
- for (UINT i = 0; i < availableLangs; i++) {
+ bool match = false;
+ for (UINT i = 0; i < (translationArrayLen / sizeof(LANGANDCODEPAGE)); i++) {
+ wchar_t fileDescriptionKey[256];
LANGID defaultUILanguage = GetUserDefaultUILanguage();
if (defaultUILanguage != translationArray[i].wLanguage)
continue;
- syslangIdx = i;
- break;
+ match = true;
+ wchar_t* fileDescription = NULL;
+ UINT fileDescriptionSize = 0;
+ swprintf(fileDescriptionKey, L"\\StringFileInfo\\%04x%04x\\FileDescription",
+ translationArray[i].wLanguage, translationArray[i].wCodePage);
+ if (VerQueryValueW(fileVersionInfo, fileDescriptionKey, (LPVOID*)&fileDescription, &fileDescriptionSize)) {
+ exePath = std::wstring(fileDescription);
+ }
}
- UINT metadataStringSize = 0;
- swprintf(metadataStringKey, L"\\StringFileInfo\\%04x%04x\\FileDescription",
- translationArray[(syslangIdx < 0 ? 0 : syslangIdx)].wLanguage,
- translationArray[(syslangIdx < 0 ? 0 : syslangIdx)].wCodePage);
- if (VerQueryValueW(fileVersionInfo, metadataStringKey, (LPVOID*)&metadataString, &metadataStringSize)
- && metadataString[0] != '\0') {
- free(fileVersionInfo);
- *sessionName = std::wstring(metadataString);
- return true;
- }
- swprintf(metadataStringKey, L"\\StringFileInfo\\%04x%04x\\ProductName",
- translationArray[(syslangIdx < 0 ? 0 : syslangIdx)].wLanguage,
- translationArray[(syslangIdx < 0 ? 0 : syslangIdx)].wCodePage);
- if (VerQueryValueW(fileVersionInfo, metadataStringKey, (LPVOID*)&metadataString, &metadataStringSize)
- && metadataString[0] != '\0') {
- free(fileVersionInfo);
- *sessionName = std::wstring(metadataString);
- return true;
- }
+ if (!match && 1 <= (translationArrayLen / sizeof(LANGANDCODEPAGE))) {
+ wchar_t fileDescriptionKey[256];
- if(fileVersionInfo)
- free(fileVersionInfo);
-
- return false;
-}
-
-
-bool Session::fetchNameViaMSIX(std::wstring exePath, DWORD pid, std::wstring *sessionName) {
- HANDLE process = OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, FALSE, pid);
- if(!process) return false;
-
- //constant missing in mingw64. TB removed when I upgrade to a mingw64 ver that has it
- #define APPLICATION_USER_MODEL_ID_MAX_LENGTH 130
- uint32_t length = APPLICATION_USER_MODEL_ID_MAX_LENGTH;
- PWSTR userModelId = (PWSTR)malloc(length * sizeof(wchar_t));
- if(GetApplicationUserModelId(process, &length, userModelId) != ERROR_SUCCESS) {
- CloseHandle(process);
- return false;
- }
- CloseHandle(process);
-
- static constexpr wchar_t* prefix = L"shell:appsfolder\\";
- uint32_t prefixLen = wcslen(prefix);
- uint32_t userModelIdLen = wcslen(userModelId);
- wchar_t* fullName;
- fullName = (prefixLen + userModelIdLen < length)
- ? (wchar_t*)malloc(length * sizeof(wchar_t))
- : (wchar_t*)malloc((length * 2) * sizeof(wchar_t));
- for (int32_t i = prefixLen - 1; i >= 0; i--) {
- fullName[i] = prefix[i];
- }
- for (uint32_t i = 0; i < userModelIdLen + 1; i++) {
- fullName[prefixLen + i] = userModelId[i];
- }
-
- IShellItem* si;
- HRESULT hr = SHCreateItemFromParsingName(fullName,
- nullptr,
- IID_IShellItem,
- (void**)&si
- );
- free(fullName);
- LPWSTR humanName = nullptr;
- si->GetDisplayName(SIGDN_NORMALDISPLAY, &humanName);
- if(humanName && humanName[0] != '\0') {
- *sessionName = std::wstring(humanName);
- CoTaskMemFree(humanName);
- }
- if(si) si->Release();
-
- if (sessionName->length() > 0)
- return true;
- else return false;
-}
-
-
-bool Session::fetchNameViaWindowName(DWORD pid, std::wstring *sessionName) {
- //lParam is documented as in, so... Beware of future explosions, ig?
- std::pair params = { 0, pid };
-
- BOOL result = EnumWindows([](HWND hwnd, LPARAM lParam) -> BOOL {
- auto pParams = (std::pair*)(lParam);
-
- DWORD processId;
- //IsWindowVisible(hwnd) &&&& GetWindow(hwnd, GW_OWNER) == 0
- if ( GetWindowThreadProcessId(hwnd, &processId) && processId == pParams->second) {
- int length = GetWindowTextLength(hwnd);
- if (!length) return TRUE;
-
- // Stop enumerating
- SetLastError(-1);
- pParams->first = hwnd;
- return FALSE;
- }
-
- // Continue enumerating
- return TRUE;
- } , (LPARAM)¶ms);
-
- if(!result && GetLastError() == -1 && params.first) {
- //todo: double-dipping length... Not a fan
- int length = GetWindowTextLength(params.first);
- wchar_t* buffer = new wchar_t[length + 1];
- GetWindowTextW(params.first, buffer, length + 1);
- *sessionName = buffer;
- delete[] buffer;
- return true;
- }
- return false;
-}
-
-bool Session::fetchName(std::wstring exePath, DWORD pid) {
- /*
- * if(fetchNameViaWindowName(exePath, pid, &this->sessionName))
- * return;
- * else if(fetchNameViaMSIX(exePath, pid, &this->sessionName))
- * return;
- * else if(!fetchNameViaFD(exePath, pid, &this->sessionName))
- * this->sessionName = exePath;
- */
-
- if(fetchNameViaFD(exePath, pid, &this->sessionName))
- return true;
- return fetchNameViaMSIX(exePath, pid, &this->sessionName);
- //else if(!fetchNameViaWindowName(exePath, pid, &this->sessionName))
- /// this->sessionName = exePath;
+wchar_t* fileDescription = NULL;
+ UINT fileDescriptionSize = 0;
+ swprintf(fileDescriptionKey, L"\\StringFileInfo\\%04x%04x\\FileDescription",
+ translationArray[0].wLanguage, translationArray[0].wCodePage);
+ if (VerQueryValueW(fileVersionInfo, fileDescriptionKey, (LPVOID*)&fileDescription, &fileDescriptionSize)) {
+ exePath = std::wstring(fileDescription);
+ }
+ }
+ free(fileVersionInfo);
+ return exePath;
}
//todo: conflicting names. change callback name
@@ -416,10 +277,6 @@ void Session::removeStateCallback(SessionStateCallback *ssc){
}
Session::~Session() {
- meterInformation->Release();
sessionControl->Release();
sessionVolume->Release();
- meterInformation = nullptr;
- sessionControl = nullptr;
- sessionVolume = nullptr;
}
diff --git a/src/back/backsessionclasses.h b/src/back/backsessionclasses.h
index ae87f0a..e6c8490 100644
--- a/src/back/backsessionclasses.h
+++ b/src/back/backsessionclasses.h
@@ -33,32 +33,25 @@ class Session {
Session(Endpoint* ep, IAudioSessionControl2* sessionControl) : Session(ep, sessionControl, SIZE_MAX) {};
void setVolume(NGuid guid, int channel, float volume);
float getVolume(int channel);
- float getPeakVolume();
void setMute(NGuid guid, bool muted);
bool getMute();
SessionState getState();
void setState(SessionState state);
void setIndex(size_t idx);
std::wstring getName();
- void setName(std::wstring newName);
+
void setStateCallback(SessionStateCallback *ssc);
void removeStateCallback(SessionStateCallback *ssc);
~Session();
//uint32_t getChannelCount();
private:
- bool getExePath(DWORD pid, /*out*/ std::wstring *exePath);
- bool fetchName(std::wstring exePath, DWORD pid);
- bool fetchNameViaFD(std::wstring exePath, DWORD pid, /*out*/ std::wstring *sessionName);
- bool fetchNameViaMSIX(std::wstring exePath, DWORD pid, /*out*/ std::wstring *sessionName);
- bool fetchNameViaWindowName(DWORD pid, /*out*/ std::wstring *sessionName);
- /* std::wstring fetchProcessName(DWORD pid); */
+ std::wstring fetchProcessName(DWORD pid);
std::wstring sessionName;
SessionState sessionState;
Endpoint* ep;
IAudioSessionControl2* sessionControl = nullptr;
- IAudioMeterInformation* meterInformation = nullptr;
ISimpleAudioVolume* sessionVolume = nullptr;
- size_t idx;
+ size_t idx;
};
diff --git a/src/back/ipolicyconfig.h b/src/back/ipolicyconfig.h
index 7b474bb..2e10aab 100644
--- a/src/back/ipolicyconfig.h
+++ b/src/back/ipolicyconfig.h
@@ -1,42 +1,47 @@
-#pragma once
-
-#ifndef __IPolicyConfig7_FWD_DEFINED__
-#define __IPolicyConfig7_FWD_DEFINED__
-typedef interface IPolicyConfig7 IPolicyConfig7;
-#ifdef __cplusplus
-interface IPolicyConfig7;
-#endif
-#endif /* __IPolicyConfig7_FWD_DEFINED__ */
-
-#ifndef __CPolicyConfigClient_FWD_DEFINED__
-#define __CPolicyConfigClient_FWD_DEFINED__
-typedef class CPolicyConfigClient CPolicyConfigClient;
-#endif /* __CPolicyConfigClient_FWD_DEFINED__ */
-
-/*****************************************************************************
- * CPolicyConfigClient coclass
- */
-
-DEFINE_GUID(CLSID_CPolicyConfigClient, 0x870af99c, 0x171d, 0x4f9e, 0xaf,0x0d, 0xe6,0x3d,0xf4,0x0c,0x2b,0xc9);
-#ifdef __cplusplus
-class DECLSPEC_UUID("870af99c-171d-4f9e-af0d-e63df40c2bc9") CPolicyConfigClient;
-#ifdef __CRT_UUID_DECL
-__CRT_UUID_DECL(CPolicyConfigClient, 0x870af99c, 0x171d, 0x4f9e, 0xaf,0x0d, 0xe6,0x3d,0xf4,0x0c,0x2b,0xc9)
-#endif
-#endif
+// ----------------------------------------------------------------------------
+// PolicyConfig.h
+// Undocumented COM-interface IPolicyConfig.
+// Use for set default audio render endpoint
+// @author EreTIk
+// ----------------------------------------------------------------------------
-/*****************************************************************************
- * IPolicyConfig7 interface
- */
-#ifndef __IPolicyConfig7_INTERFACE_DEFINED__
-#define __IPolicyConfig7_INTERFACE_DEFINED__
-DEFINE_GUID(IID_IPolicyConfig7, 0xf8679f50, 0x850a, 0x41cf, 0x9c,0x72, 0x43,0x0f,0x29,0x02,0x90,0xc8);
-#if defined(__cplusplus) && !defined(CINTERFACE)
-MIDL_INTERFACE("f8679f50-850a-41cf-9c72-430f290290c8")
-IPolicyConfig7 : public IUnknown {
-
+#pragma once
+
+
+interface DECLSPEC_UUID("CA286FC3-91FD-42C3-8E9B-CAAFA66242E3")
+IPolicyConfig10;
+
+interface DECLSPEC_UUID("00000000-0000-0000-C000-000000000046")
+IPolicyConfig10_1;
+
+interface DECLSPEC_UUID("F8679F50-850A-41CF-9C72-430F290290C8")
+IPolicyConfig7;
+
+/* interface DECLSPEC_UUID("568B9108-44BF-40B4-9006-86AFE5B5A620") */
+/* IPolicyConfigVista; */
+
+interface DECLSPEC_UUID("f8679f50-850a-41cf-9c72-430f290290c8")
+IPolicyConfig;
+class DECLSPEC_UUID("870af99c-171d-4f9e-af0d-e63df40c2bc9")
+CPolicyConfigClient;
+// ----------------------------------------------------------------------------
+// class CPolicyConfigClient
+// {870af99c-171d-4f9e-af0d-e63df40c2bc9}
+//
+// interface IPolicyConfig
+// {f8679f50-850a-41cf-9c72-430f290290c8}
+//
+// Query interface:
+// CComPtr PolicyConfig;
+// PolicyConfig.CoCreateInstance(__uuidof(CPolicyConfigClient));
+//
+// @compatible: Windows 7 and Later
+// ----------------------------------------------------------------------------
+interface IPolicyConfig : public IUnknown
+{
public:
+
virtual HRESULT GetMixFormat(
PCWSTR,
WAVEFORMATEX **
@@ -102,69 +107,32 @@ public:
INT
);
};
-#ifdef __CRT_UUID_DECL
-__CRT_UUID_DECL(IPolicyConfig7, 0xf8679f50, 0x850a, 0x41cf, 0x9c,0x72, 0x43,0x0f,0x29,0x02,0x90,0xc8)
-#endif
-
-#endif
-
-
-#endif /* __IPolicyConfig7_INTERFACE_DEFINED__ */
-
-
-
-
-/* __CRT_UUID_DECL(IPolicyConfig10, 0xca286fc3, 0x91fd, 0x42c3, 0x8e,0x9b, 0xca,0xaf,0xa6,0x62,0x42,0xe3) */
-/* __CRT_UUID_DECL(CPolicyConfigClient, 0x870af99c, 0x171d, 0x4f9e, 0xaf,0x0d, 0xe6,0x3d,0xf4,0x0c,0x2b,0xc9) */
-
+/* interface DECLSPEC_UUID("568b9108-44bf-40b4-9006-86afe5b5a620") */
+/* IPolicyConfigVista; */
+/* class DECLSPEC_UUID("294935CE-F637-4E7C-A41B-AB255460B862") */
+/* CPolicyConfigVistaClient; */
/* // ---------------------------------------------------------------------------- */
-/* // PolicyConfig.h */
-/* // Undocumented COM-interface IPolicyConfig. */
-/* // Use for set default audio render endpoint */
-/* // @author EreTIk */
-/* // ---------------------------------------------------------------------------- */
-
-/* #pragma once */
-
-/* interface DECLSPEC_UUID("CA286FC3-91FD-42C3-8E9B-CAAFA66242E3") */
-/* IPolicyConfig10; */
-
-/* interface DECLSPEC_UUID("00000000-0000-0000-C000-000000000046") */
-/* IPolicyConfig10_1; */
-
-/* interface DECLSPEC_UUID("F8679F50-850A-41CF-9C72-430F290290C8") */
-/* IPolicyConfig7; */
-
-/* /\* interface DECLSPEC_UUID("568B9108-44BF-40B4-9006-86AFE5B5A620") *\/ */
-/* /\* IPolicyConfigVista; *\/ */
-
-/* interface DECLSPEC_UUID("f8679f50-850a-41cf-9c72-430f290290c8") */
-/* IPolicyConfig; */
-
-/* class DECLSPEC_UUID("870af99c-171d-4f9e-af0d-e63df40c2bc9") */
-/* CPolicyConfigClient; */
-/* // ---------------------------------------------------------------------------- */
-/* // class CPolicyConfigClient */
-/* // {870af99c-171d-4f9e-af0d-e63df40c2bc9} */
+/* // class CPolicyConfigVistaClient */
+/* // {294935CE-F637-4E7C-A41B-AB255460B862} */
/* // */
-/* // interface IPolicyConfig */
-/* // {f8679f50-850a-41cf-9c72-430f290290c8} */
+/* // interface IPolicyConfigVista */
+/* // {568b9108-44bf-40b4-9006-86afe5b5a620} */
/* // */
/* // Query interface: */
-/* // CComPtr PolicyConfig; */
-/* // PolicyConfig.CoCreateInstance(__uuidof(CPolicyConfigClient)); */
+/* // CComPtr PolicyConfig; */
+/* // PolicyConfig.CoCreateInstance(__uuidof(CPolicyConfigVistaClient)); */
/* // */
-/* // @compatible: Windows 7 and Later */
+/* // @compatible: Windows Vista and Later */
/* // ---------------------------------------------------------------------------- */
-/* interface IPolicyConfig : public IUnknown */
+/* interface IPolicyConfigVista : public IUnknown */
/* { */
/* public: */
/* virtual HRESULT GetMixFormat( */
/* PCWSTR, */
/* WAVEFORMATEX ** */
-/* ); */
+/* ); // not available on Windows 7, use method from IPolicyConfig */
/* virtual HRESULT STDMETHODCALLTYPE GetDeviceFormat( */
/* PCWSTR, */
@@ -172,10 +140,6 @@ __CRT_UUID_DECL(IPolicyConfig7, 0xf8679f50, 0x850a, 0x41cf, 0x9c,0x72, 0x43,0x0f
/* WAVEFORMATEX ** */
/* ); */
-/* virtual HRESULT STDMETHODCALLTYPE ResetDeviceFormat( */
-/* PCWSTR */
-/* ); */
-
/* virtual HRESULT STDMETHODCALLTYPE SetDeviceFormat( */
/* PCWSTR, */
/* WAVEFORMATEX *, */
@@ -187,22 +151,22 @@ __CRT_UUID_DECL(IPolicyConfig7, 0xf8679f50, 0x850a, 0x41cf, 0x9c,0x72, 0x43,0x0f
/* INT, */
/* PINT64, */
/* PINT64 */
-/* ); */
+/* ); // not available on Windows 7, use method from IPolicyConfig */
/* virtual HRESULT STDMETHODCALLTYPE SetProcessingPeriod( */
/* PCWSTR, */
/* PINT64 */
-/* ); */
+/* ); // not available on Windows 7, use method from IPolicyConfig */
/* virtual HRESULT STDMETHODCALLTYPE GetShareMode( */
/* PCWSTR, */
/* struct DeviceShareMode * */
-/* ); */
+/* ); // not available on Windows 7, use method from IPolicyConfig */
/* virtual HRESULT STDMETHODCALLTYPE SetShareMode( */
/* PCWSTR, */
/* struct DeviceShareMode * */
-/* ); */
+/* ); // not available on Windows 7, use method from IPolicyConfig */
/* virtual HRESULT STDMETHODCALLTYPE GetPropertyValue( */
/* PCWSTR, */
@@ -217,95 +181,12 @@ __CRT_UUID_DECL(IPolicyConfig7, 0xf8679f50, 0x850a, 0x41cf, 0x9c,0x72, 0x43,0x0f
/* ); */
/* virtual HRESULT STDMETHODCALLTYPE SetDefaultEndpoint( */
-/* PCWSTR wszDeviceId, */
-/* ERole eRole */
+/* __in PCWSTR wszDeviceId, */
+/* __in ERole eRole */
/* ); */
/* virtual HRESULT STDMETHODCALLTYPE SetEndpointVisibility( */
/* PCWSTR, */
/* INT */
-/* ); */
+/* ); // not available on Windows 7, use method from IPolicyConfig */
/* }; */
-
-/* /\* interface DECLSPEC_UUID("568b9108-44bf-40b4-9006-86afe5b5a620") *\/ */
-/* /\* IPolicyConfigVista; *\/ */
-/* /\* class DECLSPEC_UUID("294935CE-F637-4E7C-A41B-AB255460B862") *\/ */
-/* /\* CPolicyConfigVistaClient; *\/ */
-/* /\* // ---------------------------------------------------------------------------- *\/ */
-/* /\* // class CPolicyConfigVistaClient *\/ */
-/* /\* // {294935CE-F637-4E7C-A41B-AB255460B862} *\/ */
-/* /\* // *\/ */
-/* /\* // interface IPolicyConfigVista *\/ */
-/* /\* // {568b9108-44bf-40b4-9006-86afe5b5a620} *\/ */
-/* /\* // *\/ */
-/* /\* // Query interface: *\/ */
-/* /\* // CComPtr PolicyConfig; *\/ */
-/* /\* // PolicyConfig.CoCreateInstance(__uuidof(CPolicyConfigVistaClient)); *\/ */
-/* /\* // *\/ */
-/* /\* // @compatible: Windows Vista and Later *\/ */
-/* /\* // ---------------------------------------------------------------------------- *\/ */
-/* /\* interface IPolicyConfigVista : public IUnknown *\/ */
-/* /\* { *\/ */
-/* /\* public: *\/ */
-
-/* /\* virtual HRESULT GetMixFormat( *\/ */
-/* /\* PCWSTR, *\/ */
-/* /\* WAVEFORMATEX ** *\/ */
-/* /\* ); // not available on Windows 7, use method from IPolicyConfig *\/ */
-
-/* /\* virtual HRESULT STDMETHODCALLTYPE GetDeviceFormat( *\/ */
-/* /\* PCWSTR, *\/ */
-/* /\* INT, *\/ */
-/* /\* WAVEFORMATEX ** *\/ */
-/* /\* ); *\/ */
-
-/* /\* virtual HRESULT STDMETHODCALLTYPE SetDeviceFormat( *\/ */
-/* /\* PCWSTR, *\/ */
-/* /\* WAVEFORMATEX *, *\/ */
-/* /\* WAVEFORMATEX * *\/ */
-/* /\* ); *\/ */
-
-/* /\* virtual HRESULT STDMETHODCALLTYPE GetProcessingPeriod( *\/ */
-/* /\* PCWSTR, *\/ */
-/* /\* INT, *\/ */
-/* /\* PINT64, *\/ */
-/* /\* PINT64 *\/ */
-/* /\* ); // not available on Windows 7, use method from IPolicyConfig *\/ */
-
-/* /\* virtual HRESULT STDMETHODCALLTYPE SetProcessingPeriod( *\/ */
-/* /\* PCWSTR, *\/ */
-/* /\* PINT64 *\/ */
-/* /\* ); // not available on Windows 7, use method from IPolicyConfig *\/ */
-
-/* /\* virtual HRESULT STDMETHODCALLTYPE GetShareMode( *\/ */
-/* /\* PCWSTR, *\/ */
-/* /\* struct DeviceShareMode * *\/ */
-/* /\* ); // not available on Windows 7, use method from IPolicyConfig *\/ */
-
-/* /\* virtual HRESULT STDMETHODCALLTYPE SetShareMode( *\/ */
-/* /\* PCWSTR, *\/ */
-/* /\* struct DeviceShareMode * *\/ */
-/* /\* ); // not available on Windows 7, use method from IPolicyConfig *\/ */
-
-/* /\* virtual HRESULT STDMETHODCALLTYPE GetPropertyValue( *\/ */
-/* /\* PCWSTR, *\/ */
-/* /\* const PROPERTYKEY &, *\/ */
-/* /\* PROPVARIANT * *\/ */
-/* /\* ); *\/ */
-
-/* /\* virtual HRESULT STDMETHODCALLTYPE SetPropertyValue( *\/ */
-/* /\* PCWSTR, *\/ */
-/* /\* const PROPERTYKEY &, *\/ */
-/* /\* PROPVARIANT * *\/ */
-/* /\* ); *\/ */
-
-/* /\* virtual HRESULT STDMETHODCALLTYPE SetDefaultEndpoint( *\/ */
-/* /\* __in PCWSTR wszDeviceId, *\/ */
-/* /\* __in ERole eRole *\/ */
-/* /\* ); *\/ */
-
-/* /\* virtual HRESULT STDMETHODCALLTYPE SetEndpointVisibility( *\/ */
-/* /\* PCWSTR, *\/ */
-/* /\* INT *\/ */
-/* /\* ); // not available on Windows 7, use method from IPolicyConfig *\/ */
-/* /\* }; *\/ */
diff --git a/src/back/msinclude.h b/src/back/msinclude.h
index 52fccbd..fc7beac 100644
--- a/src/back/msinclude.h
+++ b/src/back/msinclude.h
@@ -1,23 +1,17 @@
#pragma once
+#define _WIN32_WINNT 0x0A00
#include
//done by qt by def #define UNICODE
#include
-#include
-#include
-#include
-#include
-#include
#include
#include
#include
#include
#include
-#include
#include
-#include
//#include
#include
@@ -27,38 +21,6 @@
//#include
#include
#include
+#include "ipolicyconfig.h"
#include
#include
-#include
-
-#include "ipolicyconfig.h"
-#include "audiometerinfo.h"
-
-// IAudioMeterInformation
-/* GUID manual; */
-/* manual.Data1 = 0xc02216f6; */
-/* manual.Data2 = 0x8c67; */
-/* manual.Data3 = 0x4b5b; */
-/* manual.Data4[0] = 0x9d; */
-/* manual.Data4[1] = 0x00; */
-/* manual.Data4[2] = 0xd0; */
-/* manual.Data4[3] = 0x08; */
-/* manual.Data4[4] = 0xe7; */
-/* manual.Data4[5] = 0x3e; */
-/* manual.Data4[6] = 0x00; */
-/* manual.Data4[7] = 0x64; */
-//if(FAILED(endpoint->Activate((const _GUID) manual,
-
-//IMMEndpoint
-/* GUID manual; */
-/* manual.Data1 = 0x1be09788; */
-/* manual.Data2 = 0x6894; */
-/* manual.Data3 = 0x4089; */
-/* manual.Data4[0] = 0x85; */
-/* manual.Data4[1] = 0x86; */
-/* manual.Data4[2] = 0x9a; */
-/* manual.Data4[3] = 0x2a; */
-/* manual.Data4[4] = 0x6c; */
-/* manual.Data4[5] = 0x26; */
-/* manual.Data4[6] = 0x5a; */
-/* manual.Data4[7] = 0xc5; */
diff --git a/src/back/reimpl/audiometerinfo.h b/src/back/reimpl/audiometerinfo.h
deleted file mode 100644
index 618ad34..0000000
--- a/src/back/reimpl/audiometerinfo.h
+++ /dev/null
@@ -1,130 +0,0 @@
-#ifndef __IAudioMeterInformation_FWD_DEFINED__
-#define __IAudioMeterInformation_FWD_DEFINED__
-typedef interface IAudioMeterInformation IAudioMeterInformation;
-
-#endif /* __IAudioMeterInformation_FWD_DEFINED__ */
-
-#ifdef __cplusplus
-extern "C"{
-#endif
-
-/* interface __MIDL_itf_endpointvolume_0000_0003 */
-/* [local] */
-
-#ifndef __IAudioMeterInformation_INTERFACE_DEFINED__
-#define __IAudioMeterInformation_INTERFACE_DEFINED__
-
-/* interface IAudioMeterInformation */
-/* [unique][helpstring][nonextensible][uuid][local][object] */
-
-DEFINE_GUID(IID_IAudioMeterInformation, 0xc02216f6, 0x8c67, 0x4b5b, 0x9d,0x00, 0xd0,0x08,0xe7,0x3e,0x00,0x64);
-#if defined(__cplusplus) && !defined(CINTERFACE)
-
- MIDL_INTERFACE("c02216f6-8c67-4b5b-9d00-d008e73e0064")
- IAudioMeterInformation : public IUnknown
- {
- public:
- virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetPeakValue(
- /* [out] */ float *pfPeak) = 0;
-
- virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetMeteringChannelCount(
- /* [annotation][out] */
- _Out_ UINT *pnChannelCount) = 0;
-
- virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetChannelsPeakValues(
- /* [in] */ UINT32 u32ChannelCount,
- /* [size_is][out] */ float *afPeakValues) = 0;
-
- virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE QueryHardwareSupport(
- /* [annotation][out] */
- _Out_ DWORD *pdwHardwareSupportMask) = 0;
-
- };
-
-#ifdef __CRT_UUID_DECL
-__CRT_UUID_DECL(IAudioMeterInformation, 0xc02216f6, 0x8c67, 0x4b5b, 0x9d,0x00, 0xd0,0x08,0xe7,0x3e,0x00,0x64)
-#endif
-#else /* C style interface */
-
- typedef struct IAudioMeterInformationVtbl
- {
- BEGIN_INTERFACE
-
- HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
- IAudioMeterInformation * This,
- /* [in] */ REFIID riid,
- /* [annotation][iid_is][out] */
- _COM_Outptr_ void **ppvObject);
-
- ULONG ( STDMETHODCALLTYPE *AddRef )(
- IAudioMeterInformation * This);
-
- ULONG ( STDMETHODCALLTYPE *Release )(
- IAudioMeterInformation * This);
-
- /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *GetPeakValue )(
- IAudioMeterInformation * This,
- /* [out] */ float *pfPeak);
-
- /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *GetMeteringChannelCount )(
- IAudioMeterInformation * This,
- /* [annotation][out] */
- _Out_ UINT *pnChannelCount);
-
- /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *GetChannelsPeakValues )(
- IAudioMeterInformation * This,
- /* [in] */ UINT32 u32ChannelCount,
- /* [size_is][out] */ float *afPeakValues);
-
- /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *QueryHardwareSupport )(
- IAudioMeterInformation * This,
- /* [annotation][out] */
- _Out_ DWORD *pdwHardwareSupportMask);
-
- END_INTERFACE
- } IAudioMeterInformationVtbl;
-
- interface IAudioMeterInformation
- {
- CONST_VTBL struct IAudioMeterInformationVtbl *lpVtbl;
- };
-
-
-
-#ifdef COBJMACROS
-
-
-#define IAudioMeterInformation_QueryInterface(This,riid,ppvObject) \
- ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
-
-#define IAudioMeterInformation_AddRef(This) \
- ( (This)->lpVtbl -> AddRef(This) )
-
-#define IAudioMeterInformation_Release(This) \
- ( (This)->lpVtbl -> Release(This) )
-
-
-#define IAudioMeterInformation_GetPeakValue(This,pfPeak) \
- ( (This)->lpVtbl -> GetPeakValue(This,pfPeak) )
-
-#define IAudioMeterInformation_GetMeteringChannelCount(This,pnChannelCount) \
- ( (This)->lpVtbl -> GetMeteringChannelCount(This,pnChannelCount) )
-
-#define IAudioMeterInformation_GetChannelsPeakValues(This,u32ChannelCount,afPeakValues) \
- ( (This)->lpVtbl -> GetChannelsPeakValues(This,u32ChannelCount,afPeakValues) )
-
-#define IAudioMeterInformation_QueryHardwareSupport(This,pdwHardwareSupportMask) \
- ( (This)->lpVtbl -> QueryHardwareSupport(This,pdwHardwareSupportMask) )
-
-#endif /* COBJMACROS */
-
-#endif /* C style interface */
-
-#endif /* __IAudioMeterInformation_INTERFACE_DEFINED__ */
-
-#ifdef __cplusplus
-}
-#endif
-
-
-
diff --git a/src/cont/contclasses.cpp b/src/cont/contclasses.cpp
index d2188f0..38c30b1 100644
--- a/src/cont/contclasses.cpp
+++ b/src/cont/contclasses.cpp
@@ -1,37 +1,27 @@
#include "backlasses.h"
#include "contclasses.h"
-
-void setConfigDirToDefaults() {
- #define tryFileDir(dir, create) do { \
- OverseerHandler::settingsPath = Environment::createSettingsPath(dir); \
- set = ini::UserSettings::createSettings(OverseerHandler::settingsPath.c_str(), create); \
- if(set) { \
- return; \
- } else OverseerHandler::settingsPath.clear(); \
- } while(0)
- #define tryOpenFileDir(dir) tryFileDir(dir, false)
- #define tryCreateFileDir(dir) tryFileDir(dir, true)
-
- tryOpenFileDir(SettingsTargetDirectory::APP_PATH);
- tryOpenFileDir(SettingsTargetDirectory::HOME_DIR);
- tryCreateFileDir(SettingsTargetDirectory::HOME_DIR);
- tryCreateFileDir(SettingsTargetDirectory::APP_PATH);
-
- return;
- #undef tryOpenFileDir
- #undef tryCreateFileDir
- #undef tryFileDir
-}
+//TODO: pragma once
EndpointHandler::EndpointHandler(uint64_t idx, Flows flow) {
+ //std::vector endpoints = osh->getPlaybackEndpoints().at(idx);
this->idx = idx;
this->flow = flow;
this->ep = (flow == Flows::FLOW_PLAYBACK ? osh->getPlaybackEndpoints().at(idx) : osh->getCaptureEndpoints().at(idx));
+ epc = new EndpointVolumeCallback(ep);
+ ensc = new EndpointNewSessionCallback(this);
this->callbackInfo.caller = osh->getGuid();
+ ep->registerNewSessionNotification(ensc);
//epName = ep->getName();
this->setBackEndpointVolumeCallbackInfoContent(this->getState());
osh->pushBackEndpointHandler(this, flow);
+
+ if (this->flow == Flows::FLOW_PLAYBACK) {
+ for (int i = 0; i < this->getSessionCount(); i++) {
+ SessionHandler* sessionHandler = new SessionHandler(this, this->getSessions().at(i),i);
+ sessionHandlers.push_back(sessionHandler);
+ }
+ }
}
void OverseerHandler::pushBackEndpointHandler(EndpointHandler* eph, Flows flow) {
@@ -60,6 +50,16 @@ Flows EndpointHandler::getFlow(){
return ep->getFlow();
}
+/* these two, currently unused. If I use them, I should feel bad.
+ * Endpoint* EndpointHandler::getEndpoint() {
+ * return this->ep;
+ * }
+ *
+ * EndpointVolumeCallback* EndpointHandler::getEndpointVolumeCallback() {
+ * return this->epc;
+ * }
+ */
+
BackEndpointVolumeCallbackInfo* EndpointHandler::getCallbackInfo(){
return &this->callbackInfo;
}
@@ -114,10 +114,7 @@ void EndpointHandler::setBackEndpointVolumeCallbackInfoContent(uint8_t state) {
callbackInfo.muted = this->getMute();
callbackInfo.mainVolume = this->getVolume(AudioChannel::CHANNEL_MAIN);
callbackInfo.channels = this->getChannelCount();
- if (!epc) {
- epc = new EndpointVolumeCallback(ep);
- ep->setVolumeCallback(epc);
- }
+ ep->setVolumeCallback(epc);
callbackInfo.channelVolumes.resize(this->callbackInfo.channels);
for(uint32_t i = 0; i < this->getChannelCount(); i++){
callbackInfo.channelVolumes.at(i) = this->getVolume(i);
@@ -125,21 +122,17 @@ void EndpointHandler::setBackEndpointVolumeCallbackInfoContent(uint8_t state) {
}
}
-void EndpointHandler::setState(EndpointState state){
+void EndpointHandler::setState(uint8_t state){
ep->setState(state);
this->setBackEndpointVolumeCallbackInfoContent(state);
}
-void EndpointHandler::setState(EndpointState state, uint64_t index){
+void EndpointHandler::setState(uint8_t state, uint64_t index){
ep->setState(state);
this->setFrontVisibilityInfo((EndpointState)state, index);
this->setBackEndpointVolumeCallbackInfoContent(state);
}
-float EndpointHandler::getPeakVolume() {
- return ep->getPeakVolume();
-}
-
uint8_t EndpointHandler::getRoles(){
return ep->getRoles();
}
@@ -182,15 +175,10 @@ Endpoint* EndpointHandler::getEndpoint() {
}
void EndpointHandler::addSessionSendFront(Session* session) {
- if(!ep->endpointSessionsMutex.try_lock()) return;
- sessionHandlersMutex.lock();
-
- this->ep->addSession(session);
+ ep->addSession(session);
+
SessionHandler* sessionHandler = new SessionHandler(this, session, (getSessionCount() - 1));
-
sessionHandlers.push_back(sessionHandler);
- ep->endpointSessionsMutex.unlock();
- sessionHandlersMutex.unlock();
this->addSessionWidget(sessionHandler);
}
@@ -202,49 +190,6 @@ void EndpointHandler::removeSessionFromFront(SessionHandler* sh) {
this->removeSessionWidget(sh);
}
-void EndpointHandler::deleteSessions() {
- ep->unregisterNewSessionNotification(ensc);
- ensc->Release();
- ensc = nullptr;
- for (auto sh : sessionHandlers) {
- delete sh;
- }
- sessionHandlers.resize(0);
- ep->deleteSessions();
- //ep->deleteSessionManager();
-}
-
-void EndpointHandler::createSessionHandlers() {
- ep->activateEndpointSessions();
- if (this->flow == Flows::FLOW_PLAYBACK) {
- for (int i = 0; i < this->getSessionCount(); i++) {
- SessionHandler* sessionHandler = new SessionHandler(this, this->getSessions().at(i),i);
- sessionHandlers.push_back(sessionHandler);
- }
- }
-}
-
-void EndpointHandler::createSessionHandlersCallback() {
- ensc = new EndpointNewSessionCallback(this);
- ep->registerNewSessionNotification(ensc);
-}
-
-void EndpointHandler::lockSessionCollections() {
- this->sessionHandlersMutex.lock();
- this->ep->endpointSessionsMutex.lock();
-}
-
-void EndpointHandler::unlockSessionCollections() {
- this->sessionHandlersMutex.unlock();
- this->ep->endpointSessionsMutex.unlock();
-}
-
-void EndpointHandler::removeVolumeCallback() {
- ep->removeVolumeCallback(epc);
- epc->Release();
- epc = nullptr;
-}
-
EndpointHandler::~EndpointHandler() {
ep->removeVolumeCallback(epc);
ep->unregisterNewSessionNotification(ensc);
@@ -256,46 +201,6 @@ OverseerHandler::OverseerHandler() {
this->os = new Overseer();
}
-void OverseerHandler::setSettingsPath(std::string path) {
- OverseerHandler::settingsPath = path;
-}
-
-std::string OverseerHandler::getSettingsPath(){
- return OverseerHandler::settingsPath;
-}
-
-void OverseerHandler::updateStartupConfig(bool onStartup) {
- Environment::updateStartupConfig(onStartup);
-}
-
-void OverseerHandler::setStartupConfig(bool onStartup) {
- Environment::setStartupConfig(onStartup);
-}
-
-void OverseerHandler::populateSystemValues() {
- Environment::populateSystemValues();
-}
-
-void OverseerHandler::openControlPanel() {
- Environment::openControlPanel();
-}
-
-ProcessedNativeEvent OverseerHandler::processTopLevelWindowMessage(void* msg) {
- return Environment::processTopLevelWindowMessage(msg);
-}
-
-bool OverseerHandler::isLightMode() {
- return Environment::isLightMode();
-}
-
-bool OverseerHandler::isToRunAtStartup() {
- return Environment::isToRunAtStartup();
-}
-
-uint32_t OverseerHandler::getAccentColor() {
- return Environment::getAccentColor();
-}
-
std::vector OverseerHandler::getPlaybackEndpoints() {
return this->os->getPlaybackEndpoints();
}
@@ -320,7 +225,7 @@ uint64_t OverseerHandler::getCaptureEndpointsCount(){
return this->os->getCaptureEndpoints().size();
}
-void OverseerHandler::createEndpointHandlers(){
+void OverseerHandler::reloadEndpointHandlers(){
//todo: add capture
//std::vector* ephs = new std::vector;
@@ -328,7 +233,9 @@ void OverseerHandler::createEndpointHandlers(){
for(uint64_t i = 0; i < this->getPlaybackEndpointsCount(); i++){
log_debugcpp("Creating Playback handler " + std::to_string(i));
- new EndpointHandler(i, Flows::FLOW_PLAYBACK);
+
+ EndpointHandler* ephexx = new EndpointHandler(i, Flows::FLOW_PLAYBACK);
+ //this->playbackEndpointHandlers.push_back(ephexx);
log_debugcpp("Created Playback handler " + std::to_string(i) + ", adding to vector. " + " VSize: " + std::to_string(this->playbackEndpointHandlers.size()));
}
@@ -336,71 +243,55 @@ void OverseerHandler::createEndpointHandlers(){
log_debugcpp("Capture VSize: " +
std::to_string(this->getCaptureEndpointsCount()));
- for(uint64_t i = 0; i < this->getCaptureEndpointsCount(); i++) {
+ for(uint64_t i = 0; i < this->getCaptureEndpointsCount(); i++){
log_debugcpp("Creating Capture handler " + std::to_string(i));
- new EndpointHandler(i, Flows::FLOW_CAPTURE);
+
+ /*
+ * if(i < (this->captureEndpointHandlers.size()) &&
+ * this->captureEndpointHandlers.at(i) != nullptr)
+ * delete captureEndpointHandlers.at(i);
+ */
+
+ EndpointHandler* ephoo = new EndpointHandler(i, Flows::FLOW_CAPTURE);
+ //this->captureEndpointHandlers.push_back(ephoo);
log_debugcpp("Created Capture handler " + std::to_string(i) + ", adding to vector. " + " VSize: " + std::to_string(this->captureEndpointHandlers.size()));
+
/*
* if (i >= this->captureEndpointHandlers.size())
* captureEndpointHandlers.push_back(eph);
* else captureEndpointHandlers.at(i) = eph;
*/
}
- os->registerEndpointSituationCallback();
+ //setEndpointHandlers(ephs);
}
-EndpointHandler* OverseerHandler::addEndpoint(std::wstring endpointId, /* out */ Flows *flow = nullptr) {
- //This method is only called from the new endpoint callback and its subsequent thread
+EndpointHandler* OverseerHandler::addEndpoint(std::wstring endpointId, /* out */ Flows *flow = nullptr){
Flows localFlow;
Endpoint* newEp = this->os->addEndpoint(endpointId, &localFlow);
uint64_t ephIdx = (localFlow == Flows::FLOW_PLAYBACK ? this->getPlaybackEndpointsCount() : this->getCaptureEndpointsCount()) - 1;
EndpointHandler* newEph = new EndpointHandler(ephIdx, localFlow);
+ // std::vector getPlaybackEndpointHandlers();
+ //std::vector getCaptureEndpointHandlers();
if (flow != nullptr) *flow = localFlow;
return newEph;
}
-void OverseerHandler::reportFinishedStateChange() {
- os->reportFinishedStateChange();
-}
-
NGuid OverseerHandler::getGuid() {
return this->os->getGuid();
}
-/*
- * void OverseerHandler::setChangeFrontDefaultsFunction(std::function changeFrontDefaults){
- * this->changeFrontDefaults = changeFrontDefaults;
- * }
- *
- * void OverseerHandler::changeFrontDefaultsCallback(Roles role, std::wstring endpointId) {
- * this->changeFrontDefaults(role, endpointId);
- * }
- */
-
-void OverseerHandler::roleBucketEntryCallback(Roles role, std::wstring endpointId){
- this->roleBucketEntry(role, endpointId);
+void OverseerHandler::setChangeFrontDefaultsFunction(std::function changeFrontDefaults){
+ this->changeFrontDefaults = changeFrontDefaults;
}
-void OverseerHandler::setRoleBucketEntryFunction(std::function roleBucketEntry) {
- this->roleBucketEntry = roleBucketEntry;
-}
-
-void OverseerHandler::updateFrontEndpointName(Endpoint* ep) {
- //todo: reintroduce capture devices
- for (auto eph : playbackEndpointHandlers) {
- if (eph->getEndpoint() == ep) eph->getCallbackInfo()->updateName = true;
- }
+void OverseerHandler::changeFrontDefaultsCallback(Roles role, std::wstring endpointId) {
+ this->changeFrontDefaults(role, endpointId);
}
void OverseerHandler::reviseEndpointShowing(std::wstring endpointId, EndpointState state) {
- //TODO: Race condition!!!!!
std::vector allHandlers;
- handlersPlaybackMutex.lock();
- handlersCaptureMutex.lock();
- os->playbackMutex.lock();
- os->captureMutex.lock();
allHandlers.insert(allHandlers.end(), this->captureEndpointHandlers.begin(), this->captureEndpointHandlers.end());
allHandlers.insert(allHandlers.end(), this->playbackEndpointHandlers.begin(), this->playbackEndpointHandlers.end());
EndpointHandler* eph = nullptr;
@@ -414,29 +305,22 @@ void OverseerHandler::reviseEndpointShowing(std::wstring endpointId, EndpointSta
//debug
Flows flow;
if (!eph) {
- if (state ^ EndpointState::ENDPOINT_ACTIVE) goto end;
+ if (state ^ EndpointState::ENDPOINT_ACTIVE) return;
+ //return;
//flow = Flows::FLOW_CAPTURE;
eph = osh->addEndpoint(endpointId, &flow);
} else
flow = eph->getFlow();
//todo: mic done but disabled. Tab-kun will come...
- if (flow == Flows::FLOW_CAPTURE) goto end;
+ if (flow == Flows::FLOW_CAPTURE) return;
- if (eph && EndpointState::ENDPOINT_ACTIVE & state) {
- eph->setState(EndpointState::ENDPOINT_ACTIVE);
+
+ if(eph && EndpointState::ENDPOINT_ACTIVE & state) {
this->addEndpointWidget(eph);
- } else if (eph && eph->getFrontVisibilityState() == EndpointState::ENDPOINT_ACTIVE) {
- eph->removeVolumeCallback();
+ } else if (eph && eph->getFrontVisibilityState() == EndpointState::ENDPOINT_ACTIVE){
this->removeEndpointWidget(eph->getFrontVisibilityIndex());
}
-
- end:
- handlersPlaybackMutex.unlock();
- handlersCaptureMutex.unlock();
- os->playbackMutex.unlock();
- os->captureMutex.unlock();
- os->reportFinishedStateChange();
return;
}
@@ -451,14 +335,3 @@ void OverseerHandler::setRemoveEndpointWidgetFunction(std::function ephs){
this->playbackEndpointHandlers = ephs;
}
-
-void OverseerHandler::lockEndpoints() {
- os->playbackMutex.lock();
- os->captureMutex.lock();
-}
-
-void OverseerHandler::unlockEndpoints() {
- os->playbackMutex.unlock();
- os->captureMutex.unlock();
-}
-
diff --git a/src/cont/contclasses.h b/src/cont/contclasses.h
index cd0e03e..25fcaea 100644
--- a/src/cont/contclasses.h
+++ b/src/cont/contclasses.h
@@ -1,7 +1,6 @@
#pragma once
#include "global.h"
-#include "settings.h"
#include "contsessionclasses.h"
//#define invoke_mem_fn(object,ptrToMember) ((object).*(ptrToMember))
//#define pinvoke_mem_fn(object,ptrToMember) ((object)->*(ptrToMember))
@@ -17,21 +16,21 @@ struct BackEndpointVolumeCallbackInfo {
NGuid caller;
bool muted;
float mainVolume;
- size_t channels;
+ size_t channels;
std::vector channelVolumes;
- bool updateName = false;
};
-void setConfigDirToDefaults();
-
class EndpointHandler {
public:
EndpointHandler(uint64_t idx, Flows flow);
void setBackEndpointVolumeCallbackInfoContent(uint8_t state);
- //todo: replace all getEndpointHandler()
- //todo: name refactor
+ //these two, currently unused. If I use them, I should feel bad.
+ //EndpointVolumeCallback* getEndpointVolumeCallback();
+ //Endpoint* getEndpoint();
+
+ //std::wstring epName;
BackEndpointVolumeCallbackInfo* getCallbackInfo();
uint32_t getChannelCount();
@@ -40,7 +39,6 @@ public:
void setVolume(int channel, float volume);
std::wstring getName();
- void setName(std::wstring newName);
std::wstring getId();
void setFrontVisibilityInfo(EndpointState state, uint64_t frontIdx);
@@ -58,10 +56,9 @@ public:
void setVolume(NGuid guid, int channel, int value);
void setMute(NGuid guid, bool muted);
- void setState(EndpointState state);
- void setState(EndpointState state, uint64_t idx);
+ void setState(uint8_t state);
+ void setState(uint8_t state, uint64_t idx);
- float getPeakVolume();
/* sessions */
size_t getSessionCount();
std::vector getSessionHandlers();
@@ -74,13 +71,6 @@ public:
void setRemoveSessionWidgetFunction(std::function removeSessionWidget);
void sendSessionToFront(SessionHandler* sh);
void removeSessionFromFront(SessionHandler* sh);
- void deleteSessions();
- void createSessionHandlers();
- void createSessionHandlersCallback();
- std::mutex sessionHandlersMutex;
- void lockSessionCollections();
- void unlockSessionCollections();
- void removeVolumeCallback();
~EndpointHandler();
private:
@@ -107,25 +97,9 @@ class OverseerHandler {
public:
OverseerHandler();
- static void setSettingsPath(std::string path);
- static std::string getSettingsPath();
- static inline std::string settingsPath;
- void updateStartupConfig(bool onStartup);
- void setStartupConfig(bool onStartup);
- void populateSystemValues();
- void openControlPanel();
- ProcessedNativeEvent processTopLevelWindowMessage(void* msg);
- bool isLightMode();
- bool isToRunAtStartup();
- uint32_t getAccentColor();
-
- //void setChangeFrontDefaultsFunction(std::function changeFrontDefaults);
- //void changeFrontDefaultsCallback(Roles role, std::wstring endpointId);
+ void setChangeFrontDefaultsFunction(std::function changeFrontDefaults);
+ void changeFrontDefaultsCallback(Roles role, std::wstring endpointId);
- void roleBucketEntryCallback(Roles role, std::wstring endpointId);
- void setRoleBucketEntryFunction(std::function roleBucketEntry);
-
- void updateFrontEndpointName(Endpoint* ep);
//void setReviseEndpointShowingFunction(std::function reviseEndpointShowing);
void reviseEndpointShowing(std::wstring endpointId, EndpointState state);
void setRemoveEndpointWidgetFunction(std::function removeEndpointWidget);
@@ -139,29 +113,25 @@ public:
void pushBackEndpointHandler(EndpointHandler* eph, Flows flow);
uint64_t getPlaybackEndpointsCount();
uint64_t getCaptureEndpointsCount();
- void createEndpointHandlers();
- EndpointHandler* addEndpoint(std::wstring endpointId, Flows *flow);
- void reportFinishedStateChange();
+ void reloadEndpointHandlers();
+ EndpointHandler* addEndpoint(std::wstring endpointId, Flows *flow);
NGuid getGuid();
- std::mutex handlersPlaybackMutex;
- std::mutex handlersCaptureMutex;
- void lockEndpoints();
- void unlockEndpoints();
+ /*
+ * void setSessionVolumeCallback(std::function changeSessionVolume);
+ * void setSessionVolume(float newValue, );
+ */
private:
Overseer *os;
std::vector playbackEndpointHandlers;
std::vector captureEndpointHandlers;
-
std::function changeFrontDefaults;
std::function removeEndpointWidget;
std::function addEndpointWidget;
- std::function roleBucketEntry;
-
+
/* Session's */
std::function changeSessionVolume;
-
//std::function updateFrontVolumeCallback;
//std::function updateFrontMuteCallback;
diff --git a/src/cont/contsessionclasses.cpp b/src/cont/contsessionclasses.cpp
index 0f6caaf..155c0e1 100644
--- a/src/cont/contsessionclasses.cpp
+++ b/src/cont/contsessionclasses.cpp
@@ -5,7 +5,7 @@ SessionHandler::SessionHandler(EndpointHandler* eph, Session* session, size_t id
this->eph = eph;
this->idx = idx;
this->session = session;
-
+
this->svi.mainVolume = session->getVolume(AudioChannel::CHANNEL_MAIN);
this->svi.muted = session->getMute();
this->svi.caller = osh->getGuid();
@@ -32,14 +32,6 @@ std::wstring SessionHandler::getName(){
return session->getName();
}
-void SessionHandler::setName(std::wstring newName){
- session->setName(newName);
-}
-
-float SessionHandler::getPeakVolume(){
- return session->getPeakVolume();
-}
-
bool SessionHandler::getMute(){
return session->getMute();
}
@@ -85,7 +77,3 @@ void SessionHandler::reviseSessionShowing(SessionState state) {
}
}
-SessionHandler::~SessionHandler() {
- session->removeStateCallback(ssc);
- ssc->Release();
-}
diff --git a/src/cont/contsessionclasses.h b/src/cont/contsessionclasses.h
index 24c0ba7..51f620f 100644
--- a/src/cont/contsessionclasses.h
+++ b/src/cont/contsessionclasses.h
@@ -9,10 +9,10 @@ class SessionStateCallback;
struct SessionVolumeInfo {
//SessionVolumeInfo(bool muted, float mainVolume);
- bool muted;
- float mainVolume;
- NGuid caller;
- std::atomic isNameChanged = false;
+ bool muted;
+ float mainVolume;
+ NGuid caller;
+
//size_t channels;
//std::vector channelVolumes;
};
@@ -29,11 +29,9 @@ class SessionHandler {
void setState(SessionState state);
uint64_t getFrontIndex();
std::wstring getName();
- float getPeakVolume();
- void setName(std::wstring newName);
void reviseSessionShowing(SessionState state);
SessionVolumeInfo* getVolumeInfo();
- ~SessionHandler();
+
private:
SessionVolumeInfo svi;
EndpointHandler* eph;
diff --git a/src/debug.h b/src/debug.h
index 61855c1..da6285c 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -2,38 +2,11 @@
#if defined (QT_DEBUG) || defined (DEBUG) || defined (_DEBUG)
-#define PIPE_NAME "Mixerq-dev"
-
-#ifdef INIT_FILELOG
- std::wstring_convert, wchar_t> converter;
- FILE* fileLog;
- errno_t lfResult;
- bool writable = false;
-
- void inline initializeFileLogging() {
- lfResult = fopen_s(&fileLog, "log.txt", "w");
- if (!lfResult) writable = true;
- else writable = false;
- }
-
-#else
- extern std::wstring_convert, wchar_t> converter;
- extern errno_t lfResult;
- extern FILE* fileLog;
- extern bool writable;
- extern bool initializeFileLogging();
-#endif
-
-#define initialize_file_log() initializeFileLogging()
-
-template
-std::bitset varToBitset(T info) {
- std::bitset content(info);
+template
+std::bitset varToBitset(T info) {
+ std::bitset content(info);
return content;
-}
-
-#define print_as_binary(info) varToBitset(info).to_string()
-
+}
#ifndef _WIN32
#define log_debugcpp(str) do { \
std::cout << "[DEBUG]" << "(" << __FILE__ << ":" << __LINE__ << "): " << str << std::endl; \
@@ -42,7 +15,6 @@ std::bitset varToBitset(T info) {
#define log_wdebugcpp(str) do { \
std::wcout << "[DEBUG]" << "(" << __FILE__ << ":" << __LINE__ << "): " << str << std::endl; \
} while (0)
-
#else
#include
@@ -57,30 +29,19 @@ std::bitset varToBitset(T info) {
#define log_wdebugcpp(str) do { \
OutputDebugStringW(std::wstring(L"[DEBUG] (" + std::wstring(WFILE) + L":" + std::to_wstring(__LINE__) + L"): " + std::wstring(str) +L"\n").c_str()); \
} while (0)
+#endif
-#endif //_WIN32
-
-#define log_to_file(fmt, cnt...) do { \
- if(writable) fprintf_s(fileLog, fmt,##cnt); \
-} while (0)
-
-#define close_file_log_buffer() do { \
- if(writable) { fflush(fileLog); fclose(fileLog); } \
-} while (0)
+#define print_as_binary(len, type, info) varToBitset(info)
#else
#define log_debugcpp(str)
#define log_wdebugcpp(str)
-#define print_as_binary(info)
-#define log_to_file(fmt, cnt...)
-#define initialize_file_log() false
-#define close_file_log_buffer()
-#define PIPE_NAME "Mixerq"
-#endif //DEBUG
+#define print_as_binary(len, type, info)
+#endif
/* Here as a quick reference, in case smthn similar is needed again */
/* typedef void (EndpointWidget::*epwMuteFunc)(bool muted); */
-/* Typedef void (EndpointWidget::*epwMainVolumeFunc)(float newValue); */
+/* typedef void (EndpointWidget::*epwMainVolumeFunc)(float newValue); */
/* typedef void (EndpointWidget::*epwChannelVolumeFunc)(uint32_t channel, float newValue); */
/* typedef void (EndpointWidget::*epwToggleFrontFunc)(bool active); */
diff --git a/src/global.h b/src/global.h
index 8799892..292ec06 100644
--- a/src/global.h
+++ b/src/global.h
@@ -1,26 +1,15 @@
#pragma once
-#define __STDC_WANT_LIB_EXT1__ 1
-#include
-#include
-#include
-#include
#include
#include
#include
#include
+#include
#include
-#include