code clean-ups and smaller tweaks

Author: fquirin

www/css/sepiaFW-style.css

@@ -115,6 +115,9 @@ body.limit-size {
 	overflow: hidden;
 	z-index: 50;
 	border: 0px solid black;
+	-webkit-touch-callout: none !important;
+	-webkit-user-select: none;
+	user-select: none;
 }
 .sepiaFW-swipeBar-switchable {
 	background: transparent;
@@ -123,6 +126,9 @@ body.limit-size {
 	margin: 0px;
 	padding: 0px;
 	border: 0px solid black;
+	-webkit-touch-callout: none !important;
+	-webkit-user-select: none;
+	user-select: none;
 }
 .sepiaFW-fullSize {
 	width: 100% !important;
@@ -1588,6 +1594,9 @@ html.dark-skin #sepiaFW-login-help-btn {
 	padding-right: 0px !important;
 	width: 100%;
 	height: 100%;
+	-webkit-touch-callout: none !important;
+	-webkit-user-select: none;
+	user-select: none;
 }
 #sepiaFW-chat-send i {
 	transform: rotate(180deg);
@@ -1739,7 +1748,10 @@ html.dark-skin #sepiaFW-login-help-btn {
 	overflow: visible;
 	display: flex;
     align-items: center;
-    justify-content: center;
+	justify-content: center;
+	-webkit-touch-callout: none !important;
+	-webkit-user-select: none;
+	user-select: none;
 }
 #sepiaFW-assist-btn-area button {
 	border-radius: 23px;
@@ -1748,6 +1760,9 @@ html.dark-skin #sepiaFW-login-help-btn {
 	padding: 0px;
 	width: 37px;
 	height: 37px;
+	-webkit-touch-callout: none !important;
+	-webkit-user-select: none;
+	user-select: none;
 }
 #sepiaFW-assist-btn-orbiters {
 	position: absolute;

www/scripts/sepiaFW.audio.js

@@ -321,7 +321,7 @@ function sepiaFW_build_audio(){
 	//---- broadcasting -----
 
 	AudioPlayer.broadcastAudioEvent = function(source, action, playerObject){
-		//stream, effects, tts-player, unknown - start, stop, error, fadeOut, fadeIn
+		//stream, effects, tts-player, unknown - prepare, start, stop, error, fadeOut, fadeIn
 		//android-intent - stop, start
 		//youtube-embedded - start, resume, pause, hold
 		source = source.toLowerCase();
@@ -333,7 +333,7 @@ function sepiaFW_build_audio(){
 			source: source,
 			action: action
 		}});
-		document.dispatchEvent(event);
+		document.dispatchEvent(event);  //NOTE: we could check result for 'prevent default' (its sync.)
 		//console.error("audio event: " + source + " - " + action);
 	}
 
@@ -832,11 +832,13 @@ function sepiaFW_build_audio(){
 		}else if (audioPlayer === 'tts'){
 			audioPlayer = speaker;
 		}
-		if (audioURL) audioURL = SepiaFW.config.replacePathTagWithActualPath(audioURL);
-		
+		var sourceName = "unknown";
 		var audioOnEndFired = false;			//prevent doublefireing of audio onend onpause
 
