generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

(Auto)update libjingle 69188577-> 69260070

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6437 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
buildbot@webrtc.org 2014-06-16 07:11:01 +00:00
parent ab23d493e0
commit 117afeec91
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
talk/session/media/call.h
View File

@ -49,6 +49,7 @@
namespace cricket { namespace cricket {
struct AudioInfo; struct AudioInfo;
class Call;
class MediaSessionClient; class MediaSessionClient;
class BaseChannel; class BaseChannel;
class VoiceChannel; class VoiceChannel;

4
talk/session/media/currentspeakermonitor.cc
View File

@ -28,7 +28,9 @@
#include "talk/session/media/currentspeakermonitor.h" #include "talk/session/media/currentspeakermonitor.h"
#include "talk/base/logging.h" #include "talk/base/logging.h"
#include "talk/session/media/call.h" #include "talk/media/base/streamparams.h"
#include "talk/session/media/audiomonitor.h"
#include "talk/session/media/mediamessages.h"
namespace cricket { namespace cricket {

13
talk/session/media/currentspeakermonitor.h
View File

@ -39,7 +39,6 @@
namespace cricket { namespace cricket {
class BaseSession; class BaseSession;
class Call;
class Session; class Session;
struct AudioInfo; struct AudioInfo;
struct MediaStreams; struct MediaStreams;
@ -66,7 +65,8 @@ class AudioSourceContext {
// It's recommended that the audio monitor be started with a 100 ms period. // It's recommended that the audio monitor be started with a 100 ms period.
class CurrentSpeakerMonitor : public sigslot::has_slots<> { class CurrentSpeakerMonitor : public sigslot::has_slots<> {
public: public:
CurrentSpeakerMonitor(AudioSourceContext* call, BaseSession* session); CurrentSpeakerMonitor(AudioSourceContext* audio_source_context,
BaseSession* session);
~CurrentSpeakerMonitor(); ~CurrentSpeakerMonitor();
BaseSession* session() const { return session_; } BaseSession* session() const { return session_; }
@ -80,13 +80,14 @@ class CurrentSpeakerMonitor : public sigslot::has_slots<> {
void set_min_time_between_switches(uint32 min_time_between_switches); void set_min_time_between_switches(uint32 min_time_between_switches);
// This is fired when the current speaker changes, and provides his audio // This is fired when the current speaker changes, and provides his audio
// SSRC. This only fires after the audio monitor on the underlying Call has // SSRC. This only fires after the audio monitor on the underlying
// been started. // AudioSourceContext has been started.
sigslot::signal2<CurrentSpeakerMonitor*, uint32> SignalUpdate; sigslot::signal2<CurrentSpeakerMonitor*, uint32> SignalUpdate;
private: private:
void OnAudioMonitor(AudioSourceContext* call, const AudioInfo& info); void OnAudioMonitor(AudioSourceContext* audio_source_context,
void OnMediaStreamsUpdate(AudioSourceContext* call, const AudioInfo& info);
void OnMediaStreamsUpdate(AudioSourceContext* audio_source_context,
BaseSession* session, BaseSession* session,
const MediaStreams& added, const MediaStreams& added,
const MediaStreams& removed); const MediaStreams& removed);