From f03452ebbbb58acd19219c56e82fc8cea5477247 Mon Sep 17 00:00:00 2001
From: jberg <jberg@users.noreply.github.com>
Date: Sat, 7 Sep 2019 19:03:44 -0700
Subject: [PATCH] Add getVUMeter functions (#912)

---
 modern/src/Selectors.ts                     |  8 ++++++++
 modern/src/maki-interpreter/objects.test.js |  2 --
 modern/src/runtime/System.ts                | 10 ++++------
 modern/src/store.ts                         |  2 ++
 modern/src/types.ts                         |  2 ++
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/modern/src/Selectors.ts b/modern/src/Selectors.ts
index 22df1476..3b5140d2 100644
--- a/modern/src/Selectors.ts
+++ b/modern/src/Selectors.ts
@@ -7,3 +7,11 @@ export function getMakiTree(state: ModernAppState): MakiTree | null {
 export function getVolume(state: ModernAppState): number {
   return state.volume;
 }
+
+export function getRightVUMeter(state: ModernAppState): number {
+  return state.rightVUMeter;
+}
+
+export function getLeftVUMeter(state: ModernAppState): number {
+  return state.leftVUMeter;
+}
diff --git a/modern/src/maki-interpreter/objects.test.js b/modern/src/maki-interpreter/objects.test.js
index f12ebff9..912adcda 100644
--- a/modern/src/maki-interpreter/objects.test.js
+++ b/modern/src/maki-interpreter/objects.test.js
@@ -101,8 +101,6 @@ Set {
   "System.geteqband",
   "System.geteqpreamp",
   "System.getstatus",
-  "System.getleftvumeter",
-  "System.getrightvumeter",
   "System.getplayitemlength",
   "System.seekto",
   "System.onscriptloaded",
diff --git a/modern/src/runtime/System.ts b/modern/src/runtime/System.ts
index f112fa0b..1ea889c8 100644
--- a/modern/src/runtime/System.ts
+++ b/modern/src/runtime/System.ts
@@ -129,14 +129,12 @@ class System extends MakiObject {
     }
   }
 
-  getleftvumeter() {
-    unimplementedWarning("getleftvumeter");
-    return 0.5;
+  getleftvumeter(): number {
+    return Selectors.getLeftVUMeter(this._store.getState());
   }
 
-  getrightvumeter() {
-    unimplementedWarning("getrightvumeter");
-    return 0.5;
+  getrightvumeter(): number {
+    return Selectors.getRightVUMeter(this._store.getState());
   }
 
   // Seems like volume is 0-255
diff --git a/modern/src/store.ts b/modern/src/store.ts
index 634dc428..1733e1f8 100644
--- a/modern/src/store.ts
+++ b/modern/src/store.ts
@@ -6,6 +6,8 @@ import thunk from "redux-thunk";
 const defaultState = {
   makiTree: null,
   volume: 127,
+  rightVUMeter: 127,
+  leftVUMeter: 127,
   xmlTree: null,
   skinLoaded: false,
 };
diff --git a/modern/src/types.ts b/modern/src/types.ts
index dcd87805..b2a1abd4 100644
--- a/modern/src/types.ts
+++ b/modern/src/types.ts
@@ -18,6 +18,8 @@ export type ModernAppState = {
   makiTree: MakiTree | null;
   xmlTree: XmlTree | null;
   volume: number;
+  rightVUMeter: number;
+  leftVUMeter: number;
   skinLoaded: boolean;
 };
 export type ModernAction =