| Index: talk/session/media/currentspeakermonitor.h
|
| diff --git a/talk/session/media/currentspeakermonitor.h b/talk/session/media/currentspeakermonitor.h
|
| index 64beb9824719ee8253d140236ddc8e2c86d7fecc..4dfe6f099778b9bd48bc609bc86d48f2fd567ca0 100644
|
| --- a/talk/session/media/currentspeakermonitor.h
|
| +++ b/talk/session/media/currentspeakermonitor.h
|
| @@ -76,12 +76,12 @@ class CurrentSpeakerMonitor : public sigslot::has_slots<> {
|
| // Used by tests. Note that the actual minimum time between switches
|
| // enforced by the monitor will be the given value plus or minus the
|
| // resolution of the system clock.
|
| - void set_min_time_between_switches(uint32 min_time_between_switches);
|
| + void set_min_time_between_switches(uint32_t min_time_between_switches);
|
|
|
| // This is fired when the current speaker changes, and provides his audio
|
| // SSRC. This only fires after the audio monitor on the underlying
|
| // AudioSourceContext has been started.
|
| - sigslot::signal2<CurrentSpeakerMonitor*, uint32> SignalUpdate;
|
| + sigslot::signal2<CurrentSpeakerMonitor*, uint32_t> SignalUpdate;
|
|
|
| private:
|
| void OnAudioMonitor(AudioSourceContext* audio_source_context,
|
| @@ -107,12 +107,12 @@ class CurrentSpeakerMonitor : public sigslot::has_slots<> {
|
| bool started_;
|
| AudioSourceContext* audio_source_context_;
|
| BaseSession* session_;
|
| - std::map<uint32, SpeakingState> ssrc_to_speaking_state_map_;
|
| - uint32 current_speaker_ssrc_;
|
| + std::map<uint32_t, SpeakingState> ssrc_to_speaking_state_map_;
|
| + uint32_t current_speaker_ssrc_;
|
| // To prevent overswitching, switching is disabled for some time after a
|
| // switch is made. This gives us the earliest time a switch is permitted.
|
| - uint32 earliest_permitted_switch_time_;
|
| - uint32 min_time_between_switches_;
|
| + uint32_t earliest_permitted_switch_time_;
|
| + uint32_t min_time_between_switches_;
|
| };
|
|
|
| }
|
|
|