@rocketshow/designer 1.58.0 → 1.60.0

package/index.d.ts

@@ -12,11 +12,11 @@ import * as i40 from '@angular/router';
 import { Router, ActivatedRoute } from '@angular/router';
 import * as THREE from 'three';
 import WaveSurfer from 'wavesurfer.js';
+import { Options } from 'sortablejs';
 import * as i51 from '@ali-hm/angular-tree-component';
 import { ITreeOptions } from '@ali-hm/angular-tree-component';
 import * as i49 from 'ngx-dropzone-wrapper';
 import { DropzoneConfigInterface } from 'ngx-dropzone-wrapper';
-import { Options } from 'sortablejs';
 import * as i41 from '@angular/platform-browser';
 import * as i42 from '@angular/platform-browser/animations';
 import * as i43 from '@angular/forms';
@@ -560,6 +560,15 @@ declare class PresetRegionScene {
     constructor(preset: Preset, region: ScenePlaybackRegion, scene: Scene);
 }
 
+declare class EffectService {
+    selectedEffect: Effect;
+    effectsOpen: boolean;
+    effectsOpenChanged: Subject<void>;
+    constructor();
+    static ɵfac: i0.ɵɵFactoryDeclaration<EffectService, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<EffectService>;
+}
+
 declare class AnimationService {
     timeMillis: number;
     constructor();
@@ -585,13 +594,29 @@ declare class ConfigService {
     static ɵprov: i0.ɵɵInjectableDeclaration<ConfigService>;
 }
 
-declare class EffectService {
-    selectedEffect: Effect;
-    effectsOpen: boolean;
-    effectsOpenChanged: Subject<void>;
+declare class TimelineStateService {
+    playState: string;
+    selectedComposition: Composition;
+    selectedCompositionIndex: number;
     constructor();
-    static ɵfac: i0.ɵɵFactoryDeclaration<EffectService, never>;
-    static ɵprov: i0.ɵɵInjectableDeclaration<EffectService>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<TimelineStateService, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<TimelineStateService>;
+}
+
+declare class LivePreviewService {
+    private configService;
+    private http;
+    private projectService;
+    private animationService;
+    private timelineStateService;
+    private livePreviewTimer;
+    private liveChangePending;
+    private livePreviewPendingPositionMillis;
+    constructor(configService: ConfigService, http: HttpClient, projectService: ProjectService, animationService: AnimationService, timelineStateService: TimelineStateService);
+    previewLive(compositionName?: string, positionMillis?: number): void;
+    stopPreviewPlay(): void;
+    static ɵfac: i0.ɵɵFactoryDeclaration<LivePreviewService, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<LivePreviewService>;
 }
 
 declare class PresetService {
@@ -599,17 +624,13 @@ declare class PresetService {
     private uuidService;
     private projectService;
     private fixtureService;
-    private configService;
-    private http;
-    private animationService;
+    private livePreviewService;
     selectedPreset: Preset;
     previewSelectionChanged: Subject<void>;
     fixtureSelectionChanged: Subject<void>;
     fixtureSelectionSettingsChanged: Subject<void>;
     fixtureColorChanged: Subject<void>;
-    livePreviewTimer: any;
-    liveChangePending: boolean;
-    constructor(effectService: EffectService, uuidService: UuidService, projectService: ProjectService, fixtureService: FixtureService, configService: ConfigService, http: HttpClient, animationService: AnimationService);
+    constructor(effectService: EffectService, uuidService: UuidService, projectService: ProjectService, fixtureService: FixtureService, livePreviewService: LivePreviewService);
     getPresetByUuid(uuid: string): Preset;
     fixtureUuidAndPixelKeyEquals(fixtureUuid1: string, fixtureUuid2: string, pixelKey1: string, pixelKey2: string): boolean;
     getPresetFixture(preset: Preset, fixtureUuid: string, pixelKey?: string): PresetFixture;
@@ -637,8 +658,6 @@ declare class PresetService {
     addPreset(name?: string): void;
     getSelectedProfiles(): FixtureProfile[];
     getSelectedProfileChannels(selectedProfiles: FixtureProfile[]): Map<FixtureProfile, CachedFixtureChannel[]>;
-    previewLive(compositionName?: string, positionMillis?: number): void;
-    stopPreviewPlay(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<PresetService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<PresetService>;
 }
@@ -648,12 +667,13 @@ declare class SceneService {
     private effectService;
     private presetService;
     private projectService;
+    private livePreviewService;
     selectedScenes: Scene[];
     sceneColors: string[];
     multipleSelection: boolean;
     sceneDeleted: Subject<void>;
     sceneSelected: Subject<void>;
-    constructor(uuidService: UuidService, effectService: EffectService, presetService: PresetService, projectService: ProjectService);
+    constructor(uuidService: UuidService, effectService: EffectService, presetService: PresetService, projectService: ProjectService, livePreviewService: LivePreviewService);
     sceneIsSelected(scene: Scene): boolean;
     presetIsSelected(preset: Preset): boolean;
     switchSceneSelection(scene: Scene): void;
@@ -673,8 +693,9 @@ declare class TimelineService {
     private http;
     private configService;
     private ngZone;
+    private timelineStateService;
+    private livePreviewService;
     waveSurfer: WaveSurfer;
-    playState: string;
     zoom: number;
     private timeUpdateSubscription;
     currentTime: string;
@@ -686,11 +707,15 @@ declare class TimelineService {
     duration: string;
     waveSurferReady: Subject<void>;
     detectChanges: Subject<void>;
-    selectedComposition: Composition;
-    selectedCompositionIndex: number;
     externalCompositionsAvailable: boolean;
     loadingAudioFile: boolean;
-    constructor(sceneService: SceneService, presetService: PresetService, projectService: ProjectService, http: HttpClient, configService: ConfigService, ngZone: NgZone);
+    constructor(sceneService: SceneService, presetService: PresetService, projectService: ProjectService, http: HttpClient, configService: ConfigService, ngZone: NgZone, timelineStateService: TimelineStateService, livePreviewService: LivePreviewService);
+    get playState(): string;
+    set playState(playState: string);
+    get selectedComposition(): Composition;
+    set selectedComposition(selectedComposition: Composition);
+    get selectedCompositionIndex(): number;
+    set selectedCompositionIndex(selectedCompositionIndex: number);
     private redrawAllRegions;
     private pad;
     private msToTime;
@@ -701,7 +726,7 @@ declare class TimelineService {
     timeInterval(pxPerSec: number): number;
     primaryLabelInterval(pxPerSec: number): number;
     secondaryLabelInterval(pxPerSec: number): 0 | 2 | 5;
-    private seeekWithTimeline;
+    private seekWithTimeline;
     applyZoom(zoom: any): void;
     private isWaveSurferReady;
     addRegion(waveSurferRegion?: any): void;
@@ -858,7 +883,8 @@ declare class ProjectLoadService {
     private router;
     private activatedRoute;
     private warningDialogService;
-    constructor(projectService: ProjectService, previewService: PreviewService, fixtureService: FixtureService, presetService: PresetService, sceneService: SceneService, modalService: BsModalService, uuidService: UuidService, timelineService: TimelineService, router: Router, activatedRoute: ActivatedRoute, warningDialogService: WarningDialogService);
+    private livePreviewService;
+    constructor(projectService: ProjectService, previewService: PreviewService, fixtureService: FixtureService, presetService: PresetService, sceneService: SceneService, modalService: BsModalService, uuidService: UuidService, timelineService: TimelineService, router: Router, activatedRoute: ActivatedRoute, warningDialogService: WarningDialogService, livePreviewService: LivePreviewService);
     private migrateToVersion2;
     private migrateFromOldProject;
     private afterLoad;
@@ -891,13 +917,13 @@ declare class TimelineComponent implements OnInit, AfterViewInit {
     private warningDialogService;
     private http;
     private configService;
-    private presetService;
     introService: IntroService;
+    private livePreviewService;
     waveWrapper: ElementRef;
     waveElement: ElementRef;
     private lastHeight;
     private lastWidth;
-    constructor(timelineService: TimelineService, changeDetectorRef: ChangeDetectorRef, modalService: BsModalService, uuidService: UuidService, projectService: ProjectService, hotkeyTargetExcludeService: HotkeyTargetExcludeService, warningDialogService: WarningDialogService, http: HttpClient, configService: ConfigService, presetService: PresetService, introService: IntroService);
+    constructor(timelineService: TimelineService, changeDetectorRef: ChangeDetectorRef, modalService: BsModalService, uuidService: UuidService, projectService: ProjectService, hotkeyTargetExcludeService: HotkeyTargetExcludeService, warningDialogService: WarningDialogService, http: HttpClient, configService: ConfigService, introService: IntroService, livePreviewService: LivePreviewService);
     ngOnInit(): void;
     ngAfterViewInit(): void;
     onResize(): void;
@@ -1015,6 +1041,7 @@ declare class EffectCurveComponent implements OnInit, OnDestroy {
     private translate;
     private effectService;
     private ngZone;
+    livePreviewService: LivePreviewService;
     private gridUpdateSubscription;
     private ctx;
     private maxWidth;
@@ -1037,7 +1064,7 @@ declare class EffectCurveComponent implements OnInit, OnDestroy {
     curve: EffectCurve;
     set isSelected(value: boolean);
     curveGrid: ElementRef;
-    constructor(presetService: PresetService, animationService: AnimationService, fixtureService: FixtureService, translate: TranslateService, effectService: EffectService, ngZone: NgZone);
+    constructor(presetService: PresetService, animationService: AnimationService, fixtureService: FixtureService, translate: TranslateService, effectService: EffectService, ngZone: NgZone, livePreviewService: LivePreviewService);
     ngOnInit(): void;
     ngOnDestroy(): void;
     private startUpdateTimer;
@@ -1096,13 +1123,14 @@ declare class FixtureCapabilityColorComponent implements OnInit, OnDestroy {
     private presetService;
     private fixtureService;
     private changeDetectorRef;
+    private livePreviewService;
     color: string;
     colorPicker: any;
     active: boolean;
     private colorPickerMounted;
     private updatingColor;
     private updateSubscription;
-    constructor(presetService: PresetService, fixtureService: FixtureService, changeDetectorRef: ChangeDetectorRef);
+    constructor(presetService: PresetService, fixtureService: FixtureService, changeDetectorRef: ChangeDetectorRef, livePreviewService: LivePreviewService);
     private update;
     private setPickerColor;
     ngOnDestroy(): void;
@@ -1121,13 +1149,16 @@ declare class FixtureComponent implements OnInit {
     private fixturePoolService;
     fixtureService: FixtureService;
     introService: IntroService;
-    constructor(projectService: ProjectService, presetService: PresetService, fixturePoolService: FixturePoolService, fixtureService: FixtureService, introService: IntroService);
+    private livePreviewService;
+    fixtureSortableOptions: Options;
+    constructor(projectService: ProjectService, presetService: PresetService, fixturePoolService: FixturePoolService, fixtureService: FixtureService, introService: IntroService, livePreviewService: LivePreviewService);
     ngOnInit(): void;
     fixtureName(presetFixture: PresetFixture): string;
     fixtureIsSelected(presetFixture: PresetFixture): boolean;
     selectFixture(event: any, presetFixture: PresetFixture): void;
     selectAll(): void;
     selectNone(): void;
+    fixtureListReordered(): void;
     openFixturePool(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<FixtureComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<FixtureComponent, "lib-app-fixture", never, {}, {}, never, never, false, never>;
@@ -1204,7 +1235,8 @@ declare class EffectComponent implements OnInit {
     presetService: PresetService;
     effectService: EffectService;
     private warningDialogService;
-    constructor(uuidService: UuidService, presetService: PresetService, effectService: EffectService, warningDialogService: WarningDialogService);
+    livePreviewService: LivePreviewService;
+    constructor(uuidService: UuidService, presetService: PresetService, effectService: EffectService, warningDialogService: WarningDialogService, livePreviewService: LivePreviewService);
     ngOnInit(): void;
     private addEffect;
     addCurveEffect(): void;
@@ -1226,6 +1258,7 @@ declare class FixturePoolComponent implements OnInit {
     private presetService;
     configService: ConfigService;
     private modalService;
+    private livePreviewService;
     private profiles;
     filteredProfiles: FixtureProfile[];
     loadingProfiles: boolean;
@@ -1239,7 +1272,7 @@ declare class FixturePoolComponent implements OnInit {
     onClose: Subject<number>;
     searchExpression: string;
     updatingProfiles: boolean;
-    constructor(bsModalRef: BsModalRef, fixtureService: FixtureService, uuidService: UuidService, projectService: ProjectService, previewService: PreviewService, translateService: TranslateService, toastrService: ToastrService, presetService: PresetService, configService: ConfigService, modalService: BsModalService);
+    constructor(bsModalRef: BsModalRef, fixtureService: FixtureService, uuidService: UuidService, projectService: ProjectService, previewService: PreviewService, translateService: TranslateService, toastrService: ToastrService, presetService: PresetService, configService: ConfigService, modalService: BsModalService, livePreviewService: LivePreviewService);
     ngOnInit(): void;
     private loadProfiles;
     selectFixture(fixture: Fixture): void;
@@ -1289,8 +1322,8 @@ declare class PresetComponent implements OnInit {
 declare class MasterDimmerComponent implements OnInit {
     projectService: ProjectService;
     private changeDetectorRef;
-    private presetService;
-    constructor(projectService: ProjectService, changeDetectorRef: ChangeDetectorRef, presetService: PresetService);
+    private livePreviewService;
+    constructor(projectService: ProjectService, changeDetectorRef: ChangeDetectorRef, livePreviewService: LivePreviewService);
     ngOnInit(): void;
     setValue(value: any): void;
     getValue(): number;
@@ -1301,7 +1334,8 @@ declare class MasterDimmerComponent implements OnInit {
 declare class FixtureCapabilityDimmerComponent implements OnInit {
     private presetService;
     private changeDetectorRef;
-    constructor(presetService: PresetService, changeDetectorRef: ChangeDetectorRef);
+    private livePreviewService;
+    constructor(presetService: PresetService, changeDetectorRef: ChangeDetectorRef, livePreviewService: LivePreviewService);
     ngOnInit(): void;
     getValue(): number;
     getValueText(): number;
@@ -1375,7 +1409,8 @@ declare class ArraySortPipe implements PipeTransform {
 declare class FixtureCapabilityPanTiltComponent implements OnInit {
     private presetService;
     private changeDetectorRef;
-    constructor(presetService: PresetService, changeDetectorRef: ChangeDetectorRef);
+    private livePreviewService;
+    constructor(presetService: PresetService, changeDetectorRef: ChangeDetectorRef, livePreviewService: LivePreviewService);
     ngOnInit(): void;
     getValuePan(): number;
     getValueTextPan(): number;
@@ -1390,6 +1425,7 @@ declare class FixtureCapabilityPanTiltComponent implements OnInit {
 
 declare class FixtureCapabilityChannelComponent implements OnInit {
     private presetService;
+    private livePreviewService;
     sliderValue: ElementRef;
     selectedCapability: CachedFixtureCapability;
     _channel: CachedFixtureChannel;
@@ -1406,7 +1442,7 @@ declare class FixtureCapabilityChannelComponent implements OnInit {
     profile: FixtureProfile;
     set channel(value: CachedFixtureChannel);
     capabilityIndex: number;
-    constructor(presetService: PresetService);
+    constructor(presetService: PresetService, livePreviewService: LivePreviewService);
     private updateChannel;
     capabilityHasRange(): boolean;
     getDescriptionStart(capability: CachedFixtureCapability): string;
@@ -1448,6 +1484,7 @@ declare class FixtureCapabilityColorWheelComponent implements OnInit, OnDestroy
     presetService: PresetService;
     private changeDetectorRef;
     private fixtureService;
+    private livePreviewService;
     _fixtureProfile: FixtureProfile;
     _channel: CachedFixtureChannel;
     wheelName: string;
@@ -1458,7 +1495,7 @@ declare class FixtureCapabilityColorWheelComponent implements OnInit, OnDestroy
     set channel(value: CachedFixtureChannel);
     wheelIndex: number;
     showContainer: boolean;
-    constructor(presetService: PresetService, changeDetectorRef: ChangeDetectorRef, fixtureService: FixtureService);
+    constructor(presetService: PresetService, changeDetectorRef: ChangeDetectorRef, fixtureService: FixtureService, livePreviewService: LivePreviewService);
     ngOnInit(): void;
     ngOnDestroy(): void;
     private update;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rocketshow/designer",
-  "version": "1.58.0",
+  "version": "1.60.0",
   "dependencies": {
     "tslib": "^2.0.0"
   },