Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(847)

Unified Diff: media/audio/audio_manager_base.h

Issue 11233023: Handle audio device changes on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: No ctor thread check. Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/audio/audio_manager_base.h
diff --git a/media/audio/audio_manager_base.h b/media/audio/audio_manager_base.h
index b14452fcb67fac4aeb8f70d34e4461cfb2855e0d..7372c61acad90255630e88b719c50064ac9753f9 100644
--- a/media/audio/audio_manager_base.h
+++ b/media/audio/audio_manager_base.h
@@ -7,6 +7,7 @@
#include <map>
#include <string>
+#include <utility>
#include "base/atomic_ref_count.h"
#include "base/compiler_specific.h"
@@ -104,8 +105,8 @@ class MEDIA_EXPORT AudioManagerBase : public AudioManager {
// TODO(dalecurtis): This must change to map both input and output parameters
// to a single dispatcher, otherwise on a device state change we'll just get
// the exact same invalid dispatcher.
- typedef std::map<AudioParameters, scoped_refptr<AudioOutputDispatcher>,
- AudioParameters::Compare>
+ typedef std::map<std::pair<AudioParameters, AudioParameters>,
+ scoped_refptr<AudioOutputDispatcher> >
AudioOutputDispatchersMap;
// Shuts down the audio thread and releases all the audio output dispatchers

Powered by Google App Engine
This is Rietveld 408576698