From f643ff29673c557b99abd189c0d6908fcb0c8c73 Mon Sep 17 00:00:00 2001 From: Yorick Rommers Date: Thu, 15 Oct 2015 13:50:52 +0200 Subject: [PATCH] Fixed errors. --- MusicPlayer/MusicPlayer/Form1.cs | 6 +++--- MusicPlayer/MusicPlayer/MusicPlayer.csproj | 10 ++++++++++ MusicPlayer/MusicPlayer/NetworkHandler.cs | 2 ++ MusicPlayer/MusicPlayer/Program.cs | 2 -- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/MusicPlayer/MusicPlayer/Form1.cs b/MusicPlayer/MusicPlayer/Form1.cs index 9561207..8c520e3 100644 --- a/MusicPlayer/MusicPlayer/Form1.cs +++ b/MusicPlayer/MusicPlayer/Form1.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -using WindowsFormsApplication2; + namespace MusicPlayer { @@ -16,8 +16,8 @@ namespace MusicPlayer public Form1() { InitializeComponent(); - NetworkHandler nw = new NetworkHandler("83.128.250.123"); - + APIHandler api = new APIHandler(); + NetworkHandler nw = new NetworkHandler("83.128.250.123", api); } } diff --git a/MusicPlayer/MusicPlayer/MusicPlayer.csproj b/MusicPlayer/MusicPlayer/MusicPlayer.csproj index b7bb03e..785b0ef 100644 --- a/MusicPlayer/MusicPlayer/MusicPlayer.csproj +++ b/MusicPlayer/MusicPlayer/MusicPlayer.csproj @@ -33,6 +33,10 @@ 4 + + ..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll + True + @@ -46,7 +50,9 @@ + + Form @@ -56,6 +62,9 @@ + + Form1.cs + ResXFileCodeGenerator Resources.Designer.cs @@ -65,6 +74,7 @@ True Resources.resx + SettingsSingleFileGenerator Settings.Designer.cs diff --git a/MusicPlayer/MusicPlayer/NetworkHandler.cs b/MusicPlayer/MusicPlayer/NetworkHandler.cs index 6c1265e..a9e1bc6 100644 --- a/MusicPlayer/MusicPlayer/NetworkHandler.cs +++ b/MusicPlayer/MusicPlayer/NetworkHandler.cs @@ -1,6 +1,7 @@ using System; using System.Text; using System.Net.Sockets; +using System.Threading; namespace MusicPlayer { @@ -15,6 +16,7 @@ namespace MusicPlayer s = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); s.Connect(ip, port); api = apihandler; + SendString("GET"); } public void SendString(string m) diff --git a/MusicPlayer/MusicPlayer/Program.cs b/MusicPlayer/MusicPlayer/Program.cs index f228b57..3ce5ccb 100644 --- a/MusicPlayer/MusicPlayer/Program.cs +++ b/MusicPlayer/MusicPlayer/Program.cs @@ -17,8 +17,6 @@ namespace MusicPlayer Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); Application.Run(new Form1()); - APIHandler a = new APIHandler; - NetworkHandler nw = new NetworkHandler("imegumii.nl", a); } } }