fix(audio) refactor to match bits-per-sample to default device in all cases

Author: andygrundman

src/platform/windows/audio.cpp

@@ -131,7 +131,7 @@ namespace {
       };
     } else if (channel_count == 6) {
       auto channel_mask1 = waveformat_mask_surround51_with_backspeakers;
-      auto channel_mask2 = waveformat_mask_surround51_with_sidespeakers; // XXX will never be used, but is probably the better 5.1 layout
+      auto channel_mask2 = waveformat_mask_surround51_with_sidespeakers;  // XXX will never be used, but is probably the better 5.1 layout
       return {
         create_waveformat(sample_format_e::f32, channel_count, channel_mask1),
         create_waveformat(sample_format_e::f32, channel_count, channel_mask2),
@@ -798,25 +798,20 @@ namespace platf::audio {
       // When switching to a Steam virtual speaker device, try to retain the bit depth of the
       // default audio device. Switching from a 16-bit device to a 24-bit one has been known to
       // cause glitches for some users.
-      bool use_16bit = false;
+      int wanted_bits_per_sample = 32;
       auto current_default_dev = default_device(device_enum);
       if (current_default_dev) {
         audio::prop_t prop;
         prop_var_t current_device_format;
-        prop_var_t current_device_friendly_name;
 
-        current_default_dev->OpenPropertyStore(STGM_READ, &prop);
-
-        if (SUCCEEDED(prop->GetValue(PKEY_AudioEngine_DeviceFormat, &current_device_format.prop))) {
-          WAVEFORMATEXTENSIBLE *format = (WAVEFORMATEXTENSIBLE *)current_device_format.prop.blob.pBlobData;
-          if (format->Format.wBitsPerSample < 24) {
-            if (SUCCEEDED(prop->GetValue(PKEY_Device_FriendlyName, &current_device_friendly_name.prop))) {
-              auto friendly_name = to_utf8(std::wstring(current_device_friendly_name.prop.pwszVal));
-              BOOST_LOG(info) << "Steam Streaming Speakers will use 16-bit to match default audio device: "sv << friendly_name;
-              use_16bit = true;
-            }
-          }
+        // clang-format off: avoid a long line and warnings about nested if statements
+        if ( SUCCEEDED(current_default_dev->OpenPropertyStore(STGM_READ, &prop))
+          && SUCCEEDED(prop->GetValue(PKEY_AudioEngine_DeviceFormat, &current_device_format.prop)) )
+        {
+          auto *format = (WAVEFORMATEXTENSIBLE *)current_device_format.prop.blob.pBlobData;
+          wanted_bits_per_sample = format->Samples.wValidBitsPerSample;
         }
+        // clang-format on
       }
 
       auto &device_id = virtual_sink_info->first;
@@ -828,7 +823,7 @@ namespace platf::audio {
         auto waveformat_copy = waveformat;
         auto waveformat_copy_pointer = reinterpret_cast<WAVEFORMATEX *>(&waveformat_copy);
 
-        if (use_16bit && waveformat.Samples.wValidBitsPerSample != 16) {
+        if (wanted_bits_per_sample != waveformat.Samples.wValidBitsPerSample) {
           continue;
         }