Commit Graph
55 Commits
Author SHA1 Message Date
kennyboy55 5ad0fd72c2 Fixed trackbar jumping while seeking. 2015-10-30 11:21:12 +01:00
kennyboy55 c1f29f76c4 Merge remote-tracking branch 'origin/gui' into gui 2015-10-30 00:46:38 +01:00
kennyboy55 52903849f2 Timestamps. Attempt to fix seeking 2015-10-30 00:46:11 +01:00
kennyboy55 2d0b38e2d1 Display timestamps 2015-10-30 00:45:57 +01:00
kennyboy55 35097e88b9 Show timestamp. Play selected song with play button 2015-10-30 00:45:35 +01:00
Janco Kock 6090937072 Audio stops before playing another one 2015-10-30 00:25:27 +01:00
kennyboy55 23452531f9 Merge remote-tracking branch 'origin/gui' into gui 2015-10-30 00:18:12 +01:00
kennyboy55 1c8bde4f1e Semi-fix/add seeking. Still a problem when seeking further than ~20% of song. 2015-10-30 00:17:21 +01:00
Janco Kock 76f5753a6e Finally dubble click on a song plays a song 2015-10-30 00:16:45 +01:00
kennyboy55 c2afd44654 Merge remote-tracking branch 'origin/gui' into gui
Conflicts:
	MusicPlayer/MusicPlayer/MainForm.Designer.cs
	MusicPlayer/MusicPlayer/MainForm.cs
2015-10-29 23:45:57 +01:00
kennyboy55 4f5aaee125 Added visuals for buffering and position 2015-10-29 23:43:42 +01:00
Janco Kock 2ddbe6e9c8 Merge refs/heads/developer into refs/heads/gui 2015-10-29 23:01:35 +01:00
Yorick Rommers b7f7c37bb7 Merge remote-tracking branch 'origin/developer' 2015-10-29 22:59:19 +01:00
Janco Kock 85028d04a9 Load data from server into views 2015-10-29 22:57:35 +01:00
Yorick Rommers 6dc28511b1 Implemented more API functions 2015-10-29 22:51:45 +01:00
kennyboy55 1f2983d712 Better Audio Handling 2015-10-29 22:48:54 +01:00
kennyboy55 615934557c Added more audio handling 2015-10-29 22:27:12 +01:00
kennyboy55 6d9af7c614 Merge remote-tracking branch 'origin/gui' into gui 2015-10-29 21:40:08 +01:00
kennyboy55 5e40a1e7a3 Merge branch 'developer' into gui
Conflicts:
	MusicPlayer/MusicPlayer/Program.cs
2015-10-29 21:39:54 +01:00
Janco Kock a7bc5abe26 Added starting of a awesome notification form 2015-10-29 21:39:12 +01:00
Yorick Rommers 3a0449ec27 Merge remote-tracking branch 'origin/api' into developer 2015-10-29 21:38:44 +01:00
Yorick Rommers ae73848177 Implemented some API functions 2015-10-29 21:38:04 +01:00
kennyboy55 ada4321bca Change to public. New Structure. 2015-10-29 21:21:35 +01:00
kennyboy55 f79b2ace28 Changed Structure 2015-10-29 20:55:36 +01:00
kennyboy55 9108f17acc Merge branch 'developer' into gui
Conflicts:
	MusicPlayer/MusicPlayer/MusicPlayer.csproj
2015-10-29 20:47:00 +01:00
Yorick Rommers 1bf6fe80bb Merge remote-tracking branch 'origin/api' into developer 2015-10-29 20:45:50 +01:00
kennyboy55 9f64137e68 Added new stuff 2015-10-29 20:45:23 +01:00
Yorick Rommers fa863d562e updated gitignore 2015-10-29 20:45:16 +01:00
Yorick Rommers 1849f0e0c5 Merge api to dev 2015-10-29 20:44:18 +01:00
Yorick Rommers 415e87b787 API getSongURLbyid working 2015-10-29 20:37:36 +01:00
Janco Kock 050d405152 Added a fancy icon 2015-10-29 20:16:27 +01:00
kennyboy55 a45d506dbc Added controls panel and playing of music 2015-10-29 20:12:59 +01:00
kennyboy55 23a7373338 Merge branch 'developer' into gui 2015-10-29 19:55:45 +01:00
Yorick Rommers 2de025edf7 Merge gui into dev 2015-10-29 19:43:45 +01:00
kennyboy55 436ae2d96c Update README.md 2015-10-29 19:38:12 +01:00
kennyboy55 853d2f452d Create README.md 2015-10-29 19:37:31 +01:00
yorickr 8e51cfad07 Merge api to dev 2015-10-29 19:33:56 +01:00
jancoow 8b6efac738 Added a working server connector 2015-10-15 14:57:59 +02:00
kennyboy55 5491f1d165 Updated GUI 2015-10-15 14:52:10 +02:00
Yorick Rommers bdf6366dc0 Werkt nog niet 2015-10-15 14:36:51 +02:00
kennyboy55 6acb6ecd7a Bugfixes 2015-10-15 14:11:16 +02:00
kennyboy55 3f1483beeb Fixed file 2015-10-15 14:07:47 +02:00
kennyboy55 3cc9bcffb3 Merge branch 'developer' into gui
Conflicts:
	MusicPlayer/MusicPlayer/MusicPlayer.csproj
2015-10-15 14:03:59 +02:00
jancoow 78c86d5680 Added receivedata to a thread 2015-10-15 13:58:33 +02:00
kennyboy55 c2e603efaf Added Jsonsoft Nuget! 2015-10-15 13:58:08 +02:00
Yorick Rommers eb5e1254b0 Added some fields to stubs 2015-10-15 13:55:42 +02:00
Yorick Rommers f643ff2967 Fixed errors. 2015-10-15 13:50:52 +02:00
kennyboy55 9a84ae5586 Added missing files 2015-10-15 13:45:57 +02:00
Yorick Rommers ac23302e81 Merge branch 'api' of https://github.com/yorickr/musicplayer into api 2015-10-15 13:42:56 +02:00
Yorick Rommers a9a104bd41 Added class stubs 2015-10-15 13:42:38 +02:00