diff options
| author | pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-08-12 19:51:57 +0000 |
|---|---|---|
| committer | pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-08-12 19:51:57 +0000 |
| commit | 4ca7d3f9fe809e76ee4f827a8a7f6bd31802b92c (patch) | |
| tree | 96b99919fc4c8835d443b1582a849ae27d20fe8e /webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer_defines.h | |
| parent | dd14b2add1c067c4af0ebfc89cb00030ae8ef15e (diff) | |
| download | webrtc-4ca7d3f9fe809e76ee4f827a8a7f6bd31802b92c.tar.gz | |
Replace MapWrapper with std::map<>.
MapWrapper was needed on some platforms where STL wasn't supported, we
now use std::map<> directly.
BUG=2164
TEST=trybots
R=henrike@webrtc.org, phoglund@webrtc.org, stefan@webrtc.org, wu@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/2001004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@4530 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer_defines.h')
| -rw-r--r-- | webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer_defines.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer_defines.h b/webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer_defines.h index ba04b5a4ed..663be182dd 100644 --- a/webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer_defines.h +++ b/webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer_defines.h @@ -12,7 +12,6 @@ #define WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_INTERFACE_AUDIO_CONFERENCE_MIXER_DEFINES_H_ #include "webrtc/modules/interface/module_common_types.h" -#include "webrtc/system_wrappers/interface/map_wrapper.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -87,19 +86,6 @@ protected: AudioMixerOutputReceiver() {} virtual ~AudioMixerOutputReceiver() {} }; - -class AudioRelayReceiver -{ -public: - // This callback function provides the mix decision for this mix iteration. - // mixerList is a list of elements of the type - // [int,MixerParticipant*] - virtual void NewAudioToRelay(const int32_t id, - const MapWrapper& mixerList) = 0; -protected: - AudioRelayReceiver() {} - virtual ~AudioRelayReceiver() {} -}; } // namespace webrtc #endif // WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_INTERFACE_AUDIO_CONFERENCE_MIXER_DEFINES_H_ |