Adds live streaming sound notification. (#4532)

* Adds live streaming sound notification.

* Adds ios resources for the new files.

android/sdk/build.gradle

@@ -149,6 +149,8 @@ android.libraryVariants.all { def variant ->
             from("${projectDir}/../../sounds/incomingMessage.wav")
             from("${projectDir}/../../sounds/joined.wav")
             from("${projectDir}/../../sounds/left.wav")
+            from("${projectDir}/../../sounds/liveStreamingOn.mp3")
+            from("${projectDir}/../../sounds/liveStreamingOff.mp3")
             from("${projectDir}/../../sounds/outgoingRinging.wav")
             from("${projectDir}/../../sounds/outgoingStart.wav")
             from("${projectDir}/../../sounds/recordingOn.mp3")

ios/sdk/sdk.xcodeproj/project.pbxproj

@@ -27,6 +27,8 @@
 		0BCA496C1EC4BBF900B793EE /* jitsi.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 0BCA496B1EC4BBF900B793EE /* jitsi.ttf */; };
 		0BD906EA1EC0C00300C8C18E /* JitsiMeet.h in Headers */ = {isa = PBXBuildFile; fileRef = 0BD906E81EC0C00300C8C18E /* JitsiMeet.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0F65EECE1D95DA94561BB47E /* libPods-JitsiMeet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 03F2ADC957FF109849B7FCA1 /* libPods-JitsiMeet.a */; };
+		C30F88D0CB0F4F5593216D24 /* liveStreamingOff.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = C30F88D1CB0F4F5593216D24 /* liveStreamingOff.mp3 */; };
+		C30F88D2CB0F4F5593216D24 /* liveStreamingOn.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = C30F88D3CB0F4F5593216D24 /* liveStreamingOn.mp3 */; };
 		6C31EDC820C06D490089C899 /* recordingOn.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 6C31EDC720C06D490089C899 /* recordingOn.mp3 */; };
 		6C31EDCA20C06D530089C899 /* recordingOff.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 6C31EDC920C06D530089C899 /* recordingOff.mp3 */; };
 		75635B0A20751D6D00F29C9F /* joined.wav in Resources */ = {isa = PBXBuildFile; fileRef = 75635B0820751D6D00F29C9F /* joined.wav */; };
@@ -77,6 +79,8 @@
 		0BD906E51EC0C00300C8C18E /* JitsiMeet.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = JitsiMeet.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		0BD906E81EC0C00300C8C18E /* JitsiMeet.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JitsiMeet.h; sourceTree = "<group>"; };
 		0BD906E91EC0C00300C8C18E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		C30F88D1CB0F4F5593216D24 /* liveStreamingOff.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = liveStreamingOff.mp3; path = ../../sounds/liveStreamingOff.mp3; sourceTree = "<group>"; };
+		C30F88D3CB0F4F5593216D24 /* liveStreamingOn.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = liveStreamingOn.mp3; path = ../../sounds/liveStreamingOn.mp3; sourceTree = "<group>"; };
 		6C31EDC720C06D490089C899 /* recordingOn.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = recordingOn.mp3; path = ../../sounds/recordingOn.mp3; sourceTree = "<group>"; };
 		6C31EDC920C06D530089C899 /* recordingOff.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = recordingOff.mp3; path = ../../sounds/recordingOff.mp3; sourceTree = "<group>"; };
 		75635B0820751D6D00F29C9F /* joined.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = joined.wav; path = ../../sounds/joined.wav; sourceTree = "<group>"; };
@@ -135,6 +139,8 @@
 				0BCA496B1EC4BBF900B793EE /* jitsi.ttf */,
 				75635B0820751D6D00F29C9F /* joined.wav */,
 				75635B0920751D6D00F29C9F /* left.wav */,
+				C30F88D1CB0F4F5593216D24 /* liveStreamingOff.mp3 */,
+				C30F88D3CB0F4F5593216D24 /* liveStreamingOn.mp3 */,
 				0B49424420AD8DBD00BD2DE0 /* outgoingRinging.wav */,
 				0B49424320AD8DBD00BD2DE0 /* outgoingStart.wav */,
 				6C31EDC920C06D530089C899 /* recordingOff.mp3 */,
