Commit graph

1004 commits

Author SHA1 Message Date
Marks Polakovs
9dd62c5a31 oops 2020-03-29 10:30:03 +02:00
Marks Polakovs
72a9b224c9 Abort in-progress loads (fixes #27), also refactoring 2020-03-29 10:29:10 +02:00
Matthew Stratford
e6e29a03a4 Revert "Unused bits tidy up" for API url change. 2020-03-29 00:45:57 +00:00
Matthew Stratford
4c4a93edb3 Add missing payload action 2020-03-29 00:16:01 +00:00
Matthew Stratford
c2a6c311b6 Merge branch 'master' into mstratford-broadcast-ui 2020-03-29 00:13:51 +00:00
Matthew Stratford
fef080210f Unused bits tidy up 2020-03-29 00:07:29 +00:00
Matthew Stratford
1eb6906038 Use myradio for user login and timeslot selection 2020-03-29 00:07:07 +00:00
Marks Polakovs
86cf48bd2d Merge branch 'markspolakovs-streaming' 2020-03-28 22:13:42 +01:00
Matthew Stratford
135e2083cd Replace Webstudio text logo with a shape SVG 2020-03-28 20:06:18 +00:00
Marks Polakovs
c92d959753 Working streaming (using a public TURN server) 2020-03-28 19:16:14 +01:00
Matthew Stratford
3679e0649e Merge branch 'master' into mstratford-broadcast-ui 2020-03-28 17:25:21 +00:00
Matthew Stratford
9311593cc6 Reset the tracklistitemid on loading new item. 2020-03-28 17:17:27 +00:00
Matthew Stratford
c3f223a7d4 API doesn't like null params. 2020-03-28 17:06:41 +00:00
Matthew Stratford
840d98c235 Make tracklistEnd work 2020-03-28 17:01:59 +00:00
Matthew Stratford
b0261386c5 Fix API tracklisting URL's 2020-03-28 15:44:59 +00:00
Matthew Stratford
33816488a3 Merge branch 'mstratford-broadcast-ui' 2020-03-28 15:32:15 +00:00
Matthew Stratford
1796b0aac7 Initial tests of tracklisting at start and end. 2020-03-28 15:31:12 +00:00
Marks Polakovs
0ce3e73465 use proper server 2020-03-28 11:24:06 +01:00
Marks Polakovs
0e40f26438 Don't assume files only move forward in time (fixes #26) 2020-03-28 08:41:45 +01:00
Marks Polakovs
1c57043421 derp 2020-03-28 08:38:44 +01:00
Marks Polakovs
5bb21ad4f6 package diddling 2020-03-28 08:38:16 +01:00
Ben Allen
805bc73e0b mic locking for touchscreens (in bootstrap) 2020-03-28 03:06:46 +00:00
Ben Allen
f3b891e308 disconnects source on change - needs testing 2020-03-28 02:37:08 +00:00
Ben Allen
da749ad2eb disables button if current mic selected 2020-03-28 02:29:10 +00:00
Ben Allen
b8d4e02d4e mic state added id 2020-03-28 02:27:48 +00:00
Ben Allen
81138333ba can open specific mic, action must be repeatable 2020-03-28 02:06:55 +00:00
Ben Allen
5ad68a312e gets list properly now 2020-03-28 01:54:30 +00:00
Ben Allen
49e478a553 starting dropdown 2020-03-28 01:44:37 +00:00
Ben Allen
7eab81e973 gets the damn list once now coz screw refreshing 2020-03-28 01:41:57 +00:00
Ben Allen
d3a80134fb doing it better 2020-03-28 01:30:24 +00:00
Ben Allen
f39a9d2232 dynamics pt2 2020-03-28 01:24:51 +00:00
Marks Polakovs
1c0ac77b7d remove old smelly garbage 2020-03-27 11:24:59 +01:00
Marks Polakovs
7b6975c908 Streaming works - ish 2020-03-27 11:22:54 +01:00
Marks Polakovs
000b8323e1 WIP 2020-03-26 15:39:25 +01:00
Matthew Stratford
9738be7302 Merge remote-tracking branch 'origin/master' 2020-03-26 11:51:38 +00:00
Matthew Stratford
72dd694e23 Implement basic tracklisting, more to come. 2020-03-26 11:51:18 +00:00
Marks Polakovs
c9fa471d41 Dev/prod builds 2020-03-26 10:47:02 +01:00
Marks Polakovs
62fd8a939b Revert "I no longer want to be a programmer."
This reverts commit e101aa66bb.
2020-03-25 18:59:32 +01:00
Marks Polakovs
e101aa66bb I no longer want to be a programmer. 2020-03-25 18:56:36 +01:00
Marks Polakovs
af5a86f174 Search for jingles.beds 2020-03-25 18:41:29 +01:00
Marks Polakovs
d2ed831a0b Replace some cursed bullshit with some slightly less cursed bullshit 2020-03-25 16:43:43 +01:00
Marks Polakovs
5737ea276b Load jingles and beds from the sidebar (fixes #16) 2020-03-25 16:30:44 +01:00
Marks Polakovs
0b93cbca37 refactoring 2020-03-25 15:38:35 +01:00
Marks Polakovs
e038dec5d1 Stop text and shit from blocking waveform clicks (partly fixes #19) 2020-03-25 15:09:22 +01:00
Marks Polakovs
d6bc4fd301 Lock out playback controls while loading (fixes #20) 2020-03-25 15:07:24 +01:00
Marks Polakovs
5dad5e2384 Test commit 2020-03-24 14:55:49 +01:00
Marks Polakovs
806c9d9fb3 Working auto-advance / play on load / repeat 2020-03-24 14:49:33 +01:00
Marks Polakovs
ad1cb008c8 Use WaveSurfer for all playback, instead of some strange 50-50 2020-03-24 14:06:25 +01:00
Marks Polakovs
1142a87f5c Use blob URLs to avoid loading the audio data twice 2020-03-24 13:18:10 +01:00
Marks Polakovs
519f11e294 Merge pull request #3 from UniversityRadioYork/mstratford-design
Initial Bootstrap Design
2020-03-24 11:53:01 +01:00