Mercurial > hg > ugly-duckling
diff src/app/app.module.ts @ 236:53ea6406d601
Generate new project with latest @angular/cli, including Angular 4.
author | Lucas Thompson <dev@lucas.im> |
---|---|
date | Tue, 25 Apr 2017 20:01:09 +0100 |
parents | bd2f5769e7fa |
children | f0c9c9d860e7 |
line wrap: on
line diff
--- a/src/app/app.module.ts Mon Apr 24 17:05:12 2017 +0100 +++ b/src/app/app.module.ts Tue Apr 25 20:01:09 2017 +0100 @@ -4,17 +4,17 @@ import { HttpModule } from '@angular/http'; import { AppComponent } from './app.component'; -import { MaterialModule } from "@angular/material"; import { WaveformComponent } from './waveform/waveform.component'; import { AudioFileOpenComponent } from './audio-file-open/audio-file-open.component'; import { PlaybackControlComponent } from './playback-control/playback-control.component'; import { AudioPlayerService, - UrlResourceLifetimeManager, ResourceReader -} from "./services/audio-player/audio-player.service"; -import { FeatureExtractionService } from "./services/feature-extraction/feature-extraction.service"; -import { FeatureExtractionMenuComponent } from "./feature-extraction-menu/feature-extraction-menu.component"; -import { ProgressSpinnerComponent } from "./progress-spinner/progress-spinner.component"; + UrlResourceLifetimeManager, + ResourceReader +} from './services/audio-player/audio-player.service'; +import { FeatureExtractionService } from './services/feature-extraction/feature-extraction.service'; +import { FeatureExtractionMenuComponent } from './feature-extraction-menu/feature-extraction-menu.component'; +import { ProgressSpinnerComponent } from './progress-spinner/progress-spinner.component'; import { AudioRecorderService, AudioInputProvider, @@ -22,11 +22,12 @@ MediaRecorder as IMediaRecorder, MediaRecorderOptions, ThrowingMediaRecorder, -} from "./services/audio-recorder/audio-recorder.service"; -import {RecordingControlComponent} from "./recording-control/recording-control.component"; -import {NotebookFeedComponent} from "./notebook-feed/notebook-feed.component"; -import {AnalysisItemComponent} from "./analysis-item/analysis-item.component"; -import {ProgressBarComponent} from "./progress-bar/progress-bar"; +} from './services/audio-recorder/audio-recorder.service'; +import {RecordingControlComponent} from './recording-control/recording-control.component'; +import {NotebookFeedComponent} from './notebook-feed/notebook-feed.component'; +import {AnalysisItemComponent} from './analysis-item/analysis-item.component'; +import {ProgressBarComponent} from './progress-bar/progress-bar'; +import {UglyMaterialModule} from './ugly-material.module'; export function createAudioContext(): AudioContext { return new ( @@ -76,7 +77,7 @@ }; } -export function createResourceReader(): ResourceReader{ +export function createResourceReader(): ResourceReader { return (resource) => { return new Promise((res, rej) => { const reader: FileReader = new FileReader(); @@ -108,7 +109,7 @@ BrowserModule, FormsModule, HttpModule, - MaterialModule + UglyMaterialModule ], providers: [ {provide: HTMLAudioElement, useFactory: createAudioElement}, // TODO use something more generic than HTMLAudioElement @@ -118,7 +119,7 @@ AudioRecorderService, FeatureExtractionService, {provide: 'MediaRecorderFactory', useFactory: createMediaRecorderFactory}, - {provide: 'PiperRepoUri', useValue: 'assets/remote-plugins.json'}, + {provide: 'PiperRepoUri', useValue: 'assets/remote-extractors.json'}, {provide: 'UrlResourceLifetimeManager', useFactory: createUrlResourceManager}, {provide: 'ResourceReader', useFactory: createResourceReader} ],