@@ -343,6 +349,8 @@
 			files = (
 				87FE6F3321E52437004A5DC7 /* incomingMessage.wav in Resources */,
 				0B49424520AD8DBD00BD2DE0 /* outgoingStart.wav in Resources */,
+				C30F88D0CB0F4F5593216D24 /* liveStreamingOff.mp3 in Resources */,
+				C30F88D2CB0F4F5593216D24 /* liveStreamingOn.mp3 in Resources */,
 				6C31EDCA20C06D530089C899 /* recordingOff.mp3 in Resources */,
 				A4414AE020B37F1A003546E6 /* rejected.wav in Resources */,
 				0B49424620AD8DBD00BD2DE0 /* outgoingRinging.wav in Resources */,

react/features/recording/constants.js

@@ -2,17 +2,30 @@
 
 import { JitsiRecordingConstants } from '../base/lib-jitsi-meet';
 
+
 /**
- * The identifier of the sound to be played when a recording or live streaming
+ * The identifier of the sound to be played when a live streaming session is stopped.
- * session is stopped.
+ *
+ * @type {string}
+ */
+export const LIVE_STREAMING_OFF_SOUND_ID = 'LIVE_STREAMING_OFF_SOUND';
+
+/**
+ * The identifier of the sound to be played when a live streaming session is started.
+ *
+ * @type {string}
+ */
+export const LIVE_STREAMING_ON_SOUND_ID = 'LIVE_STREAMING_ON_SOUND';
+
+/**
+ * The identifier of the sound to be played when a recording session is stopped.
  *
  * @type {string}
  */
 export const RECORDING_OFF_SOUND_ID = 'RECORDING_OFF_SOUND';
 
 /**
- * The identifier of the sound to be played when a recording or live streaming
+ * The identifier of the sound to be played when a recording session is started.
- * session is started.
  *
  * @type {string}
  */

react/features/recording/middleware.js

@@ -28,9 +28,16 @@ import {
     updateRecordingSessionData
 } from './actions';
 import { RECORDING_SESSION_UPDATED } from './actionTypes';
-import { RECORDING_OFF_SOUND_ID, RECORDING_ON_SOUND_ID } from './constants';
+import {
+    LIVE_STREAMING_OFF_SOUND_ID,
+    LIVE_STREAMING_ON_SOUND_ID,
+    RECORDING_OFF_SOUND_ID,
+    RECORDING_ON_SOUND_ID
+} from './constants';
 import { getSessionById } from './functions';
 import {
+    LIVE_STREAMING_OFF_SOUND_FILE,
+    LIVE_STREAMING_ON_SOUND_FILE,
     RECORDING_OFF_SOUND_FILE,
     RECORDING_ON_SOUND_FILE
 } from './sounds';
@@ -66,6 +73,14 @@ MiddlewareRegistry.register(({ dispatch, getState }) => next => action => {
 
     switch (action.type) {
     case APP_WILL_MOUNT:
+        dispatch(registerSound(
+            LIVE_STREAMING_OFF_SOUND_ID,
+            LIVE_STREAMING_OFF_SOUND_FILE));
+
+        dispatch(registerSound(
+            LIVE_STREAMING_ON_SOUND_ID,
+            LIVE_STREAMING_ON_SOUND_FILE));
+
         dispatch(registerSound(
             RECORDING_OFF_SOUND_ID,
             RECORDING_OFF_SOUND_FILE));
@@ -77,6 +92,8 @@ MiddlewareRegistry.register(({ dispatch, getState }) => next => action => {
         break;
 
     case APP_WILL_UNMOUNT:
+        dispatch(unregisterSound(LIVE_STREAMING_OFF_SOUND_ID));
+        dispatch(unregisterSound(LIVE_STREAMING_ON_SOUND_ID));
         dispatch(unregisterSound(RECORDING_OFF_SOUND_ID));
         dispatch(unregisterSound(RECORDING_ON_SOUND_ID));
 
@@ -114,41 +131,51 @@ MiddlewareRegistry.register(({ dispatch, getState }) => next => action => {
 
         const updatedSessionData
             = getSessionById(getState(), action.sessionData.id);
+        const { mode } = updatedSessionData;
         const { PENDING, OFF, ON } = JitsiRecordingConstants.status;
 
         if (updatedSessionData.status === PENDING
             && (!oldSessionData || oldSessionData.status !== PENDING)) {
-            dispatch(
+            dispatch(showPendingRecordingNotification(mode));
-                showPendingRecordingNotification(updatedSessionData.mode));
         } else if (updatedSessionData.status !== PENDING) {
-            dispatch(
+            dispatch(hidePendingRecordingNotification(mode));
-                hidePendingRecordingNotification(updatedSessionData.mode));
 
             if (updatedSessionData.status === ON
-                && (!oldSessionData || oldSessionData.status !== ON)
+                && (!oldSessionData || oldSessionData.status !== ON)) {
-                && updatedSessionData.mode
+                let soundID;
-                    === JitsiRecordingConstants.mode.FILE) {
+
-                sendAnalytics(createRecordingEvent('start', 'file'));
+                if (mode === JitsiRecordingConstants.mode.FILE) {
-                dispatch(playSound(RECORDING_ON_SOUND_ID));
+                    soundID = RECORDING_ON_SOUND_ID;
+                } else if (mode === JitsiRecordingConstants.mode.STREAM) {
+                    soundID = LIVE_STREAMING_ON_SOUND_ID;
+                }
+
+                if (soundID) {
+                    sendAnalytics(createRecordingEvent('start', mode));
+                    dispatch(playSound(soundID));
+                }
             } else if (updatedSessionData.status === OFF
                 && (!oldSessionData || oldSessionData.status !== OFF)) {
-                dispatch(
+                dispatch(showStoppedRecordingNotification(mode));
-                    showStoppedRecordingNotification(
+                let duration = 0, soundOff, soundOn;
-                        updatedSessionData.mode));
 
-                if (updatedSessionData.mode
-                        === JitsiRecordingConstants.mode.FILE) {
-                    let duration = 0;
-
-                    // eslint-disable-next-line max-depth
                 if (oldSessionData && oldSessionData.timestamp) {
                     duration
                         = (Date.now() / 1000) - oldSessionData.timestamp;
                 }
-                    sendAnalytics(
+
-                        createRecordingEvent('stop', 'file', duration));
+                if (mode === JitsiRecordingConstants.mode.FILE) {
-                    dispatch(stopSound(RECORDING_ON_SOUND_ID));
+                    soundOff = RECORDING_OFF_SOUND_ID;
-                    dispatch(playSound(RECORDING_OFF_SOUND_ID));
+                    soundOn = RECORDING_ON_SOUND_ID;
+                } else if (mode === JitsiRecordingConstants.mode.STREAM) {
+                    soundOff = LIVE_STREAMING_OFF_SOUND_ID;
+                    soundOn = LIVE_STREAMING_ON_SOUND_ID;
+                }
+
+                if (soundOff && soundOn) {
+                    sendAnalytics(createRecordingEvent('stop', mode, duration));
+                    dispatch(stopSound(soundOn));
+                    dispatch(playSound(soundOff));
                 }
             }
         }

react/features/recording/sounds.js

@@ -1,14 +1,26 @@
 /**
- * The name of the bundled audio file which will be played for when a recording
+ * The name of the bundled audio file which will be played for when live streaming is stopped.
- * or live streaming is stopped.
+ *
+ * @type {string}
+ */
+export const LIVE_STREAMING_OFF_SOUND_FILE = 'liveStreamingOff.mp3';
+
+/**
+ * The name of the bundled audio file which will be played for when a live streaming is started.
+ *
+ * @type {string}
+ */
+export const LIVE_STREAMING_ON_SOUND_FILE = 'liveStreamingOn.mp3';
+
+/**
+ * The name of the bundled audio file which will be played for when a recording is stopped.
  *
  * @type {string}
  */
 export const RECORDING_OFF_SOUND_FILE = 'recordingOff.mp3';
 
 /**
- * The name of the bundled audio file which will be played for when a recording
+ * The name of the bundled audio file which will be played for when a recording is started.
- * or live streaming is started.
  *
  * @type {string}
  */