32rc1 (#231)
* fixed UI error showing mic muted/un-muted * fixed mute glitch (work-around) * changed to RC status
This commit is contained in:
@@ -1 +1 @@
|
|||||||
3.1.0-dev
|
3.2.0-RC1
|
||||||
@@ -51,8 +51,6 @@ void AudioTabController::initStage1()
|
|||||||
reloadPttProfiles();
|
reloadPttProfiles();
|
||||||
reloadPttConfig();
|
reloadPttConfig();
|
||||||
reloadAudioProfiles();
|
reloadAudioProfiles();
|
||||||
// TODO Verify new defaults working as intended befoere removing
|
|
||||||
// applyDefaultProfile();
|
|
||||||
reloadAudioSettings();
|
reloadAudioSettings();
|
||||||
|
|
||||||
eventLoopTick();
|
eventLoopTick();
|
||||||
@@ -314,6 +312,7 @@ void AudioTabController::setMicVolume( float value, bool notify )
|
|||||||
void AudioTabController::setMicMuted( bool value, bool notify )
|
void AudioTabController::setMicMuted( bool value, bool notify )
|
||||||
{
|
{
|
||||||
std::lock_guard<std::recursive_mutex> lock( eventLoopMutex );
|
std::lock_guard<std::recursive_mutex> lock( eventLoopMutex );
|
||||||
|
|
||||||
if ( value != m_micMuted )
|
if ( value != m_micMuted )
|
||||||
{
|
{
|
||||||
m_micMuted = value;
|
m_micMuted = value;
|
||||||
@@ -581,6 +580,7 @@ void AudioTabController::setMirrorDeviceIndex( int index, bool notify )
|
|||||||
|
|
||||||
void AudioTabController::setMicDeviceIndex( int index, bool notify )
|
void AudioTabController::setMicDeviceIndex( int index, bool notify )
|
||||||
{
|
{
|
||||||
|
std::lock_guard<std::recursive_mutex> lock( eventLoopMutex );
|
||||||
if ( index != m_recordingDeviceIndex )
|
if ( index != m_recordingDeviceIndex )
|
||||||
{
|
{
|
||||||
if ( index >= 0
|
if ( index >= 0
|
||||||
@@ -588,13 +588,23 @@ void AudioTabController::setMicDeviceIndex( int index, bool notify )
|
|||||||
{
|
{
|
||||||
// un-mute mic before switching to ensure on exit all recording
|
// un-mute mic before switching to ensure on exit all recording
|
||||||
// devices will be un-muted
|
// devices will be un-muted
|
||||||
setMicMuted( false, false );
|
bool tempProx = false;
|
||||||
|
if ( micProximitySensorCanMute() )
|
||||||
|
{
|
||||||
|
setMicProximitySensorCanMute( false );
|
||||||
|
tempProx = true;
|
||||||
|
}
|
||||||
|
setMicMuted( false, true );
|
||||||
// code to just change Mic
|
// code to just change Mic
|
||||||
audioManager->setMicDevice(
|
audioManager->setMicDevice(
|
||||||
m_recordingDevices[static_cast<size_t>( index )].first,
|
m_recordingDevices[static_cast<size_t>( index )].first,
|
||||||
notify );
|
notify );
|
||||||
|
if ( tempProx )
|
||||||
|
{
|
||||||
|
setMicProximitySensorCanMute( true );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else if ( notify )
|
if ( notify )
|
||||||
{
|
{
|
||||||
emit micDeviceIndexChanged( m_recordingDeviceIndex );
|
emit micDeviceIndexChanged( m_recordingDeviceIndex );
|
||||||
}
|
}
|
||||||
@@ -1191,9 +1201,18 @@ int AudioTabController::getDefaultAudioProfileIndex()
|
|||||||
|
|
||||||
void AudioTabController::shutdown()
|
void AudioTabController::shutdown()
|
||||||
{
|
{
|
||||||
setMicMuted( false, false );
|
setMicMuted( false, true );
|
||||||
std::string mID;
|
std::string mID;
|
||||||
bool hasDefaultProfile = false;
|
bool hasDefaultProfile = false;
|
||||||
|
|
||||||
|
// Un-mutes mic to prevent confusion on exit.
|
||||||
|
|
||||||
|
setMicMuted( false );
|
||||||
|
|
||||||
|
// handles Setting Mirror back to User based settings
|
||||||
|
// since we have to change the Mirror Device via valve api.
|
||||||
|
// possibly could change windows tab controller to allow us to do
|
||||||
|
// natively.
|
||||||
for ( unsigned i = 0; i < audioProfiles.size(); i++ )
|
for ( unsigned i = 0; i < audioProfiles.size(); i++ )
|
||||||
{
|
{
|
||||||
auto& profile = audioProfiles[i];
|
auto& profile = audioProfiles[i];
|
||||||
|
|||||||
Reference in New Issue
Block a user