Use the device listener in Media on windows

content/browser/system_message_window_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/system_message_window_win.h"
 
 #include <dbt.h>
-#include <ks.h>
-#include <ksmedia.h>
 
 #include "base/logging.h"
 #include "base/system_monitor/system_monitor.h"
 #include "base/win/wrapped_window_proc.h"
+#include "media/audio/win/core_audio_util_win.h"
 
 namespace content {
 
 namespace {
+

[tommi (sloooow) - chröme, 2012/12/13 13:16:58]

no need for these whitespace changes.

[no longer working on chromium, 2012/12/13 14:54:58]

Done.

 const wchar_t kWindowClassName[] = L"Chrome_SystemMessageWindow";
 
 // A static map from a device category guid to base::SystemMonitor::DeviceType.
 struct {
   const GUID device_category;
   const base::SystemMonitor::DeviceType device_type;
 } const kDeviceCategoryMap[] = {
   { KSCATEGORY_AUDIO, base::SystemMonitor::DEVTYPE_AUDIO_CAPTURE },
   { KSCATEGORY_VIDEO, base::SystemMonitor::DEVTYPE_VIDEO_CAPTURE },
 };
+
 }  // namespace
 
 // Manages the device notification handles for SystemMessageWindowWin.
 class SystemMessageWindowWin::DeviceNotifications {
  public:
   explicit DeviceNotifications(HWND hwnd) : notifications_() {
     Register(hwnd);
   }
 
   ~DeviceNotifications() {
     Unregister();
   }
 
   void Register(HWND hwnd) {
     // Request to receive device notifications.  All applications receive basic
     // notifications via WM_DEVICECHANGE but in order to receive detailed device
     // arrival and removal messages, we need to register.
     DEV_BROADCAST_DEVICEINTERFACE filter = {0};
     filter.dbcc_size = sizeof(filter);
     filter.dbcc_devicetype = DBT_DEVTYP_DEVICEINTERFACE;
     for (int i = 0; i < arraysize(kDeviceCategoryMap); ++i) {
+      // From Vista, we use a device listener in AudioDeviceListenerWin.

[tommi (sloooow) - chröme, 2012/12/13 13:16:58]

The phrasing can be improved here and I think it's confusing to talk about Vista
and then check for CoreAudio.
Maybe change the comment to something like:

// If CoreAudio is supported, AudioDeviceListenerWin will
// take care of monitoring audio devices.

[no longer working on chromium, 2012/12/13 14:54:58]

Done.

+      if (media::CoreAudioUtil::IsSupported() &&

[tommi (sloooow) - chröme, 2012/12/13 13:16:58]

nit: Just call this method once outside the loop and use a temp here.

[no longer working on chromium, 2012/12/13 14:54:58]

Done.

+          KSCATEGORY_AUDIO == kDeviceCategoryMap[i].device_category)
+        continue;

[tommi (sloooow) - chröme, 2012/12/13 13:16:58]

use {} when an if clause spans more than 2 lines.

[no longer working on chromium, 2012/12/13 14:54:58]

Done.

+
       filter.dbcc_classguid = kDeviceCategoryMap[i].device_category;
       DCHECK_EQ(notifications_[i], static_cast<HDEVNOTIFY>(NULL));
       notifications_[i] = RegisterDeviceNotification(
           hwnd, &filter, DEVICE_NOTIFY_WINDOW_HANDLE);
       DPLOG_IF(ERROR, !notifications_[i])
           << "RegisterDeviceNotification failed";
     }
   }
 
   void Unregister() {
@@ skipping 87 matching lines @@
     case WM_DEVICECHANGE:
       return OnDeviceChange(static_cast<UINT>(wparam), lparam);
     default:
       break;
   }
 
   return ::DefWindowProc(hwnd, message, wparam, lparam);
 }
 
 }  // namespace content