Safer use of volumeCallBack

SuaMusica · Jan 7, 2019 · 9332e54 · 9332e54
1 parent 64e3838
commit 9332e54
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/index.dart b/index.dart
@@ -29,7 +29,7 @@ void startCasting() async {
   // try to load previous state saved as json in saved_cast_state.json
   Map savedState;
   try {
-    File savedStateFile = await File('./saved_cast_state.json');
+    File savedStateFile = await File("saved_cast_state.json");
     if (null != savedStateFile) {
       savedState = jsonDecode(await savedStateFile.readAsString());
     }
@@ -124,6 +124,8 @@ void startCasting() async {
   // s = stop playing
   // left arrow = seek current playback - 10s
   // right arrow = seek current playback + 10s
+
+  stdin.echoMode = false;
   stdin.lineMode = false;
   stdin.listen(_handleUserInput);
 

diff --git a/lib/casting/cast_device.dart b/lib/casting/cast_device.dart
@@ -57,8 +57,10 @@ class CastDevice extends ChangeNotifier {
   CastModel castModel;
 
   CastDevice({this.name, this.type, this.host, this.port, this.attr}) {
-    modelName = utf8.decode(attr['md']);
-    friendlyName = utf8.decode(attr['fn']);
+    if (attr != null) {
+      modelName = utf8.decode(attr['md']);
+      friendlyName = utf8.decode(attr['fn']);
+    }
 
     switch (modelName) {
       case "Google Home":
@@ -86,9 +88,9 @@ class CastDevice extends ChangeNotifier {
         castModel = CastModel.NonGoogle;
         break;
     }
+
   }
 
-
   CastDeviceType get deviceType {
     if (type.startsWith('_googlecast._tcp')) {
       return CastDeviceType.ChromeCast;
@@ -98,8 +100,6 @@ class CastDevice extends ChangeNotifier {
     return CastDeviceType.Unknown;
   }
 
-
-
   /// Comparator
   /// In a List, the order will be:
   ///
@@ -130,15 +130,17 @@ class CastDevice extends ChangeNotifier {
             b.castModel == CastModel.GoogleMax ||
             b.castModel == CastModel.GoogleHub) {
           return 1; // Go down under GoogleHome
-        } else if (b.castModel == CastModel.CastGroup || b.castModel == CastModel.NonGoogle) {
+        } else if (b.castModel == CastModel.CastGroup ||
+            b.castModel == CastModel.NonGoogle) {
           return -1; // Before castGroup and NonGoogle in list
         } else {
           return this.host.compareTo(b.host);
         }
         break;
       case CastModel.NonGoogle:
       case CastModel.CastGroup:
-        if (b.castModel != CastModel.CastGroup && b.castModel != CastModel.NonGoogle) {
+        if (b.castModel != CastModel.CastGroup &&
+            b.castModel != CastModel.NonGoogle) {
           return 1;
         } else {
           return this.host.compareTo(b.host);
@@ -149,6 +151,5 @@ class CastDevice extends ChangeNotifier {
         return this.host.compareTo(b.host);
         break;
     }
-
   }
 }
diff --git a/lib/casting/cast_sender.dart b/lib/casting/cast_sender.dart
@@ -65,7 +65,7 @@ class CastSender extends Object {
   /// OVERRIDE FOR PRINT
   ///
   /// This is there so print() is disabled in release versions. NOT FOR USE.
-  void print(dynamic theString) {}
+  //void print(dynamic theString) {}
 
   /// The callback you set is called everytime:
   ///
@@ -280,7 +280,9 @@ class CastSender extends Object {
         if ('CLOSE' == payloadMap['type']) {
           _dispose();
           connectionDidClose = true;
-          _volumeChangedCallback();
+          if (_volumeChangedCallback!=null) {
+            _volumeChangedCallback();
+          }
         }
         if ('RECEIVER_STATUS' == payloadMap['type']) {
           _handleReceiverStatus(payloadMap);
@@ -387,7 +389,9 @@ class CastSender extends Object {
 
     // Only update UI if new values
     if (refresh) {
-      _volumeChangedCallback();
+      if (_volumeChangedCallback != null) {
+        _volumeChangedCallback();
+      }
     }
 
     try {