Merge pull request #103 from Tapanila/dev

0.4.0
Tapanila · May 21, 2017 · b244e19 · b244e19
2 parents e5e8c8d + d2ef099
commit b244e19
Show file tree

Hide file tree

Showing 76 changed files with 3,569 additions and 310 deletions.
diff --git a/SharpCaster.Console/Program.cs b/SharpCaster.Console/Program.cs
@@ -54,8 +54,45 @@ private static async void ChromeCastClient_Connected(object sender, EventArgs e)
             }
         }
 
-        private static void ChromeCastClient_MediaStatusChanged(object sender, MediaStatus e)
+        private async static void ChromeCastClient_MediaStatusChanged(object sender, MediaStatus e)
         {
+            if (e.PlayerState == PlayerState.Playing)
+            {
+                await Task.Delay(2000);
+                await ChromecastService.ChromeCastClient.DisconnectChromecast();
+                _controller = null;
+                await Task.Delay(5000);
+                var devices = await ChromecastService.StartLocatingDevices();
+
+                if (devices.Count == 0)
+                {
+                    System.Console.WriteLine("No chromecasts found");
+                    return;
+                }
+
+                var firstChromecast = devices.First();
+                System.Console.WriteLine("Device found " + firstChromecast.FriendlyName);
+                ChromecastService.ConnectToChromecast(firstChromecast);
+                await Task.Delay(5000);
+                _controller = await ChromecastService.ChromeCastClient.LaunchSharpCaster();
+                await Task.Delay(4000);
+                var track = new Track
+                {
+                    Name = "English Subtitle",
+                    TrackId = 100,
+                    Type = "TEXT",
+                    SubType = "captions",
+                    Language = "en-US",
+                    TrackContentId =
+               "https://commondatastorage.googleapis.com/gtv-videos-bucket/CastVideos/tracks/DesigningForGoogleCast-en.vtt"
+                };
+                while (_controller == null)
+                {
+                    await Task.Delay(500);
+                }
+
+                await _controller.LoadMedia("https://commondatastorage.googleapis.com/gtv-videos-bucket/CastVideos/mp4/DesigningForGoogleCast.mp4", "video/mp4", null, "BUFFERED", 0D, null, new[] { track }, new[] { 100 });
+            }
         }
 
         private static void _client_VolumeChanged(object sender, Volume e)

diff --git a/SharpCaster.Console/SharpCaster.Console.csproj b/SharpCaster.Console/SharpCaster.Console.csproj
@@ -35,6 +35,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Google.Protobuf, Version=3.3.0.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
+      <HintPath>..\packages\Google.Protobuf.3.3.0\lib\net45\Google.Protobuf.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
       <Private>True</Private>
@@ -47,16 +51,8 @@
       <HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="protobuf-net, Version=2.0.0.668, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\protobuf-net-sharpcaster.2.0.0.668\lib\portable46-net451+win81+wpa81\protobuf-net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Rssdp.Native, Version=2.0.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rssdp.2.0.0.5\lib\net40\Rssdp.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Rssdp.Portable, Version=2.0.0.4, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rssdp.2.0.0.5\lib\net40\Rssdp.Portable.dll</HintPath>
+    <Reference Include="Rssdp, Version=3.5.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Rssdp.3.5.4\lib\net45\Rssdp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Sockets.Plugin, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL">

diff --git a/SharpCaster.Console/packages.config b/SharpCaster.Console/packages.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Google.Protobuf" version="3.3.0" targetFramework="net452" />
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />
   <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net452" />
   <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net452" />
-  <package id="protobuf-net-sharpcaster" version="2.0.0.668" targetFramework="net452" />
-  <package id="Rssdp" version="2.0.0.5" targetFramework="net452" />
+  <package id="Rssdp" version="3.5.4" targetFramework="net452" />
   <package id="Sharpcaster.SocketsForPCL" version="2.0.4" targetFramework="net452" />
 </packages>
diff --git a/SharpCaster.Simple.Android/SharpCaster.Simple.Android.csproj b/SharpCaster.Simple.Android/SharpCaster.Simple.Android.csproj
@@ -43,6 +43,10 @@
     <AndroidLinkMode>SdkOnly</AndroidLinkMode>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Google.Protobuf, Version=3.3.0.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
+      <HintPath>..\packages\Google.Protobuf.3.3.0\lib\netstandard1.0\Google.Protobuf.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\portable-net45+win8+wpa81\Microsoft.Threading.Tasks.dll</HintPath>
       <Private>True</Private>
@@ -53,12 +57,8 @@
     </Reference>
     <Reference Include="Mono.Android" />
     <Reference Include="mscorlib" />
-    <Reference Include="Rssdp.Native, Version=2.0.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rssdp.2.0.0.5\lib\monoandroid\Rssdp.Native.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Rssdp.Portable, Version=2.0.0.4, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rssdp.2.0.0.5\lib\monoandroid\Rssdp.Portable.dll</HintPath>
+    <Reference Include="Rssdp, Version=3.5.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Rssdp.3.5.4\lib\monoandroid\Rssdp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Sockets.Plugin, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL">

