Commit Graph
165 Commits
Author SHA1 Message Date
Janco Kock 6659e2dff7 Fixed search image load 2015-11-02 23:23:27 +01:00
kennyboy55 4788a80b78 Merge branch 'developer' into gui 2015-11-02 23:07:58 +01:00
kennyboy55 2f82bd96c6 Fix search not returning data 2015-11-02 23:05:36 +01:00
Janco Kock f385ff773f Fixed repopulate images 2015-11-02 22:57:06 +01:00
kennyboy55 3ea423c87e Gui fix 2015-11-02 22:39:50 +01:00
kennyboy55 9fb8550dbf Fix crashes 2015-11-02 22:27:08 +01:00
kennyboy55 f07b9e0fdb Possible fix for trackbar not working properly 2015-11-02 22:20:51 +01:00
kennyboy55 d4b916137b Merge remote-tracking branch 'origin/developer' into developer
Conflicts:
	MusicPlayer/MusicPlayer/MainForm.Designer.cs
2015-11-02 22:02:59 +01:00
kennyboy55 e7eba01ac7 Merge branch 'gui' into developer
Conflicts:
	MusicPlayer/MusicPlayer/MainForm.Designer.cs
2015-11-02 22:02:17 +01:00
Yorick Rommers 8e64b6e5b6 merge gui to dev 2015-11-02 22:00:46 +01:00
Yorick Rommers 96683d3b57 merge gui to dev 2015-11-02 21:52:47 +01:00
kennyboy55 c760e5a559 Drag to add to queue 2015-11-02 21:42:59 +01:00
Yorick Rommers 5a07e6251b added reset button 2015-11-02 21:40:28 +01:00
Yorick Rommers b9b300b14d Merge remote-tracking branch 'origin/search' into developer 2015-11-02 21:38:32 +01:00
Yorick Rommers 4e9d2222cf Merge branch 'developer' of https://github.com/yorickr/musicplayer into developer 2015-11-02 21:37:41 +01:00
Yorick Rommers 4a869f3399 added advanced search 2015-11-02 21:37:24 +01:00
kennyboy55 0d0a92f33a Fix albumart interface 2015-11-02 21:27:33 +01:00
kennyboy55 66c5285418 Merge remote-tracking branch 'origin/gui' into gui 2015-11-02 21:15:46 +01:00
kennyboy55 292405cf4d Remove playlist and songs from playlist 2015-11-02 21:15:24 +01:00
Janco Kock 8d7d8eaabc Some album art edits, bigger covers and current playing cover 2015-11-02 20:37:39 +01:00
kennyboy55 40cb55d7f6 Implemented Advanced Search interface 2015-11-02 18:17:22 +01:00
yorickr 56586355d3 Merge remote-tracking branch 'origin/gui' into developer 2015-11-02 17:38:12 +01:00
yorickr 56a2cb91a4 Removed useless arguments 2015-11-02 17:37:50 +01:00
kennyboy55 a4031daae8 Playlist based on server 2015-11-02 17:25:52 +01:00
kennyboy55 a1bfb15e6b Implemented song searching in application. API does not support it yet. 2015-11-02 17:03:31 +01:00
kennyboy55 c2229db72a Handle server error's 2015-11-02 12:18:09 +01:00
kennyboy55 f81c526255 Translate to english 2015-11-02 11:14:43 +01:00
kennyboy55 7b712460d2 Small GUI changes 2015-11-02 11:09:39 +01:00
kennyboy55 57229fc8b9 Added todo 2015-11-02 07:06:44 +01:00
kennyboy55 515f17eb62 Made genre/artist box larger 2015-11-01 20:16:55 +01:00
kennyboy55 98f6ab9bc0 Better handling of radiostation 2015-11-01 19:51:43 +01:00
kennyboy55 90f35de242 Better naming and buffering 2015-11-01 19:10:30 +01:00
kennyboy55 aa85ca5d26 Clear playlist when starting radio 2015-11-01 19:03:55 +01:00
kennyboy55 270db2d1a4 Added Slam-FM 2015-11-01 18:59:59 +01:00
Janco Kock fd629f54ff Fixed 3fm radio 2015-11-01 14:39:11 +01:00
kennyboy55 d774e250c5 Calculate length if unknown. 2015-11-01 14:24:16 +01:00
Janco Kock 93f9879c14 Fixed cross thread bug 2015-11-01 14:07:09 +01:00
kennyboy55 a6514189b0 Fix bufferbar not filling completely 2015-11-01 14:05:14 +01:00
Yorick Rommers 192e132f1d Changed artwork folder and server 2015-11-01 14:00:27 +01:00
Yorick Rommers d8a900ecb9 Changed artwork folder and server 2015-11-01 13:59:15 +01:00
kennyboy55 7e5dcb3cef Fix 3FM url and name 2015-11-01 13:55:34 +01:00
kennyboy55 17eaac40bf Added 3FM, added custom Radio URL 2015-11-01 13:39:37 +01:00
kennyboy55 dad829d1dd Added URL tools 2015-11-01 13:39:24 +01:00
kennyboy55 e218b58421 Faster buffering of radio station 2015-11-01 13:39:06 +01:00
Janco Kock 7f45afe80f Added support for radio stations 2015-11-01 13:07:11 +01:00
kennyboy55 05bf1bce21 Merge pull request #1 from yorickr/gui
Merge gui into develop
2015-11-01 12:12:52 +01:00
kennyboy55 740264099d Merge branch 'developer' into gui 2015-11-01 12:07:35 +01:00
kennyboy55 70bed9b661 Switch between server (untested) 2015-11-01 12:05:22 +01:00
kennyboy55 aa769cfad9 Easier switching when testing 2015-11-01 12:04:18 +01:00
kennyboy55 2f0b1915a3 Merge remote-tracking branch 'origin/gui' into gui 2015-11-01 01:00:58 +01:00