From 2d8ee13fc778551e5e4d35e700f1eb3baf61fed2 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Sat, 20 Jun 2020 07:25:20 +0000
Subject: [PATCH] Update the State Management code

---
 package.json                                      |  2 +-
 .../components/main-view/main-view.component.ts   |  2 +-
 src/app/openlp.service.ts                         | 15 +--------------
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index d79d477..ce16c7a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openlp/web-remote",
-  "version": "0.9.3",
+  "version": "0.9.4",
   "description": "The web remote for OpenLP, written in Angular",
   "keywords": ["OpenLP", "Angular", "Remote"],
   "homepage": "https://openlp.org/",
diff --git a/src/app/components/main-view/main-view.component.ts b/src/app/components/main-view/main-view.component.ts
index 3da7bd1..3ebc4f4 100644
--- a/src/app/components/main-view/main-view.component.ts
+++ b/src/app/components/main-view/main-view.component.ts
@@ -12,7 +12,7 @@ export class MainViewComponent implements OnInit {
 
   ngOnInit() {
     this.updateImage();
-    this.openlpService.liveChanged$.subscribe(item => this.updateImage());
+    this.openlpService.stateChanged$.subscribe(item => this.updateImage());
   }
 
   updateImage(): void {
diff --git a/src/app/openlp.service.ts b/src/app/openlp.service.ts
index be17c1d..7bbe660 100644
--- a/src/app/openlp.service.ts
+++ b/src/app/openlp.service.ts
@@ -36,7 +36,6 @@ const httpOptions = {
 export class OpenLPService {
   private apiURL: string;
   public stateChanged$: EventEmitter<State>;
-  public liveChanged$: EventEmitter<State>;
 
   constructor(private http: HttpClient) {
     const host = window.location.hostname;
@@ -51,7 +50,7 @@ export class OpenLPService {
 
     this.stateChanged$ = new EventEmitter<State>();
     this.retrieveSystemInformation().subscribe(info => {
-    const ws = new WebSocket(`ws://${host}:${info.websocket_port}/state`);
+    const ws = new WebSocket(`ws://${host}:${info.websocket_port}`);
       ws.onmessage = (event) => {
         const reader = new FileReader();
         reader.onload = () => {
@@ -61,18 +60,6 @@ export class OpenLPService {
         reader.readAsText(event.data);
       };
     });
-    this.liveChanged$ = new EventEmitter<State>();
-    this.retrieveSystemInformation().subscribe(info => {
-    const ws = new WebSocket(`ws://${host}:${info.websocket_port}/live_changed`);
-      ws.onmessage = (event) => {
-        const reader = new FileReader();
-        reader.onload = () => {
-          const state = deserialize(JSON.parse(reader.result as string).results, State);
-          this.liveChanged$.emit(state);
-        };
-        reader.readAsText(event.data);
-      };
-    });
   }
 
   setAuthToken(token: string): void {