+		if (audioURL) audioURL = SepiaFW.config.replacePathTagWithActualPath(audioURL);
+
 		if (audioPlayer == player){
+			sourceName = "stream";
 			if (audioURL){
 				beforeLastAudioStream = lastAudioStream;
 				lastAudioStream = audioURL;
@@ -857,9 +859,11 @@ function sepiaFW_build_audio(){
 			Stream.isLoading = true;
 
 		}else if (audioPlayer == player2){
+			sourceName = "effects";
 			//TODO: ?
 
 		}else if (audioPlayer == speaker){
+			sourceName = "tts-player";
 			if (isVoiceEffectSetupPending){
 				//TODO: delay
 				SepiaFW.debug.error("AUDIO: voice-effects setup still pending! Should delay 'AudioPlayer.playURL'");	//debug
@@ -878,6 +882,7 @@ function sepiaFW_build_audio(){
 		}
 
 		audioPlayer.preload = 'auto';
+		AudioPlayer.broadcastAudioEvent(sourceName, "prepare", audioPlayer);
 
 		//console.log("Audio-URL: " + audioURL); 		//DEBUG
 		audioPlayer.src = audioURL;
@@ -898,15 +903,7 @@ function sepiaFW_build_audio(){
 			}
 			//callback
 			if (onStartCallback) onStartCallback();
-			if (audioPlayer == player){
-				AudioPlayer.broadcastAudioEvent("stream", "start", audioPlayer);
-			}else if (audioPlayer == player2){
-				AudioPlayer.broadcastAudioEvent("effects", "start", audioPlayer);
-			}else if (audioPlayer == speaker){
-				AudioPlayer.broadcastAudioEvent("tts-player", "start", audioPlayer);
-			}else{
-				AudioPlayer.broadcastAudioEvent("unknown", "start", audioPlayer);
-			}
+			AudioPlayer.broadcastAudioEvent(sourceName, "start", audioPlayer);
 		};
 		audioPlayer.onpause = function(){
 			if (!audioOnEndFired){
@@ -926,15 +923,15 @@ function sepiaFW_build_audio(){
 				}
 				//callback
 				if (onEndCallback) onEndCallback();
+				var sourceName = "unknown";
 				if (audioPlayer == player){
-					AudioPlayer.broadcastAudioEvent("stream", "stop", audioPlayer);
+					sourceName = "stream";
 				}else if (audioPlayer == player2){
-					AudioPlayer.broadcastAudioEvent("effects", "stop", audioPlayer);
+					sourceName = "effects";
 				}else if (audioPlayer == speaker){
-					AudioPlayer.broadcastAudioEvent("tts-player", "stop", audioPlayer);
-				}else{
-					AudioPlayer.broadcastAudioEvent("unknown", "stop", audioPlayer);
+					sourceName = "tts-player";
 				}
+				AudioPlayer.broadcastAudioEvent(sourceName, "stop", audioPlayer);
 			}
 		};
 		audioPlayer.onended = function(){
@@ -966,15 +963,15 @@ function sepiaFW_build_audio(){
 			}
 			//callback
 			if (onErrorCallback) onErrorCallback();
+			var sourceName = "unknown";
 			if (audioPlayer == player){
-				AudioPlayer.broadcastAudioEvent("stream", "error", audioPlayer);
+				sourceName = "stream";
 			}else if (audioPlayer == player2){
-				AudioPlayer.broadcastAudioEvent("effects", "error", audioPlayer);
+				sourceName = "effects";
 			}else if (audioPlayer == speaker){
-				AudioPlayer.broadcastAudioEvent("tts-player", "error", audioPlayer);
-			}else{
-				AudioPlayer.broadcastAudioEvent("unknown", "error", audioPlayer);
+				sourceName = "tts-player";
 			}
+			AudioPlayer.broadcastAudioEvent(sourceName, "error", audioPlayer);
 		};
 		var p = audioPlayer.play();	
 		if (p && ('catch' in p)){
@@ -1046,6 +1043,7 @@ function sepiaFW_build_audio(){
 		}
 
 		var audioOnEndFired = false;
+		AudioPlayer.broadcastAudioEvent("effects", "prepare", audioPlayer);
 
 		audioPlayer.src = alarmSound;
 		audioPlayer.preload = 'auto';

www/scripts/sepiaFW.ui.build.js

@@ -320,10 +320,10 @@ function sepiaFW_build_ui_build(sepiaSessionId){
 				$('#sepiaFW-chat-input').val('');
 			},'',function(){
 				//short press - send action
-				if (SepiaFW.speech && SepiaFW.speech.isRecognizing()){
+				if (SepiaFW.speech.isRecognizing()){
 					SepiaFW.speech.stopRecognition();
 				}else{
-					if (SepiaFW.audio && SepiaFW.audio.initAudio(SepiaFW.client.sendInputText)){
+					if (SepiaFW.audio.initAudio(SepiaFW.client.sendInputText)){
 						//skip because of callback
 					}else{
 						SepiaFW.client.sendInputText();
@@ -421,7 +421,7 @@ function sepiaFW_build_ui_build(sepiaSessionId){
 				//long-press
 			},'',function(){
 				//short press - send action
-				if (SepiaFW.speech && SepiaFW.speech.isRecognizing()){
+				if (SepiaFW.speech.isRecognizing()){
 					SepiaFW.speech.stopRecognition();
 				}else{
 					var bubble = document.getElementById("sepiaFW-chat-controls-speech-box-bubble");

www/scripts/sepiaFW.wakeWordSettings.js

@@ -92,6 +92,7 @@ function sepiaFW_build_wake_word_settings() {
 		}else if (eventName == "audioend"){
             //anything?
         }
+        setTimeout(function(){ checkButtonState(); }, 1000);
     }
 
     WakeWordSettings.debugLog = function(info, isError){
@@ -259,9 +260,11 @@ function sepiaFW_build_wake_word_settings() {
             function(){
                 debugInfo = true;
                 $('.sepiaFW-wake-word-settings-page .debug-setting').show(300);    //ww debug settings
+                checkButtonState();
             },function(){
                 debugInfo = false;
                 $('.sepiaFW-wake-word-settings-page .debug-setting').hide(150);
+                checkButtonState();
             }, debugInfo)
         );
 
@@ -323,6 +326,12 @@ function sepiaFW_build_wake_word_settings() {
     //ON-OPEN
     function onFrameOpen(){
         WakeWordSettings.isOpen = true;
+        debugInfo = document.getElementById("sepiaFW-menu-toggle-wake-word-debug").getValue();
+
+        //stop running audio?
+        if (SepiaFW.audio.isAnyAudioSourceActive() && !SepiaFW.wakeTriggers.allowWakeWordDuringStream){
+            SepiaFW.audio.stop();
+        }
 
         //Wake-word listener for testing
         document.addEventListener("sepia_wake_word", wakeWordTest);
@@ -337,18 +346,7 @@ function sepiaFW_build_wake_word_settings() {
             sensitivityEle.title = SepiaFW.wakeTriggers.getWakeWordSensitivities();
 
             //check button states
-            if (SepiaFW.wakeTriggers.engineLoaded){
-                isListening = SepiaFW.wakeTriggers.isListening();
-                if (isListening){
-                    document.getElementById('sepiaFW-wake-word-toggle').innerHTML = "STOP";
-                }else{
-                    document.getElementById('sepiaFW-wake-word-toggle').innerHTML = "START";
-                }
-                $('#sepiaFW-wake-word-engine-reset').show();
-            }else{
-                isListening = false;
-                document.getElementById('sepiaFW-wake-word-toggle').innerHTML = "LOAD";
-            }
+            checkButtonState();
 
             //Show active wake-word
             $("#sepiaFW-wake-word-version").val(SepiaFW.wakeTriggers.getWakeWordVersion());
@@ -369,6 +367,20 @@ function sepiaFW_build_wake_word_settings() {
             WakeWordSettings.debugLog("UPDATED " + info);
         }
     }
+    function checkButtonState(){
+        if (SepiaFW.wakeTriggers.engineLoaded){
+            isListening = SepiaFW.wakeTriggers.isListening();
+            if (isListening){
+                document.getElementById('sepiaFW-wake-word-toggle').innerHTML = "STOP";
+            }else{
+                document.getElementById('sepiaFW-wake-word-toggle').innerHTML = "START";
+            }
+            $('#sepiaFW-wake-word-engine-reset').show();
+        }else{
+            isListening = false;
+            document.getElementById('sepiaFW-wake-word-toggle').innerHTML = "LOAD";
+        }
+    }
 
     //ON-CLOSE
     function onFrameClose(){