Merge branch 'developer' into gui

Conflicts:
	MusicPlayer/MusicPlayer/MusicPlayer.csproj

MusicPlayer/MusicPlayer/APIHandler.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using MusicPlayer;
+
+namespace MusicPlayer
+{
+    internal class APIHandler
+    {
+        public APIHandler()
+        {
+
+        }
+
+        public List<Artist> GetArtists()
+        {
+            return null;
+        }
+
+        public List<Album> GetAlbums()
+        {
+            return null;
+        } 
+    }
+}

MusicPlayer/MusicPlayer/Album.cs

@@ -0,0 +1,12 @@
+namespace MusicPlayer
+{
+    public class Album
+    {
+        public string albumnaam { get; set; }
+
+        public Album(string albumnaam)
+        {
+            this.albumnaam = albumnaam;
+        }
+    }
+}

MusicPlayer/MusicPlayer/Artist.cs

@@ -0,0 +1,13 @@
+namespace MusicPlayer
+{
+    public class Artist
+    {
+        public string naam { get; set; }
+
+        public Artist(string naam)
+        {
+            this.naam = naam;
+
+        }
+    }
+}

MusicPlayer/MusicPlayer/Form1.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

MusicPlayer/MusicPlayer/MainForm.cs

@@ -8,6 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
+
 namespace MusicPlayer
 {
     public partial class MainForm : Form
@@ -15,6 +16,9 @@ namespace MusicPlayer
         public MainForm()
         {
             InitializeComponent();
+            APIHandler api = new APIHandler();
+            NetworkHandler nw = new NetworkHandler("83.128.250.123", api);
+
         }
     }
 }

MusicPlayer/MusicPlayer/MusicPlayer.csproj

@@ -47,11 +47,15 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MainForm.cs">
+    <Compile Include="Album.cs" />
+    <Compile Include="APIHandler.cs" />
+    <Compile Include="Artist.cs" />
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="MainForm.Designer.cs">
       <DependentUpon>MainForm.cs</DependentUpon>
     </Compile>
+    <Compile Include="NetworkHandler.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <EmbeddedResource Include="MainForm.resx">

MusicPlayer/MusicPlayer/NetworkHandler.cs

@@ -0,0 +1,41 @@
+using System.Text;
+using System.Net.Sockets;
+using System.Threading;
+
+namespace MusicPlayer
+{
+    class NetworkHandler
+    {
+        private int port = 8585;
+        private Socket s;
+        private APIHandler api;
+ 
+        public NetworkHandler(string ip, APIHandler apihandler)
+        {
+            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;
+        }
+
+        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]; 
+                s.Receive(data);
+                string message = Encoding.ASCII.GetString(data);
+                System.Console.WriteLine(message);
+                //Iets doen met api calls
+            }
+        }
+    }
+}