diff --git a/SharpCaster.Simple.Android/packages.config b/SharpCaster.Simple.Android/packages.config
@@ -1,9 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Google.Protobuf" version="3.3.0" targetFramework="monoandroid70" />
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="monoandroid60" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="monoandroid60" />
   <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="monoandroid60" />
   <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="monoandroid60" />
-  <package id="Rssdp" version="2.0.0.5" targetFramework="monoandroid70" />
+  <package id="Rssdp" version="3.5.4" targetFramework="monoandroid70" />
   <package id="Sharpcaster.SocketsForPCL" version="2.0.4" targetFramework="monoandroid70" />
+  <package id="System.Collections" version="4.0.11" targetFramework="monoandroid70" />
+  <package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="monoandroid70" />
+  <package id="System.Diagnostics.Tools" version="4.0.1" targetFramework="monoandroid70" />
+  <package id="System.Globalization" version="4.0.11" targetFramework="monoandroid70" />
+  <package id="System.IO" version="4.1.0" targetFramework="monoandroid70" />
+  <package id="System.Linq" version="4.1.0" targetFramework="monoandroid70" />
+  <package id="System.Linq.Expressions" version="4.1.0" targetFramework="monoandroid70" />
+  <package id="System.Net.Http" version="4.1.0" targetFramework="monoandroid70" />
+  <package id="System.Net.Primitives" version="4.0.11" targetFramework="monoandroid70" />
+  <package id="System.Net.Sockets" version="4.1.0" targetFramework="monoandroid70" />
+  <package id="System.ObjectModel" version="4.0.12" targetFramework="monoandroid70" />
+  <package id="System.Reflection" version="4.1.0" targetFramework="monoandroid70" />
+  <package id="System.Reflection.Extensions" version="4.0.1" targetFramework="monoandroid70" />
+  <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="monoandroid70" />
+  <package id="System.Runtime" version="4.1.0" targetFramework="monoandroid70" />
+  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="monoandroid70" />
+  <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.0.0" targetFramework="monoandroid70" />
+  <package id="System.Text.Encoding" version="4.0.11" targetFramework="monoandroid70" />
+  <package id="System.Text.Encoding.Extensions" version="4.0.11" targetFramework="monoandroid70" />
+  <package id="System.Text.RegularExpressions" version="4.1.0" targetFramework="monoandroid70" />
+  <package id="System.Threading" version="4.0.11" targetFramework="monoandroid70" />
+  <package id="System.Threading.Tasks" version="4.0.11" targetFramework="monoandroid70" />
+  <package id="System.Threading.Timer" version="4.0.1" targetFramework="monoandroid70" />
+  <package id="System.Xml.ReaderWriter" version="4.0.11" targetFramework="monoandroid70" />
 </packages>
