diff --git a/.gitattributes b/.gitattributes old mode 100644 new mode 100755 diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/MusicPlayer/MusicPlayer.sln b/MusicPlayer/MusicPlayer.sln old mode 100644 new mode 100755 diff --git a/MusicPlayer/MusicPlayer/APIHandler.cs b/MusicPlayer/MusicPlayer/APIHandler.cs old mode 100644 new mode 100755 diff --git a/MusicPlayer/MusicPlayer/Album.cs b/MusicPlayer/MusicPlayer/Album.cs old mode 100644 new mode 100755 diff --git a/MusicPlayer/MusicPlayer/App.config b/MusicPlayer/MusicPlayer/App.config old mode 100644 new mode 100755 diff --git a/MusicPlayer/MusicPlayer/Artist.cs b/MusicPlayer/MusicPlayer/Artist.cs old mode 100644 new mode 100755 diff --git a/MusicPlayer/MusicPlayer/AudioHandler.cs b/MusicPlayer/MusicPlayer/AudioHandler.cs old mode 100644 new mode 100755 diff --git a/MusicPlayer/MusicPlayer/Form1.Designer.cs b/MusicPlayer/MusicPlayer/Form1.Designer.cs old mode 100644 new mode 100755 diff --git a/MusicPlayer/MusicPlayer/Form1.resx b/MusicPlayer/MusicPlayer/Form1.resx old mode 100644 new mode 100755 diff --git a/MusicPlayer/MusicPlayer/Main.cs b/MusicPlayer/MusicPlayer/Main.cs old mode 100644 new mode 100755 index 72f650a..592723f --- a/MusicPlayer/MusicPlayer/Main.cs +++ b/MusicPlayer/MusicPlayer/Main.cs @@ -25,13 +25,13 @@ namespace MusicPlayer audio = new AudioHandler(); table = new SongsTable(); form.SongsTableView.DataSource = table; - + form.SongsTableView.Columns[3].Visible = false; Populate(); } private void Populate() { - form.AlbumListView.Items.Add(" Alle albums"); + form.AlbumListView.Items.Add("Alle albums"); foreach (Album a in this.api.GetAlbums()) { form.AlbumListView.Items.Add(a.albumnaam); @@ -43,21 +43,24 @@ namespace MusicPlayer form.ArtistListBox.Items.Add(a.naam); } - - table.Add(new Song("102", "Test Song 1", "Test Album 1", "Test Artist 1", api)); - - table.Add(new Song("104", "Test Song 2", "Test Album 2", "Test Artist 2", api)); } public void ArtistFilter(string artist) { - System.Console.Write(artist); + table.Clear(); + api.GetSongsByArtist(artist).ForEach(s => + { + table.Add(s); + }); } public void AlbumFilter(string album) { - System.Console.Write(album); - + table.Clear(); + api.GetSongsByAlbum(album).ForEach(s => + { + table.Add(s); + }); } } diff --git a/MusicPlayer/MusicPlayer/MainForm.Designer.cs b/MusicPlayer/MusicPlayer/MainForm.Designer.cs old mode 100644 new mode 100755 index de81826..163f1ea --- a/MusicPlayer/MusicPlayer/MainForm.Designer.cs +++ b/MusicPlayer/MusicPlayer/MainForm.Designer.cs @@ -65,6 +65,7 @@ | System.Windows.Forms.AnchorStyles.Right))); this.SongsTableView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.SongsTableView.BackgroundColor = System.Drawing.SystemColors.Control; + this.SongsTableView.AutoGenerateColumns = true; this.SongsTableView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.SongsTableView.Location = new System.Drawing.Point(12, 153); this.SongsTableView.MultiSelect = false; diff --git a/MusicPlayer/MusicPlayer/MainForm.cs b/MusicPlayer/MusicPlayer/MainForm.cs old mode 100644 new mode 100755 index 37c82ec..cfaa441 --- a/MusicPlayer/MusicPlayer/MainForm.cs +++ b/MusicPlayer/MusicPlayer/MainForm.cs @@ -77,13 +77,17 @@ namespace MusicPlayer private void AlbumListView_SelectedIndexChanged(object sender, EventArgs e) { if(AlbumListView.SelectedItems.Count != 0) - main.AlbumFilter(AlbumListView.SelectedItems[0].ToString()); + main.AlbumFilter(AlbumListView.SelectedItems[0].Text); } private void SongsTableView_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - main.audio.Play(SongsTableView.CurrentRow.DataBoundItem as Song); - + SongsTable s = new SongsTable(); + var drv = SongsTableView.SelectedRows[0].DataBoundItem as DataRowView; + var row = drv.Row as DataRow; + s.ImportRow(row); + System.Console.WriteLine((s.Rows[0][3] as Song).SongID); + main.audio.Play((s.Rows[0][3] as Song)); } } } diff --git a/MusicPlayer/MusicPlayer/MainForm.resx b/MusicPlayer/MusicPlayer/MainForm.resx old mode 100644 new mode 100755 diff --git a/MusicPlayer/MusicPlayer/MusicPlayer.csproj b/MusicPlayer/MusicPlayer/MusicPlayer.csproj old mode 100644 new mode 100755 diff --git a/MusicPlayer/MusicPlayer/NetworkHandler.cs b/MusicPlayer/MusicPlayer/NetworkHandler.cs old mode 100644 new mode 100755 diff --git a/MusicPlayer/MusicPlayer/NotificationPopup.Designer.cs b/MusicPlayer/MusicPlayer/NotificationPopup.Designer.cs old mode 100644 new mode 100755 diff --git a/MusicPlayer/MusicPlayer/NotificationPopup.cs b/MusicPlayer/MusicPlayer/NotificationPopup.cs old mode 100644 new mode 100755 diff --git a/MusicPlayer/MusicPlayer/NotificationPopup.resx b/MusicPlayer/MusicPlayer/NotificationPopup.resx old mode 100644 new mode 100755 diff --git a/MusicPlayer/MusicPlayer/Program.cs b/MusicPlayer/MusicPlayer/Program.cs old mode 100644 new mode 100755 diff --git a/MusicPlayer/MusicPlayer/Properties/AssemblyInfo.cs b/MusicPlayer/MusicPlayer/Properties/AssemblyInfo.cs old mode 100644 new mode 100755 diff --git a/MusicPlayer/MusicPlayer/Properties/Resources.Designer.cs b/MusicPlayer/MusicPlayer/Properties/Resources.Designer.cs old mode 100644 new mode 100755 diff --git a/MusicPlayer/MusicPlayer/Properties/Resources.resx b/MusicPlayer/MusicPlayer/Properties/Resources.resx old mode 100644 new mode 100755 diff --git a/MusicPlayer/MusicPlayer/Properties/Settings.Designer.cs b/MusicPlayer/MusicPlayer/Properties/Settings.Designer.cs old mode 100644 new mode 100755 diff --git a/MusicPlayer/MusicPlayer/Properties/Settings.settings b/MusicPlayer/MusicPlayer/Properties/Settings.settings old mode 100644 new mode 100755 diff --git a/MusicPlayer/MusicPlayer/Song.cs b/MusicPlayer/MusicPlayer/Song.cs old mode 100644 new mode 100755 diff --git a/MusicPlayer/MusicPlayer/SongsTable.cs b/MusicPlayer/MusicPlayer/SongsTable.cs old mode 100644 new mode 100755 index 7c63801..e394711 --- a/MusicPlayer/MusicPlayer/SongsTable.cs +++ b/MusicPlayer/MusicPlayer/SongsTable.cs @@ -15,11 +15,12 @@ namespace MusicPlayer this.Columns.Add("Naam", typeof(string)); this.Columns.Add("Album", typeof(string)); this.Columns.Add("Artiest", typeof(string)); + this.Columns.Add("song", typeof(Song)); } public void Add(Song s) { - this.Rows.Add(s.Name, s.Album, s.Artist); + this.Rows.Add(s.Name, s.Album, s.Artist, s); } } diff --git a/MusicPlayer/MusicPlayer/Year.cs b/MusicPlayer/MusicPlayer/Year.cs old mode 100644 new mode 100755 diff --git a/MusicPlayer/MusicPlayer/packages.config b/MusicPlayer/MusicPlayer/packages.config old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755