From 72c75b457d8d4bbd46e66a277055e5b1f6165849 Mon Sep 17 00:00:00 2001 From: jancoow Date: Thu, 15 Oct 2015 13:02:50 +0200 Subject: [PATCH 1/7] Added start of networkhandler and apihandler --- MusicPlayer/MusicPlayer/APIHandler.cs | 12 +++++++++ MusicPlayer/MusicPlayer/NetworkHandler.cs | 33 +++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 MusicPlayer/MusicPlayer/APIHandler.cs create mode 100644 MusicPlayer/MusicPlayer/NetworkHandler.cs diff --git a/MusicPlayer/MusicPlayer/APIHandler.cs b/MusicPlayer/MusicPlayer/APIHandler.cs new file mode 100644 index 0000000..59e719c --- /dev/null +++ b/MusicPlayer/MusicPlayer/APIHandler.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WindowsFormsApplication2 +{ + class APIHandler + { + } +} diff --git a/MusicPlayer/MusicPlayer/NetworkHandler.cs b/MusicPlayer/MusicPlayer/NetworkHandler.cs new file mode 100644 index 0000000..c207af2 --- /dev/null +++ b/MusicPlayer/MusicPlayer/NetworkHandler.cs @@ -0,0 +1,33 @@ +using System.Text; +using System.Net.Sockets; + +namespace WindowsFormsApplication2 +{ + class NetworkHandler + { + private int port = 8585; + private Socket s; + + public NetworkHandler(string ip) + { + s = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + s.Connect(ip, port); + } + + public void SendString(string m) + { + byte[] req_as_bytes = Encoding.UTF8.GetBytes(m); + s.Send(req_as_bytes); + } + + public void ReceiveData() + { + while (s.Connected) + { + byte[] data = new byte[1024 * 200]; + int t = s.Receive(data); + //Iets doen met api calls + } + } + } +} From af735a850296534cd29f067ce0aeb7172ff3d3f0 Mon Sep 17 00:00:00 2001 From: jancoow Date: Thu, 15 Oct 2015 13:13:55 +0200 Subject: [PATCH 2/7] Added files to visualstudio --- MusicPlayer/MusicPlayer/MusicPlayer.csproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MusicPlayer/MusicPlayer/MusicPlayer.csproj b/MusicPlayer/MusicPlayer/MusicPlayer.csproj index fa59bcf..b7bb03e 100644 --- a/MusicPlayer/MusicPlayer/MusicPlayer.csproj +++ b/MusicPlayer/MusicPlayer/MusicPlayer.csproj @@ -46,12 +46,14 @@ + Form Form1.cs + From 9364ebddc411a3dde8755e61571c02ca9188dcc3 Mon Sep 17 00:00:00 2001 From: jancoow Date: Thu, 15 Oct 2015 13:41:27 +0200 Subject: [PATCH 3/7] Addes some functionality to networkhandler, fixed wrong namespace --- MusicPlayer/MusicPlayer/APIHandler.cs | 2 +- MusicPlayer/MusicPlayer/NetworkHandler.cs | 10 +++++++--- MusicPlayer/MusicPlayer/Program.cs | 2 ++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/MusicPlayer/MusicPlayer/APIHandler.cs b/MusicPlayer/MusicPlayer/APIHandler.cs index 59e719c..39fb4ac 100644 --- a/MusicPlayer/MusicPlayer/APIHandler.cs +++ b/MusicPlayer/MusicPlayer/APIHandler.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace WindowsFormsApplication2 +namespace MusicPlayer { class APIHandler { diff --git a/MusicPlayer/MusicPlayer/NetworkHandler.cs b/MusicPlayer/MusicPlayer/NetworkHandler.cs index c207af2..ad0b8a3 100644 --- a/MusicPlayer/MusicPlayer/NetworkHandler.cs +++ b/MusicPlayer/MusicPlayer/NetworkHandler.cs @@ -1,17 +1,19 @@ using System.Text; using System.Net.Sockets; -namespace WindowsFormsApplication2 +namespace MusicPlayer { class NetworkHandler { private int port = 8585; private Socket s; + private APIHandler api; - public NetworkHandler(string ip) + public NetworkHandler(string ip, APIHandler apihandler) { s = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); s.Connect(ip, port); + api = apihandler; } public void SendString(string m) @@ -25,7 +27,9 @@ namespace WindowsFormsApplication2 while (s.Connected) { byte[] data = new byte[1024 * 200]; - int t = s.Receive(data); + s.Receive(data); + string message = Encoding.ASCII.GetString(data); + System.Console.WriteLine(message); //Iets doen met api calls } } diff --git a/MusicPlayer/MusicPlayer/Program.cs b/MusicPlayer/MusicPlayer/Program.cs index 3ce5ccb..f228b57 100644 --- a/MusicPlayer/MusicPlayer/Program.cs +++ b/MusicPlayer/MusicPlayer/Program.cs @@ -17,6 +17,8 @@ namespace MusicPlayer Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); Application.Run(new Form1()); + APIHandler a = new APIHandler; + NetworkHandler nw = new NetworkHandler("imegumii.nl", a); } } } From a9a104bd41841d077d01a6f81ca8e6d6123f2e8f Mon Sep 17 00:00:00 2001 From: Yorick Rommers Date: Thu, 15 Oct 2015 13:42:38 +0200 Subject: [PATCH 4/7] Added class stubs --- MusicPlayer/MusicPlayer/APIHandler.cs | 18 +++- MusicPlayer/MusicPlayer/Album.cs | 10 ++ MusicPlayer/MusicPlayer/Artist.cs | 10 ++ MusicPlayer/MusicPlayer/Form1.cs | 4 + MusicPlayer/MusicPlayer/Form1.resx | 120 ++++++++++++++++++++++ MusicPlayer/MusicPlayer/NetworkHandler.cs | 3 +- MusicPlayer/MusicPlayer/packages.config | 4 + 7 files changed, 167 insertions(+), 2 deletions(-) create mode 100644 MusicPlayer/MusicPlayer/Album.cs create mode 100644 MusicPlayer/MusicPlayer/Artist.cs create mode 100644 MusicPlayer/MusicPlayer/Form1.resx create mode 100644 MusicPlayer/MusicPlayer/packages.config diff --git a/MusicPlayer/MusicPlayer/APIHandler.cs b/MusicPlayer/MusicPlayer/APIHandler.cs index 59e719c..333f385 100644 --- a/MusicPlayer/MusicPlayer/APIHandler.cs +++ b/MusicPlayer/MusicPlayer/APIHandler.cs @@ -3,10 +3,26 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using MusicPlayer; +using Newtonsoft.Json; namespace WindowsFormsApplication2 { - class APIHandler + internal class APIHandler { + public APIHandler() + { + + } + + public List GetArtists() + { + return null; + } + + public List GetAlbums() + { + return null; + } } } diff --git a/MusicPlayer/MusicPlayer/Album.cs b/MusicPlayer/MusicPlayer/Album.cs new file mode 100644 index 0000000..1ad2279 --- /dev/null +++ b/MusicPlayer/MusicPlayer/Album.cs @@ -0,0 +1,10 @@ +namespace MusicPlayer +{ + public class Album + { + public Album() + { + + } + } +} \ No newline at end of file diff --git a/MusicPlayer/MusicPlayer/Artist.cs b/MusicPlayer/MusicPlayer/Artist.cs new file mode 100644 index 0000000..1013585 --- /dev/null +++ b/MusicPlayer/MusicPlayer/Artist.cs @@ -0,0 +1,10 @@ +namespace MusicPlayer +{ + public class Artist + { + public Artist() + { + + } + } +} \ No newline at end of file diff --git a/MusicPlayer/MusicPlayer/Form1.cs b/MusicPlayer/MusicPlayer/Form1.cs index 7e57f6c..9561207 100644 --- a/MusicPlayer/MusicPlayer/Form1.cs +++ b/MusicPlayer/MusicPlayer/Form1.cs @@ -7,6 +7,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using WindowsFormsApplication2; namespace MusicPlayer { @@ -15,6 +16,9 @@ namespace MusicPlayer public Form1() { InitializeComponent(); + NetworkHandler nw = new NetworkHandler("83.128.250.123"); + + } } } diff --git a/MusicPlayer/MusicPlayer/Form1.resx b/MusicPlayer/MusicPlayer/Form1.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/MusicPlayer/MusicPlayer/Form1.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/MusicPlayer/MusicPlayer/NetworkHandler.cs b/MusicPlayer/MusicPlayer/NetworkHandler.cs index c207af2..39f34f9 100644 --- a/MusicPlayer/MusicPlayer/NetworkHandler.cs +++ b/MusicPlayer/MusicPlayer/NetworkHandler.cs @@ -1,4 +1,5 @@ -using System.Text; +using System; +using System.Text; using System.Net.Sockets; namespace WindowsFormsApplication2 diff --git a/MusicPlayer/MusicPlayer/packages.config b/MusicPlayer/MusicPlayer/packages.config new file mode 100644 index 0000000..64b5d8e --- /dev/null +++ b/MusicPlayer/MusicPlayer/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file From f643ff29673c557b99abd189c0d6908fcb0c8c73 Mon Sep 17 00:00:00 2001 From: Yorick Rommers Date: Thu, 15 Oct 2015 13:50:52 +0200 Subject: [PATCH 5/7] 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); } } } From eb5e1254b07f6683ce234ed7375d09a85fe31944 Mon Sep 17 00:00:00 2001 From: Yorick Rommers Date: Thu, 15 Oct 2015 13:55:42 +0200 Subject: [PATCH 6/7] Added some fields to stubs --- MusicPlayer/MusicPlayer/Album.cs | 6 ++++-- MusicPlayer/MusicPlayer/Artist.cs | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/MusicPlayer/MusicPlayer/Album.cs b/MusicPlayer/MusicPlayer/Album.cs index 1ad2279..c1d00ad 100644 --- a/MusicPlayer/MusicPlayer/Album.cs +++ b/MusicPlayer/MusicPlayer/Album.cs @@ -2,9 +2,11 @@ { public class Album { - public Album() + public string albumnaam { get; set; } + + public Album(string albumnaam) { - + this.albumnaam = albumnaam; } } } \ No newline at end of file diff --git a/MusicPlayer/MusicPlayer/Artist.cs b/MusicPlayer/MusicPlayer/Artist.cs index 1013585..bf3efd7 100644 --- a/MusicPlayer/MusicPlayer/Artist.cs +++ b/MusicPlayer/MusicPlayer/Artist.cs @@ -2,9 +2,12 @@ { public class Artist { - public Artist() + public string naam { get; set; } + + public Artist(string naam) { - + this.naam = naam; + } } } \ No newline at end of file From 78c86d56808e1a49943a24e9a20cab3d9c7f82c6 Mon Sep 17 00:00:00 2001 From: jancoow Date: Thu, 15 Oct 2015 13:58:33 +0200 Subject: [PATCH 7/7] Added receivedata to a thread --- MusicPlayer/MusicPlayer/APIHandler.cs | 1 - MusicPlayer/MusicPlayer/MusicPlayer.csproj | 8 -------- MusicPlayer/MusicPlayer/NetworkHandler.cs | 7 ++++--- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/MusicPlayer/MusicPlayer/APIHandler.cs b/MusicPlayer/MusicPlayer/APIHandler.cs index d028507..92583ea 100644 --- a/MusicPlayer/MusicPlayer/APIHandler.cs +++ b/MusicPlayer/MusicPlayer/APIHandler.cs @@ -4,7 +4,6 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using MusicPlayer; -using Newtonsoft.Json; namespace MusicPlayer { diff --git a/MusicPlayer/MusicPlayer/MusicPlayer.csproj b/MusicPlayer/MusicPlayer/MusicPlayer.csproj index 785b0ef..10a36ec 100644 --- a/MusicPlayer/MusicPlayer/MusicPlayer.csproj +++ b/MusicPlayer/MusicPlayer/MusicPlayer.csproj @@ -33,10 +33,6 @@ 4 - - ..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll - True - @@ -62,9 +58,6 @@ - - Form1.cs - ResXFileCodeGenerator Resources.Designer.cs @@ -74,7 +67,6 @@ True Resources.resx - SettingsSingleFileGenerator Settings.Designer.cs diff --git a/MusicPlayer/MusicPlayer/NetworkHandler.cs b/MusicPlayer/MusicPlayer/NetworkHandler.cs index a9e1bc6..2ac9dcf 100644 --- a/MusicPlayer/MusicPlayer/NetworkHandler.cs +++ b/MusicPlayer/MusicPlayer/NetworkHandler.cs @@ -1,5 +1,4 @@ -using System; -using System.Text; +using System.Text; using System.Net.Sockets; using System.Threading; @@ -15,8 +14,10 @@ namespace MusicPlayer { s = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); s.Connect(ip, port); + ThreadStart thread = new ThreadStart(ReceiveData); + Thread childThread = new Thread(thread); + childThread.Start(); api = apihandler; - SendString("GET"); } public void SendString(string m)