diff --git a/SharpCaster.Simple/project.json b/SharpCaster.Simple/project.json
@@ -1,12 +1,13 @@
 {
   "dependencies": {
+    "Google.Protobuf": "3.3.0",
     "Microsoft.Bcl.Build": "1.0.21",
     "Microsoft.Net.Http": "2.2.29",
-    "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2",
+    "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.3",
     "Newtonsoft.Json": "9.0.1",
-    "protobuf-net-sharpcaster": "2.0.0.668",
-    "Rssdp": "2.0.0.5",
-    "sharpcaster.SocketsForPCL": "2.0.4"
+    "Rssdp": "3.5.4",
+    "sharpcaster.SocketsForPCL": "2.0.4",
+    "System.Xml.ReaderWriter": "4.3.0"
   },
   "frameworks": {
     "uap10.0": {}

diff --git a/SharpCaster.Test/ChromecastTester.cs b/SharpCaster.Test/ChromecastTester.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Linq;
 using SharpCaster.Controllers;
 using SharpCaster.Services;
 using Xunit;
@@ -12,7 +8,7 @@ namespace SharpCaster.Test
 {
     public class ChromecastTester
     {
-        private ChromecastService _chromecastService;
+        private readonly ChromecastService _chromecastService;
         public ChromecastTester()
         {
             _chromecastService = ChromecastService.Current;

diff --git a/SharpCaster.Test/DeviceLocatorTest.cs b/SharpCaster.Test/DeviceLocatorTest.cs
@@ -5,7 +5,7 @@ namespace SharpCaster.Test
 {
     public class DeviceLocatorTest
     {
-        private ChromecastService _chromecastService;
+        private readonly ChromecastService _chromecastService;
         public DeviceLocatorTest()
         {
             _chromecastService = ChromecastService.Current;

diff --git a/SharpCaster.Test/ProtoBufTester.cs b/SharpCaster.Test/ProtoBufTester.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Text;
 using SharpCaster.Models;
 using Xunit;
 
@@ -11,12 +7,74 @@ namespace SharpCaster.Test
     public class ProtoBufTester
     {
         [Fact]
-        public void TestProtoBuf()
+        public void Connect_Should_Be_Serialized_Well()
         {
             var connectMessage = MessageFactory.Connect();
             connectMessage.Namespace = "urn:x-cast:com.google.cast.tp.connection";
             var bytes = connectMessage.ToProto();
-            Assert.Equal(bytes, new byte[] { 0, 0, 0, 88, 8, 0, 18, 8, 115, 101, 110, 100, 101, 114, 45, 48, 26, 10, 114, 101, 99, 101, 105, 118, 101, 114, 45, 48, 34, 40, 117, 114, 110, 58, 120, 45, 99, 97, 115, 116, 58, 99, 111, 109, 46, 103, 111, 111, 103, 108, 101, 46, 99, 97, 115, 116, 46, 116, 112, 46, 99, 111, 110, 110, 101, 99, 116, 105, 111, 110, 40, 0, 50, 18, 123, 34, 116, 121, 112, 101, 34, 58, 34, 67, 79, 78, 78, 69, 67, 84, 34, 125 });
+            var expectedBytes = new byte[]
+            {
+                0, 0, 0, 88, 8, 0, 18, 8, 115, 101, 110, 100, 101, 114, 45, 48, 26, 10, 114, 101, 99, 101, 105, 118,
+                101, 114, 45, 48, 34, 40, 117, 114, 110, 58, 120, 45, 99, 97, 115, 116, 58, 99, 111, 109, 46, 103, 111,
+                111, 103, 108, 101, 46, 99, 97, 115, 116, 46, 116, 112, 46, 99, 111, 110, 110, 101, 99, 116, 105, 111,
+                110, 40, 0, 50, 18, 123, 34, 116, 121, 112, 101, 34, 58, 34, 67, 79, 78, 78, 69, 67, 84, 34, 125
+            };
+            Assert.Equal(bytes, expectedBytes);
+        }
+
+        [Fact]
+        public void Ping_Should_Be_Serialized_Well()
+        {
+            var pingMessage = MessageFactory.Ping;
+            var bytes = pingMessage.ToProto();
+            var expectedBytes = new byte[]
+            {
+                0, 0, 0, 43, 8, 0, 18, 8, 115, 101, 110, 100, 101, 114, 45, 48, 26, 10, 114, 101, 99, 101, 105, 118, 101,
+                114, 45, 48, 40, 0, 50, 15, 123, 34, 116, 121, 112, 101, 34, 58, 34, 80, 73, 78, 71, 34, 125
+            };
+            Assert.Equal(bytes, expectedBytes);
+        }
+
+        [Fact]
+        public void Close_Should_Be_Serialized_Well()
+        {
+            var closeMessage = MessageFactory.Close;
+            var bytes = closeMessage.ToProto();
+            var expectedBytes = new byte[]
+            {
+                0, 0, 0, 44, 8, 0, 18, 8, 115, 101, 110, 100, 101, 114, 45, 48, 26, 10, 114, 101, 99, 101, 105, 118, 101,
+                114, 45, 48, 40, 0, 50, 16, 123, 34, 116, 121, 112, 101, 34, 58, 34, 67, 76, 79, 83, 69, 34, 125
+            };
+            Assert.Equal(bytes, expectedBytes);
+        }
+
+        [Fact]
+        public void Volume_Level_Should_Be_Serialized_Well()
+        {
+            var volumeLevel = MessageFactory.Volume(0.7, 100);
+            var bytes = volumeLevel.ToProto();
+            var expectedBytes = new byte[]
+            {
+                0, 0, 0, 88, 8, 0, 18, 8, 115, 101, 110, 100, 101, 114, 45, 48, 26, 10, 114, 101, 99, 101, 105, 118, 101,
+                114, 45, 48, 40, 0, 50, 60, 123, 34, 118, 111, 108, 117, 109, 101, 34, 58, 123, 34, 108, 101, 118, 101,
+                108, 34, 58, 48, 46, 55, 125, 44, 34, 114, 101, 113, 117, 101, 115, 116, 73, 100, 34, 58, 49, 48, 48, 44,
+                34, 116, 121, 112, 101, 34, 58, 34, 83, 69, 84, 95, 86, 79, 76, 85, 77, 69, 34, 125
+            };
+            Assert.Equal(bytes, expectedBytes);
+        }
+        [Fact]
+        public void Volume_Mute_Should_Be_Serialized_Well()
+        {
+            var volumeMuted = MessageFactory.Volume(true, 100);
+            var bytes = volumeMuted.ToProto();
+            var expectedBytes = new byte[]
+            {
+                0, 0, 0, 89, 8, 0, 18, 8, 115, 101, 110, 100, 101, 114, 45, 48, 26, 10, 114, 101, 99, 101, 105, 118, 101,
+                114, 45, 48, 40, 0, 50, 61, 123, 34, 118, 111, 108, 117, 109, 101, 34, 58, 123, 34, 109, 117, 116, 101,
+                100, 34, 58, 116, 114, 117, 101, 125, 44, 34, 114, 101, 113, 117, 101, 115, 116, 73, 100, 34, 58, 49, 48,
+                48, 44, 34, 116, 121, 112, 101, 34, 58, 34, 83, 69, 84, 95, 86, 79, 76, 85, 77, 69, 34, 125
+            };
+            Assert.Equal(bytes, expectedBytes);
         }
 
         private static string PrintBytes(byte[] byteArray)