Adds music and two different mixers

Author: omundy

Assets/MusicMixer.mixer

@@ -0,0 +1,68 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!241 &24100000
+AudioMixerController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: MusicMixer
+  m_OutputGroup: {fileID: 0}
+  m_MasterGroup: {fileID: 24300002}
+  m_Snapshots:
+  - {fileID: 24500006}
+  m_StartSnapshot: {fileID: 24500006}
+  m_SuspendThreshold: -80
+  m_EnableSuspend: 1
+  m_UpdateMode: 0
+  m_ExposedParameters: []
+  m_AudioMixerGroupViews:
+  - guids:
+    - a5c318b8981244adcb074e1073daf651
+    name: View
+  m_CurrentViewIndex: 0
+  m_TargetSnapshot: {fileID: 24500006}
+--- !u!243 &24300002
+AudioMixerGroupController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Master
+  m_AudioMixer: {fileID: 24100000}
+  m_GroupID: a5c318b8981244adcb074e1073daf651
+  m_Children: []
+  m_Volume: 2657a89d435804fa59caf76206dd0417
+  m_Pitch: 83d4fa43e295b44f89970847a94ea60b
+  m_Send: 00000000000000000000000000000000
+  m_Effects:
+  - {fileID: 24400004}
+  m_UserColorIndex: 0
+  m_Mute: 0
+  m_Solo: 0
+  m_BypassEffects: 0
+--- !u!244 &24400004
+AudioMixerEffectController:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_EffectID: a5b3fba50c1c641f0bcdefe2f332740a
+  m_EffectName: Attenuation
+  m_MixLevel: dbbb4119b5731447a828cb690ea2fa52
+  m_Parameters: []
+  m_SendTarget: {fileID: 0}
+  m_EnableWetMix: 0
+  m_Bypass: 0
+--- !u!245 &24500006
+AudioMixerSnapshotController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Snapshot
+  m_AudioMixer: {fileID: 24100000}
+  m_SnapshotID: a29767dbfa8e042259352a6972b82c73
+  m_FloatValues: {}
+  m_TransitionOverrides: {}

Assets/MusicMixer.mixer.meta

@@ -1588,7 +1588,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   chosenHost: 1
-  chosenEndpoint: 5
+  chosenEndpoint: 6
   path: 
 --- !u!114 &481131869
 MonoBehaviour:
@@ -1861,7 +1861,9 @@ MonoBehaviour:
   feedIndex: 0
   timeDiff: 0
   timeDiffScaled: 0
-  timeDiffScalar: 0.1
+  timeDiffScalar: 0.29
+  minTimeDiff: 1
+  maxTimeDiff: 10
   feedText: {fileID: 1617634874}
   scrollRect: {fileID: 890586782}
 --- !u!4 &586953496 stripped

Assets/_Project/Scenes/tally-viz.unity

@@ -49,7 +49,9 @@ public static string GetSymbol (string name)
     {
         string symbol;
         symbolDictionary.TryGetValue (name, out symbol);
-        return symbol.ToString ();
+        if (symbol != null)
+            return symbol.ToString ();
+        return "";
     }
 
 

Assets/_Project/Scripts/Core/DebugManager.cs

@@ -47,6 +47,7 @@ public enum EndpointType {
         rangePlusStreamOneDay,
         rangePlusStream12Hour,
         rangePlusStream6Hour,
+        rangePlusStream3Hour,
         rangePlusStream1Hour,
         rangePlusStreamFiveMinute
     }
@@ -57,6 +58,7 @@ public enum EndpointType {
         "feed/range/plusStream/1/day",  // 1 day
         "feed/range/plusStream/12/hour", // 6 hour
         "feed/range/plusStream/6/hour", // 6 hour
+        "feed/range/plusStream/3/hour", // 1 hour
         "feed/range/plusStream/1/hour", // 1 hour
         "feed/range/plusStream/5/minute" // 5 minutes
     };
@@ -73,7 +75,7 @@ public enum EndpointType {
     // the number of events
     public static int dataCount;
     // the current data as string
-    public static string current;
+    public static string currentEventStr;
     // as list
     public static IList<FeedData> feeds = new List<FeedData> ();
 
@@ -282,8 +284,8 @@ public static IEnumerator GetRequest (string uri)
 
                 // FOR DEBUGGING - MAY OR MAY NOT HAVE A GARBAGE COLLECTION ISSUE
 
-                //// reset current
-                //current = "";
+                //// reset currentEventStr
+                //currentEventStr = "";
 
                 //foreach (var feed in feeds) {
 
@@ -299,7 +301,7 @@ public static IEnumerator GetRequest (string uri)
                 //        ""
                 //        ;
 
-                //    current += line + "<br>";
+                //    currentEventStr += line + "<br>";
 
                 //    //Debug.Log(line);
                 //}

Assets/_Project/Scripts/Data/DataManager.cs

@@ -25,6 +25,12 @@ protected TimelineManager () { }
     public float timeDiffScalar = 0.01f;  // timeDiff * scalar = how much faster time is replayed 
 
 
+    // min and max allowed between events
+    public float minTimeDiff = 1;
+    public float maxTimeDiff = 10;
+
+
+
     // UI
 
     public TMP_Text feedText;

Assets/_Project/Scripts/Data/TimelineManager.cs

@@ -29,6 +29,13 @@ void Awake ()
             // default to main mixergroup if not set
             s.source.outputAudioMixerGroup = s.mixerGroup ? s.mixerGroup : mixerGroup;
         }
+
+
+    }
+
+    private void Start ()
+    {
+        Play ("music");
     }
 
     public void Play (string sound)
@@ -47,4 +54,6 @@ public void Play (string sound)
         s.source.PlayOneShot (s.source.clip);
     }
 
+    //AudioManager.Instance.Play("music");
+
 }

Assets/_Project/Scripts/Sound/AudioManager.cs

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:188f018063e0b1a7787298aa5afa5bc5f3e20dff951376dbc1440d215f5a7436
-size 2891
+oid sha256:8d3e2f161a8a14e7e7d79765cb0aa712668716e75236e2b7dedbe947e3027ca3
+size 2880