Merge branch 'develop'

Swapped to the local stream as default
2026-05-09 14:28:43 +00:00 · 2017-05-25 15:56:10 +12:00 · 2017-05-25 15:56:02 +12:00
1 changed files with 1 additions and 4 deletions
@@ -68,10 +68,7 @@ public class App extends Application {
        }
        //Change the StreamReceiver in this else block to change the default data source.
        else{
-//            sr = new StreamReceiver("localhost", 4949, "RaceStream");
+            sr = new StreamReceiver("localhost", 4949, "RaceStream");
 //            sr = new StreamReceiver("csse-s302staff.canterbury.ac.nz", 4941, "RaceStream");
 //            sr = new StreamReceiver("csse-s302staff.canterbury.ac.nz", 4942, "RaceStream");
            sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream");
        }
        sr.start();
Author	SHA1	Message	Date
Kusal Ekanayake	762829e5ff	Merge branch 'develop'	2017-05-25 15:56:10 +12:00
Kusal Ekanayake	835f79b113	Swapped to the local stream as default	2017-05-25 15:56:02 +12:00