speechrecorderng 3.3.0 → 3.3.2

package/fesm2020/speechrecorderng.mjs

@@ -2548,6 +2548,7 @@ class AudioPlayer {
         return this._stopAction;
     }
     set audioClip(audioClip) {
+        this._audioClip = audioClip;
         let length = 0;
         let chs = 0;
         if (audioClip && audioClip.audioDataHolder) {
@@ -2570,7 +2571,6 @@ class AudioPlayer {
         else {
             this.audioSource = null;
         }
-        this._audioClip = audioClip;
     }
     get audioSource() {
         return this._audioSource;
@@ -3206,9 +3206,9 @@ class AudioCapture {
             this._recUUID = UUID.generate();
         }
         this.persistError = null;
-        console.info("Audio capture initialize storage for type: " + this._audioStorageType);
+        //console.debug("Audio capture initialize storage for type: "+this._audioStorageType);
         if (AudioStorageType.DB_CHUNKED === this._audioStorageType && this._persistentAudioStorageTarget && this._recUUID) {
-            console.debug("Create indexed db audio buffer.");
+            //console.debug("Create indexed db audio buffer.");
             this.inddbAudioBuffer = new IndexedDbAudioBuffer(this._persistentAudioStorageTarget, this.channelCount, this.currentSampleRate, AudioCapture.BUFFER_SIZE, 0, this._recUUID);
         }
         if (!(AudioStorageType.NET_CHUNKED === this._audioStorageType)) {
@@ -13031,7 +13031,7 @@ class SessionManager extends BasicRecorder {
         this.transportActions.fwdAction.disabled = true;
         this.transportActions.fwdNextAction.disabled = true;
         this.transportActions.bwdAction.disabled = true;
-        this.displayRecFile = null;
+        this.updateDisplayRecFile(null);
         this.displayRecFileVersion = 0;
         this.displayAudioClip = null;
         this.liveLevelDisplay.reset(true);
@@ -13129,6 +13129,9 @@ class SessionManager extends BasicRecorder {
     }
     set displayRecFile(displayRecFile) {
         this._displayRecFile = displayRecFile;
+    }
+    updateDisplayRecFile(displayRecFile, fetchAndApplyRecordingFile = true) {
+        this.displayRecFile = displayRecFile;
         if (this._displayRecFile) {
             if (this.items) {
                 this.items.currentRecordingFile = this._displayRecFile;
@@ -13145,47 +13148,88 @@ class SessionManager extends BasicRecorder {
                 if (this.controlAudioPlayer) {
                     this.controlAudioPlayer.audioClip = null;
                 }
-                if (this._controlAudioPlayer && this._session) {
-                    //... and try to fetch from server
-                    this.liveLevelDisplayState = State.LOADING;
-                    const rf = this._displayRecFile;
-                    let audioDownloadType = this._clientAudioStorageType;
-                    if (AudioStorageType.MEM_ENTIRE_AUTO_NET_CHUNKED === this._clientAudioStorageType || AudioStorageType.MEM_CHUNKED_AUTO_NET_CHUNKED === this._clientAudioStorageType) {
-                        // Default is network mode
-                        audioDownloadType = AudioStorageType.NET_CHUNKED;
-                        if (rf.channels && rf.frames) {
-                            const samples = rf.channels * rf.frames;
-                            if (samples <= this._maxAutoNetMemStoreSamples) {
-                                // But if audio file is small, load in continuous resp. chunked mode
-                                if (AudioStorageType.MEM_ENTIRE_AUTO_NET_CHUNKED === this._clientAudioStorageType) {
-                                    audioDownloadType = AudioStorageType.MEM_ENTIRE;
-                                }
-                                else if (AudioStorageType.MEM_CHUNKED_AUTO_NET_CHUNKED === this._clientAudioStorageType) {
-                                    audioDownloadType = AudioStorageType.MEM_CHUNKED;
+                if (fetchAndApplyRecordingFile) {
+                    if (this._controlAudioPlayer && this._session) {
+                        //... and try to fetch from server
+                        this.liveLevelDisplayState = State.LOADING;
+                        const rf = this._displayRecFile;
+                        let audioDownloadType = this._clientAudioStorageType;
+                        if (AudioStorageType.MEM_ENTIRE_AUTO_NET_CHUNKED === this._clientAudioStorageType || AudioStorageType.MEM_CHUNKED_AUTO_NET_CHUNKED === this._clientAudioStorageType) {
+                            // Default is network mode
+                            audioDownloadType = AudioStorageType.NET_CHUNKED;
+                            if (rf.channels && rf.frames) {
+                                const samples = rf.channels * rf.frames;
+                                if (samples <= this._maxAutoNetMemStoreSamples) {
+                                    // But if audio file is small, load in continuous resp. chunked mode
+                                    if (AudioStorageType.MEM_ENTIRE_AUTO_NET_CHUNKED === this._clientAudioStorageType) {
+                                        audioDownloadType = AudioStorageType.MEM_ENTIRE;
+                                    }
+                                    else if (AudioStorageType.MEM_CHUNKED_AUTO_NET_CHUNKED === this._clientAudioStorageType) {
+                                        audioDownloadType = AudioStorageType.MEM_CHUNKED;
+                                    }
                                 }
                             }
                         }
-                    }
-                    console.debug("Audio download type: " + audioDownloadType);
-                    if (AudioStorageType.DB_CHUNKED === this._clientAudioStorageType) {
-                        // Fetch chunked indexed db audio buffer
-                        let nextIab = null;
-                        if (!this._persistentAudioStorageTarget) {
-                            throw Error('Error: Persistent storage target not set.');
+                        console.debug("Audio download type: " + audioDownloadType);
+                        if (AudioStorageType.DB_CHUNKED === this._clientAudioStorageType) {
+                            // Fetch chunked indexed db audio buffer
+                            let nextIab = null;
+                            if (!this._persistentAudioStorageTarget) {
+                                throw Error('Error: Persistent storage target not set.');
+                            }
+                            else {
+                                //console.debug("Fetch audio and store to indexed db...");
+                                this.audioFetchSubscription = this.recFileService.fetchSprRecordingFileIndDbAudioBuffer(this._controlAudioPlayer.context, this._persistentAudioStorageTarget, this._session.project, rf).subscribe({
+                                    next: (iab) => {
+                                        //console.debug("Sessionmanager: Received inddb audio buffer: "+iab);
+                                        nextIab = iab;
+                                    },
+                                    complete: () => {
+                                        this.liveLevelDisplayState = State.READY;
+                                        let fabDh = null;
+                                        if (nextIab) {
+                                            if (rf && this.items) {
+                                                fabDh = new AudioDataHolder(nextIab);
+                                                this.items.setSprRecFileAudioData(rf, fabDh);
+                                            }
+                                        }
+                                        else {
+                                            // Should actually be handled by the error resolver
+                                            this.statusMsg = 'Recording file could not be loaded.';
+                                            this.statusAlertType = 'error';
+                                        }
+                                        if (fabDh) {
+                                            // this.displayAudioClip could have been changed meanwhile, but the recorder unsubcribes before changing the item, therefore there should be no risk to set to wrong item
+                                            this.displayAudioClip = new AudioClip(fabDh);
+                                        }
+                                        this.controlAudioPlayer.audioClip = this.displayAudioClip;
+                                        this.showRecording();
+                                    },
+                                    error: err => {
+                                        console.error("Could not load recording file from server: " + err);
+                                        this.liveLevelDisplayState = State.READY;
+                                        this.statusMsg = 'Recording file could not be loaded: ' + err;
+                                        this.statusAlertType = 'error';
+                                        this.changeDetectorRef.detectChanges();
+                                    }
+                                });
+                            }
                         }
-                        else {
-                            //console.debug("Fetch audio and store to indexed db...");
-                            this.audioFetchSubscription = this.recFileService.fetchSprRecordingFileIndDbAudioBuffer(this._controlAudioPlayer.context, this._persistentAudioStorageTarget, this._session.project, rf).subscribe({
-                                next: (iab) => {
-                                    //console.debug("Sessionmanager: Received inddb audio buffer: "+iab);
-                                    nextIab = iab;
+                        else if (AudioStorageType.NET_CHUNKED === audioDownloadType) {
+                            // Fetch chunked audio buffer from network
+                            let nextNetAb = null;
+                            //console.debug("Fetch chunked audio from network");
+                            this.audioFetchSubscription = this.recFileService.fetchSprRecordingFileNetAudioBuffer(this._controlAudioPlayer.context, this._session.project, rf).subscribe({
+                                next: (netAb) => {
+                                    //console.debug("Sessionmanager: Received net audio buffer: "+netAb);
+                                    nextNetAb = netAb;
                                 },
                                 complete: () => {
                                     this.liveLevelDisplayState = State.READY;
                                     let fabDh = null;
-                                    if (nextIab) {
+                                    if (nextNetAb) {
                                         if (rf && this.items) {
-                                            fabDh = new AudioDataHolder(nextIab);
+                                            fabDh = new AudioDataHolder(nextNetAb);
                                             this.items.setSprRecFileAudioData(rf, fabDh);
                                         }
                                     }
@@ -13196,6 +13240,7 @@ class SessionManager extends BasicRecorder {
                                     }
                                     if (fabDh) {
                                         // this.displayAudioClip could have been changed meanwhile, but the recorder unsubcribes before changing the item, therefore there should be no risk to set to wrong item
+                                        //console.debug("set displayRecFile(): fetch net ab complete, set displayAudioClip.")
                                         this.displayAudioClip = new AudioClip(fabDh);
                                     }
                                     this.controlAudioPlayer.audioClip = this.displayAudioClip;
@@ -13210,126 +13255,86 @@ class SessionManager extends BasicRecorder {
                                 }
                             });
                         }
-                    }
-                    else if (AudioStorageType.NET_CHUNKED === audioDownloadType) {
-                        // Fetch chunked audio buffer from network
-                        let nextNetAb = null;
-                        //console.debug("Fetch chunked audio from network");
-                        this.audioFetchSubscription = this.recFileService.fetchSprRecordingFileNetAudioBuffer(this._controlAudioPlayer.context, this._session.project, rf).subscribe({
-                            next: (netAb) => {
-                                //console.debug("Sessionmanager: Received net audio buffer: "+netAb);
-                                nextNetAb = netAb;
-                            },
-                            complete: () => {
-                                this.liveLevelDisplayState = State.READY;
-                                let fabDh = null;
-                                if (nextNetAb) {
-                                    if (rf && this.items) {
-                                        fabDh = new AudioDataHolder(nextNetAb);
-                                        this.items.setSprRecFileAudioData(rf, fabDh);
+                        else if (AudioStorageType.MEM_CHUNKED === audioDownloadType) {
+                            // Fetch chunked array audio buffer
+                            let nextAab = null;
+                            //console.debug("Fetch audio and store to (chunked) array buffer...");
+                            this.audioFetchSubscription = this.recFileService.fetchSprRecordingFileArrayAudioBuffer(this._controlAudioPlayer.context, this._session.project, rf).subscribe({
+                                next: (aab) => {
+                                    nextAab = aab;
+                                },
+                                complete: () => {
+                                    this.liveLevelDisplayState = State.READY;
+                                    let fabDh = null;
+                                    if (nextAab) {
+                                        if (rf && this.items) {
+                                            fabDh = new AudioDataHolder(nextAab);
+                                            this.items.setSprRecFileAudioData(rf, fabDh);
+                                        }
                                     }
-                                }
-                                else {
-                                    // Should actually be handled by the error resolver
-                                    this.statusMsg = 'Recording file could not be loaded.';
-                                    this.statusAlertType = 'error';
-                                }
-                                if (fabDh) {
-                                    // this.displayAudioClip could have been changed meanwhile, but the recorder unsubcribes before changing the item, therefore there should be no risk to set to wrong item
-                                    //console.debug("set displayRecFile(): fetch net ab complete, set displayAudioClip.")
-                                    this.displayAudioClip = new AudioClip(fabDh);
-                                }
-                                this.controlAudioPlayer.audioClip = this.displayAudioClip;
-                                this.showRecording();
-                            },
-                            error: err => {
-                                console.error("Could not load recording file from server: " + err);
-                                this.liveLevelDisplayState = State.READY;
-                                this.statusMsg = 'Recording file could not be loaded: ' + err;
-                                this.statusAlertType = 'error';
-                                this.changeDetectorRef.detectChanges();
-                            }
-                        });
-                    }
-                    else if (AudioStorageType.MEM_CHUNKED === audioDownloadType) {
-                        // Fetch chunked array audio buffer
-                        let nextAab = null;
-                        //console.debug("Fetch audio and store to (chunked) array buffer...");
-                        this.audioFetchSubscription = this.recFileService.fetchSprRecordingFileArrayAudioBuffer(this._controlAudioPlayer.context, this._session.project, rf).subscribe({
-                            next: (aab) => {
-                                nextAab = aab;
-                            },
-                            complete: () => {
-                                this.liveLevelDisplayState = State.READY;
-                                let fabDh = null;
-                                if (nextAab) {
-                                    if (rf && this.items) {
-                                        fabDh = new AudioDataHolder(nextAab);
-                                        this.items.setSprRecFileAudioData(rf, fabDh);
+                                    else {
+                                        // Should actually be handled by the error resolver
+                                        this.statusMsg = 'Recording file could not be loaded.';
+                                        this.statusAlertType = 'error';
                                     }
-                                }
-                                else {
-                                    // Should actually be handled by the error resolver
-                                    this.statusMsg = 'Recording file could not be loaded.';
+                                    if (fabDh) {
+                                        // this.displayAudioClip could have been changed meanwhile, but the recorder unsubcribes before changing the item, therefore there should be no risk to set to wrong item
+                                        this.displayAudioClip = new AudioClip(fabDh);
+                                    }
+                                    this.controlAudioPlayer.audioClip = this.displayAudioClip;
+                                    this.showRecording();
+                                },
+                                error: err => {
+                                    console.error("Could not load recording file from server: " + err);
+                                    this.liveLevelDisplayState = State.READY;
+                                    this.statusMsg = 'Recording file could not be loaded: ' + err;
                                     this.statusAlertType = 'error';
                                 }
-                                if (fabDh) {
-                                    // this.displayAudioClip could have been changed meanwhile, but the recorder unsubcribes before changing the item, therefore there should be no risk to set to wrong item
-                                    this.displayAudioClip = new AudioClip(fabDh);
-                                }
-                                this.controlAudioPlayer.audioClip = this.displayAudioClip;
-                                this.showRecording();
-                            },
-                            error: err => {
-                                console.error("Could not load recording file from server: " + err);
-                                this.liveLevelDisplayState = State.READY;
-                                this.statusMsg = 'Recording file could not be loaded: ' + err;
-                                this.statusAlertType = 'error';
-                            }
-                        });
-                    }
-                    else {
-                        // Fetch regular audio buffer
-                        //console.debug("Fetch audio and store to audio buffer...");
-                        this.audioFetchSubscription = this.recFileService.fetchSprRecordingFileAudioBuffer(this._controlAudioPlayer.context, this._session.project, rf).subscribe({
-                            next: (ab) => {
-                                this.liveLevelDisplayState = State.READY;
-                                let fabDh = null;
-                                if (ab) {
-                                    if (rf && this.items) {
-                                        if (SessionManager.FORCE_ARRRAY_AUDIO_BUFFER) {
-                                            let aab = ArrayAudioBuffer.fromAudioBuffer(ab);
-                                            fabDh = new AudioDataHolder(aab);
-                                        }
-                                        else {
-                                            fabDh = new AudioDataHolder(new AudioBufferSource(ab));
+                            });
+                        }
+                        else {
+                            // Fetch regular audio buffer
+                            //console.debug("Fetch audio and store to audio buffer...");
+                            this.audioFetchSubscription = this.recFileService.fetchSprRecordingFileAudioBuffer(this._controlAudioPlayer.context, this._session.project, rf).subscribe({
+                                next: (ab) => {
+                                    this.liveLevelDisplayState = State.READY;
+                                    let fabDh = null;
+                                    if (ab) {
+                                        if (rf && this.items) {
+                                            if (SessionManager.FORCE_ARRRAY_AUDIO_BUFFER) {
+                                                let aab = ArrayAudioBuffer.fromAudioBuffer(ab);
+                                                fabDh = new AudioDataHolder(aab);
+                                            }
+                                            else {
+                                                fabDh = new AudioDataHolder(new AudioBufferSource(ab));
+                                            }
+                                            this.items.setSprRecFileAudioData(rf, fabDh);
                                         }
-                                        this.items.setSprRecFileAudioData(rf, fabDh);
                                     }
-                                }
-                                else {
-                                    // Should actually be handled by the error resolver
-                                    this.statusMsg = 'Recording file could not be loaded.';
+                                    else {
+                                        // Should actually be handled by the error resolver
+                                        this.statusMsg = 'Recording file could not be loaded.';
+                                        this.statusAlertType = 'error';
+                                    }
+                                    if (fabDh) {
+                                        // this.displayAudioClip could have been changed meanwhile, but the recorder unsubcribes before changing the item, therefore there should be no risk to set to wrong item
+                                        this.displayAudioClip = new AudioClip(fabDh);
+                                    }
+                                    this.controlAudioPlayer.audioClip = this.displayAudioClip;
+                                    this.showRecording();
+                                }, error: err => {
+                                    console.error("Could not load recording file from server: " + err);
+                                    this.liveLevelDisplayState = State.READY;
+                                    this.statusMsg = 'Recording file could not be loaded: ' + err;
                                     this.statusAlertType = 'error';
                                 }
-                                if (fabDh) {
-                                    // this.displayAudioClip could have been changed meanwhile, but the recorder unsubcribes before changing the item, therefore there should be no risk to set to wrong item
-                                    this.displayAudioClip = new AudioClip(fabDh);
-                                }
-                                this.controlAudioPlayer.audioClip = this.displayAudioClip;
-                                this.showRecording();
-                            }, error: err => {
-                                console.error("Could not load recording file from server: " + err);
-                                this.liveLevelDisplayState = State.READY;
-                                this.statusMsg = 'Recording file could not be loaded: ' + err;
-                                this.statusAlertType = 'error';
-                            }
-                        });
+                            });
+                        }
+                    }
+                    else {
+                        this.statusMsg = 'Recording file could not be decoded. Audio context unavailable.';
+                        this.statusAlertType = 'error';
                     }
-                }
-                else {
-                    this.statusMsg = 'Recording file could not be decoded. Audio context unavailable.';
-                    this.statusAlertType = 'error';
                 }
             }
         }
@@ -13369,7 +13374,7 @@ class SessionManager extends BasicRecorder {
             this.applyPrompt();
         }
         if (isNonrecording) {
-            this.displayRecFile = null;
+            this.updateDisplayRecFile(null);
             this.displayRecFileVersion = 0;
             this.startStopSignalState = 4 /* OFF */;
         }
@@ -13384,11 +13389,11 @@ class SessionManager extends BasicRecorder {
                 if (availRecfiles > 0) {
                     let rfVers = availRecfiles - 1;
                     recentRecFile = it.recs[rfVers];
-                    this.displayRecFile = recentRecFile;
+                    this.updateDisplayRecFile(recentRecFile, !temporary);
                     this.displayRecFileVersion = rfVers;
                 }
                 else {
-                    this.displayRecFile = null;
+                    this.updateDisplayRecFile(null);
                     this.displayRecFileVersion = 0;
                 }
             }
@@ -13675,7 +13680,7 @@ class SessionManager extends BasicRecorder {
                         const sr = this.ac.currentSampleRate;
                         const chFl = sr * RecordingService.DEFAULT_CHUNKED_DOWNLOAD_SECONDS;
                         //console.debug("stopped(): rfID: "+this._recordingFile?.recordingFileId+", net ab url: " + burl+", frames: "+this.ac.framesRecorded+", sample rate: "+sr);
-                        let netAb = new NetAudioBuffer(this.ac.context, this.recFileService, burl, this.ac.channelCount, sr, chFl, this.ac.framesRecorded, rUUID, sr);
+                        let netAb = new NetAudioBuffer(this.ac.context, this.recFileService, burl, this.ac.channelCount, sr, chFl, this.ac.framesRecorded, rUUID, chFl);
                         as = netAb;
                         if (this.uploadSet) {
                             //let rp=new ReadyProvider();
@@ -13722,7 +13727,7 @@ class SessionManager extends BasicRecorder {
                             const sr = this.ac.currentSampleRate;
                             const chFl = sr * RecordingService.DEFAULT_CHUNKED_DOWNLOAD_SECONDS;
                             //console.debug("stopped(): rfID: "+this._recordingFile?.recordingFileId+", net ab url: " + burl+", frames: "+this.ac.framesRecorded+", sample rate: "+sr);
-                            const netAb = new NetAudioBuffer(this.ac.context, this.recFileService, burl, this.ac.channelCount, sr, chFl, this.ac.framesRecorded, rUUID, sr);
+                            const netAb = new NetAudioBuffer(this.ac.context, this.recFileService, burl, this.ac.channelCount, sr, chFl, this.ac.framesRecorded, rUUID, chFl);
                             as = netAb;
                             if (this.uploadSet) {
                                 this.uploadSet.onDone = (uploadSet) => {
@@ -16925,7 +16930,7 @@ class AudioRecorder extends BasicRecorder {
                             const sr = this.ac.currentSampleRate;
                             const chFl = sr * RecordingService.DEFAULT_CHUNKED_DOWNLOAD_SECONDS;
                             //console.debug("stopped(): rfID: "+this._recordingFile?.recordingFileId+", net ab url: " + burl+", frames: "+this.ac.framesRecorded+", sample rate: "+sr);
-                            let netAs = new NetAudioBuffer(this.ac.context, this.recFileService, burl, this.ac.channelCount, sr, chFl, this.ac.framesRecorded, rUUID, sr);
+                            let netAs = new NetAudioBuffer(this.ac.context, this.recFileService, burl, this.ac.channelCount, sr, chFl, this.ac.framesRecorded, rUUID, chFl);
                             as = netAs;
                             if (this.uploadSet) {
                                 this.uploadSet.onDone = (uploadSet) => {
@@ -16972,7 +16977,7 @@ class AudioRecorder extends BasicRecorder {
                                 const sr = this.ac.currentSampleRate;
                                 const chFl = sr * RecordingService.DEFAULT_CHUNKED_DOWNLOAD_SECONDS;
                                 //console.debug("stopped(): rfID: "+this._recordingFile?.recordingFileId+", net ab url: " + burl+", frames: "+this.ac.framesRecorded+", sample rate: "+sr);
-                                let netAs = new NetAudioBuffer(this.ac.context, this.recFileService, burl, this.ac.channelCount, sr, chFl, this.ac.framesRecorded, rUUID, sr);
+                                let netAs = new NetAudioBuffer(this.ac.context, this.recFileService, burl, this.ac.channelCount, sr, chFl, this.ac.framesRecorded, rUUID, chFl);
                                 as = netAs;
                                 if (this.uploadSet) {
                                     this.uploadSet.onDone = (uploadSet) => {
@@ -17437,7 +17442,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImpo
                 }]
         }] });
 
-const VERSION = '3.3.0';
+const VERSION = '3.3.2';
 
 /*
  * Public API Surface of speechrecorderng