Selaa lähdekoodia

Merge pull request #307 from jitsi/event-name-change

Fixes name of the DOMINANT_SPEAKER_CHANGED event.
dev1
bgrozev 9 vuotta sitten
vanhempi
commit
39f19f9461
4 muutettua tiedostoa jossa 6 lisäystä ja 4 poistoa
  1. 1
    1
      JitsiConferenceEventManager.js
  2. 2
    1
      modules/RTC/DataChannels.js
  3. 2
    1
      package.json
  4. 1
    1
      service/RTC/RTCEvents.js

+ 1
- 1
JitsiConferenceEventManager.js Näytä tiedosto

452
     this.rtcForwarder = new EventEmitterForwarder(conference.rtc,
452
     this.rtcForwarder = new EventEmitterForwarder(conference.rtc,
453
         this.conference.eventEmitter);
453
         this.conference.eventEmitter);
454
 
454
 
455
-    conference.rtc.addListener(RTCEvents.DOMINANTSPEAKER_CHANGED,
455
+    conference.rtc.addListener(RTCEvents.DOMINANT_SPEAKER_CHANGED,
456
         function (id) {
456
         function (id) {
457
             if(conference.lastDominantSpeaker !== id && conference.room) {
457
             if(conference.lastDominantSpeaker !== id && conference.room) {
458
                 conference.lastDominantSpeaker = id;
458
                 conference.lastDominantSpeaker = id;

+ 2
- 1
modules/RTC/DataChannels.js Näytä tiedosto

95
                 logger.info(
95
                 logger.info(
96
                     "Data channel new dominant speaker event: ",
96
                     "Data channel new dominant speaker event: ",
97
                     dominantSpeakerEndpoint);
97
                     dominantSpeakerEndpoint);
98
-                self.eventEmitter.emit(RTCEvents.DOMINANTSPEAKER_CHANGED, dominantSpeakerEndpoint);
98
+                self.eventEmitter.emit(RTCEvents.DOMINANT_SPEAKER_CHANGED,
99
+                  dominantSpeakerEndpoint);
99
             }
100
             }
100
             else if ("InLastNChangeEvent" === colibriClass) {
101
             else if ("InLastNChangeEvent" === colibriClass) {
101
                 var oldValue = obj.oldValue;
102
                 var oldValue = obj.oldValue;

+ 2
- 1
package.json Näytä tiedosto

10
     "jingle",
10
     "jingle",
11
     "webrtc",
11
     "webrtc",
12
     "xmpp",
12
     "xmpp",
13
-    "browser"
13
+    "browser",
14
+    "jitsi"
14
   ],
15
   ],
15
   "author": "",
16
   "author": "",
16
   "readmeFilename": "README.md",
17
   "readmeFilename": "README.md",

+ 1
- 1
service/RTC/RTCEvents.js Näytä tiedosto

3
     DATA_CHANNEL_OPEN: "rtc.data_channel_open",
3
     DATA_CHANNEL_OPEN: "rtc.data_channel_open",
4
     ENDPOINT_CONN_STATUS_CHANGED: "rtc.endpoint_conn_status_changed",
4
     ENDPOINT_CONN_STATUS_CHANGED: "rtc.endpoint_conn_status_changed",
5
     LASTN_CHANGED: "rtc.lastn_changed",
5
     LASTN_CHANGED: "rtc.lastn_changed",
6
-    DOMINANTSPEAKER_CHANGED: "rtc.dominantspeaker_changed",
6
+    DOMINANT_SPEAKER_CHANGED: "rtc.dominant_speaker_changed",
7
     LASTN_ENDPOINT_CHANGED: "rtc.lastn_endpoint_changed",
7
     LASTN_ENDPOINT_CHANGED: "rtc.lastn_endpoint_changed",
8
     AVAILABLE_DEVICES_CHANGED: "rtc.available_devices_changed",
8
     AVAILABLE_DEVICES_CHANGED: "rtc.available_devices_changed",
9
     TRACK_ATTACHED: "rtc.track_attached",
9
     TRACK_ATTACHED: "rtc.track_attached",

Loading…
Peruuta
Tallenna