Browse Source

Renames all active speaker references to be called dominant speaker.

dev1
damencho 9 years ago
parent
commit
8b94351597
5 changed files with 15 additions and 15 deletions
  1. 4
    4
      JitsiConference.js
  2. 2
    2
      JitsiConferenceEvents.js
  3. 1
    1
      doc/API.md
  4. 6
    6
      lib-jitsi-meet.js
  5. 2
    2
      lib-jitsi-meet.min.js

+ 4
- 4
JitsiConference.js View File

39
         this.statistics = new Statistics();
39
         this.statistics = new Statistics();
40
     setupListeners(this);
40
     setupListeners(this);
41
     this.participants = {};
41
     this.participants = {};
42
-    this.lastActiveSpeaker = null;
42
+    this.lastDominantSpeaker = null;
43
     this.dtmfManager = null;
43
     this.dtmfManager = null;
44
     this.somebodySupportsDTMF = false;
44
     this.somebodySupportsDTMF = false;
45
     this.authEnabled = false;
45
     this.authEnabled = false;
743
     });
743
     });
744
 
744
 
745
     conference.rtc.addListener(RTCEvents.DOMINANTSPEAKER_CHANGED, function (id) {
745
     conference.rtc.addListener(RTCEvents.DOMINANTSPEAKER_CHANGED, function (id) {
746
-        if(conference.lastActiveSpeaker !== id && conference.room) {
747
-            conference.lastActiveSpeaker = id;
748
-            conference.eventEmitter.emit(JitsiConferenceEvents.ACTIVE_SPEAKER_CHANGED, id);
746
+        if(conference.lastDominantSpeaker !== id && conference.room) {
747
+            conference.lastDominantSpeaker = id;
748
+            conference.eventEmitter.emit(JitsiConferenceEvents.DOMINANT_SPEAKER_CHANGED, id);
749
         }
749
         }
750
     });
750
     });
751
 
751
 

+ 2
- 2
JitsiConferenceEvents.js View File

12
      */
12
      */
13
     TRACK_REMOVED: "conference.trackRemoved",
13
     TRACK_REMOVED: "conference.trackRemoved",
14
     /**
14
     /**
15
-     * The active speaker was changed.
15
+     * The dominant speaker was changed.
16
      */
16
      */
17
-    ACTIVE_SPEAKER_CHANGED: "conference.activeSpeaker",
17
+    DOMINANT_SPEAKER_CHANGED: "conference.dominantSpeaker",
18
     /**
18
     /**
19
      * A new user joinned the conference.
19
      * A new user joinned the conference.
20
      */
20
      */

+ 1
- 1
doc/API.md View File

77
         - TRACK_ADDED - stream received. (parameters - JitsiTrack)
77
         - TRACK_ADDED - stream received. (parameters - JitsiTrack)
78
         - TRACK_REMOVED - stream removed. (parameters - JitsiTrack)
78
         - TRACK_REMOVED - stream removed. (parameters - JitsiTrack)
79
         - TRACK_MUTE_CHANGED - JitsiTrack was muted or unmuted. (parameters - JitsiTrack)
79
         - TRACK_MUTE_CHANGED - JitsiTrack was muted or unmuted. (parameters - JitsiTrack)
80
-        - ACTIVE_SPEAKER_CHANGED - the active speaker is changed. (parameters - id(string))
80
+        - DOMINANT_SPEAKER_CHANGED - the dominant speaker is changed. (parameters - id(string))
81
         - USER_JOINED - new user joined a conference. (parameters - id(string), user(JitsiParticipant))
81
         - USER_JOINED - new user joined a conference. (parameters - id(string), user(JitsiParticipant))
82
         - USER_LEFT - a participant left conference. (parameters - id(string), user(JitsiParticipant))
82
         - USER_LEFT - a participant left conference. (parameters - id(string), user(JitsiParticipant))
83
         - MESSAGE_RECEIVED - new text message received. (parameters - id(string), text(string), ts(number))
83
         - MESSAGE_RECEIVED - new text message received. (parameters - id(string), text(string), ts(number))

+ 6
- 6
lib-jitsi-meet.js View File

41
         this.statistics = new Statistics();
41
         this.statistics = new Statistics();
42
     setupListeners(this);
42
     setupListeners(this);
43
     this.participants = {};
43
     this.participants = {};
44
-    this.lastActiveSpeaker = null;
44
+    this.lastDominantSpeaker = null;
45
     this.dtmfManager = null;
45
     this.dtmfManager = null;
46
     this.somebodySupportsDTMF = false;
46
     this.somebodySupportsDTMF = false;
47
     this.authEnabled = false;
47
     this.authEnabled = false;
745
     });
745
     });
746
 
746
 
747
     conference.rtc.addListener(RTCEvents.DOMINANTSPEAKER_CHANGED, function (id) {
747
     conference.rtc.addListener(RTCEvents.DOMINANTSPEAKER_CHANGED, function (id) {
748
-        if(conference.lastActiveSpeaker !== id && conference.room) {
749
-            conference.lastActiveSpeaker = id;
750
-            conference.eventEmitter.emit(JitsiConferenceEvents.ACTIVE_SPEAKER_CHANGED, id);
748
+        if(conference.lastDominantSpeaker !== id && conference.room) {
749
+            conference.lastDominantSpeaker = id;
750
+            conference.eventEmitter.emit(JitsiConferenceEvents.DOMINANT_SPEAKER_CHANGED, id);
751
         }
751
         }
752
     });
752
     });
753
 
753
 
842
      */
842
      */
843
     TRACK_REMOVED: "conference.trackRemoved",
843
     TRACK_REMOVED: "conference.trackRemoved",
844
     /**
844
     /**
845
-     * The active speaker was changed.
845
+     * The dominant speaker was changed.
846
      */
846
      */
847
-    ACTIVE_SPEAKER_CHANGED: "conference.activeSpeaker",
847
+    DOMINANT_SPEAKER_CHANGED: "conference.dominantSpeaker",
848
     /**
848
     /**
849
      * A new user joinned the conference.
849
      * A new user joinned the conference.
850
      */
850
      */

+ 2
- 2
lib-jitsi-meet.min.js
File diff suppressed because it is too large
View File


Loading…
Cancel
Save