| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <stddef.h> | 5 #include <stddef.h> |
| 6 #include <stdint.h> | 6 #include <stdint.h> |
| 7 | 7 |
| 8 #include <algorithm> | 8 #include <algorithm> |
| 9 #include <memory> | 9 #include <memory> |
| 10 | 10 |
| (...skipping 30 matching lines...) Expand all Loading... |
| 41 #include "media/audio/win/audio_manager_win.h" | 41 #include "media/audio/win/audio_manager_win.h" |
| 42 #include "media/audio/win/core_audio_util_win.h" | 42 #include "media/audio/win/core_audio_util_win.h" |
| 43 #elif defined(OS_ANDROID) | 43 #elif defined(OS_ANDROID) |
| 44 #include "media/audio/android/audio_manager_android.h" | 44 #include "media/audio/android/audio_manager_android.h" |
| 45 #else | 45 #else |
| 46 #include "media/audio/fake_audio_manager.h" | 46 #include "media/audio/fake_audio_manager.h" |
| 47 #endif | 47 #endif |
| 48 | 48 |
| 49 namespace media { | 49 namespace media { |
| 50 | 50 |
| 51 namespace { |
| 52 |
| 51 #if defined(USE_PULSEAUDIO) | 53 #if defined(USE_PULSEAUDIO) |
| 52 typedef AudioManagerPulse AudioManagerAnyPlatform; | 54 typedef AudioManagerPulse AudioManagerAnyPlatform; |
| 53 #elif defined(USE_ALSA) | 55 #elif defined(USE_ALSA) |
| 54 typedef AudioManagerAlsa AudioManagerAnyPlatform; | 56 typedef AudioManagerAlsa AudioManagerAnyPlatform; |
| 55 #elif defined(USE_CRAS) | 57 #elif defined(USE_CRAS) |
| 56 typedef AudioManagerCras AudioManagerAnyPlatform; | 58 typedef AudioManagerCras AudioManagerAnyPlatform; |
| 57 #elif defined(OS_MACOSX) | 59 #elif defined(OS_MACOSX) |
| 58 typedef AudioManagerMac AudioManagerAnyPlatform; | 60 typedef AudioManagerMac AudioManagerAnyPlatform; |
| 59 #elif defined(OS_WIN) | 61 #elif defined(OS_WIN) |
| 60 typedef AudioManagerWin AudioManagerAnyPlatform; | 62 typedef AudioManagerWin AudioManagerAnyPlatform; |
| (...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 445 ais->Stop(); | 447 ais->Stop(); |
| 446 | 448 |
| 447 // All Close() operations that run on the mocked audio thread, | 449 // All Close() operations that run on the mocked audio thread, |
| 448 // should be synchronous and not post additional close tasks to | 450 // should be synchronous and not post additional close tasks to |
| 449 // mocked the audio thread. Hence, there is no need to call | 451 // mocked the audio thread. Hence, there is no need to call |
| 450 // message_loop()->RunUntilIdle() after the Close() methods. | 452 // message_loop()->RunUntilIdle() after the Close() methods. |
| 451 aos->Close(); | 453 aos->Close(); |
| 452 ais->Close(); | 454 ais->Close(); |
| 453 } | 455 } |
| 454 | 456 |
| 457 } // namespace |
| 458 |
| 455 } // namespace media | 459 } // namespace media |
| OLD | NEW |