19 second Audio Recording Limit #160

irllabs · Jun 11, 2018 · 25ebcf8 · 25ebcf8
1 parent 9ea744d
commit 25ebcf8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/cors.staging.json b/cors.staging.json
@@ -1,6 +1,6 @@
 [
   {
-    "origin": ["https://cmuartfab.github.io", "http://localhost:3000"],
+    "origin": ["https://irllabs.github.io", "http://localhost:3000"],
     "method": ["GET", "POST", "PUT", "DELETE"],
     "maxAgeSeconds": 3600
   }

diff --git a/src/ui/editor/bottombar/room-editor/room-editor/room-editor.html b/src/ui/editor/bottombar/room-editor/room-editor/room-editor.html
@@ -72,6 +72,7 @@
     </div>
     <audio-recorder
       *ngIf="showAudioRecorder()"
+      [maxRecordTime]="90"
       (onRecorded)="onNarratorIntroRecorded($event)"
       class="audio-editor__record-button room-editor__audio-record-button">
     </audio-recorder>

diff --git a/src/ui/editor/edit-space/room-icon/property-editor/universal-editor/universal-editor.html b/src/ui/editor/edit-space/room-icon/property-editor/universal-editor/universal-editor.html
@@ -86,6 +86,7 @@ <h2 class="hotspot-inspector__label">
 
         <audio-recorder
           *ngIf="showAudioRecorder()"
+          [maxRecordTime]="30"
           (onRecorded)="onAudioRecorded($event)"
           class="universal-editor__record-button">
         </audio-recorder>

diff --git a/src/ui/editor/util/audio-recorder/audio-recorder.ts b/src/ui/editor/util/audio-recorder/audio-recorder.ts
@@ -1,12 +1,13 @@
-import { Component, EventEmitter, NgZone, Output, ViewChild } from '@angular/core';
+import { Component, EventEmitter, Input, NgZone, Output, ViewChild } from '@angular/core';
 import { generateUniqueId } from 'data/util/uuid';
 
 import { AudioRecorderService } from 'ui/editor/util/audioRecorderService';
+import { RoomProperty } from '../../../../data/scene/interfaces/roomProperty';
 
 //this should really refer to colors inn our variables.scss file
 const backgroundColorOff = new Uint8Array([173, 0, 52]);   //i.e. $color-red-dark
 const backgroundColorOn = new Uint8Array([255, 53, 113]);  //i.e. $color-pink
-const MAX_RECORDING_TIME = 20000; //20 seconds
+const MAX_RECORDING_TIME = 20; //20 seconds
 
 @Component({
   selector: 'audio-recorder',
@@ -15,6 +16,7 @@ const MAX_RECORDING_TIME = 20000; //20 seconds
 })
 export class AudioRecorder {
 
+  @Input() maxRecordTime: number = MAX_RECORDING_TIME;
   @Output() onRecorded = new EventEmitter();
   @ViewChild('audioRecorder') audioRecorderButton;
 
@@ -58,7 +60,7 @@ export class AudioRecorder {
       if (this.isRecording) {
         this.stopRecording();
       }
-    }, MAX_RECORDING_TIME);
+    }, this.maxRecordTime * 1000);
   }
 
   private stopRecording() {