diff options
Diffstat (limited to 'src/mumble/ASIOInput.cpp')
-rw-r--r-- | src/mumble/ASIOInput.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/mumble/ASIOInput.cpp b/src/mumble/ASIOInput.cpp index 4f3150506..9742499a5 100644 --- a/src/mumble/ASIOInput.cpp +++ b/src/mumble/ASIOInput.cpp @@ -12,8 +12,6 @@ #include <cmath> -// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name -// (like protobuf 3.7 does). As such, for now, we have to make this our last include. #include "Global.h" // From os_win.cpp. @@ -76,7 +74,7 @@ void ASIOInit::initialize() { bool bFound = false; - if (!g.s.bASIOEnable) { + if (!Global::get().s.bASIOEnable) { qWarning("ASIOInput: ASIO forcefully disabled via 'asio/enable' config option."); return; } @@ -410,7 +408,7 @@ void ASIOConfig::clearQuery() { } ASIOInput::ASIOInput() { - QString qsCls = g.s.qsASIOclass; + QString qsCls = Global::get().s.qsASIOclass; CLSID clsid; iasio = nullptr; @@ -419,8 +417,8 @@ ASIOInput::ASIOInput() { // Sanity check things first. - iNumMic = g.s.qlASIOmic.count(); - iNumSpeaker = g.s.qlASIOspeaker.count(); + iNumMic = Global::get().s.qlASIOmic.count(); + iNumSpeaker = Global::get().s.qlASIOspeaker.count(); if ((iNumMic == 0) || (iNumSpeaker == 0)) { QMessageBox::warning(nullptr, QLatin1String("Mumble"), @@ -482,7 +480,7 @@ ASIOInput::ASIOInput() { int i, idx = 0; for (i = 0; i < iNumMic; i++) { abiInfo[idx].isInput = true; - abiInfo[idx].channelNum = g.s.qlASIOmic[i].toInt(); + abiInfo[idx].channelNum = Global::get().s.qlASIOmic[i].toInt(); aciInfo[idx].channel = abiInfo[idx].channelNum; aciInfo[idx].isInput = true; @@ -493,7 +491,7 @@ ASIOInput::ASIOInput() { } for (i = 0; i < iNumSpeaker; i++) { abiInfo[idx].isInput = true; - abiInfo[idx].channelNum = g.s.qlASIOspeaker[i].toInt(); + abiInfo[idx].channelNum = Global::get().s.qlASIOspeaker[i].toInt(); aciInfo[idx].channel = abiInfo[idx].channelNum; aciInfo[idx].isInput = true; |