Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,473 Commits 18 Branches 27 Tags 434 MiB
Commit Graph

6473 Commits

Author SHA1 Message Date
James 68fa46f017 CC-3415: Live Stream: Disconnect all input.harbor connections before 
terminating the process

- call prepare termiate on monit-restart()
 2012-03-14 14:43:10 -04:00
James cde6db812f CC-3415: Live Stream: Disconnect all input.harbor connections before 
terminating the process

- Modified init.d script. init.d script calls liquidsoap_prepare_terminate.py
 2012-03-14 14:43:10 -04:00
James 79f8eabe2b CC-3405: Display to users how to connect a live stream to Airtime 
- Done
 2012-03-14 14:43:10 -04:00
James 540f262a77 CC-3224: "On-the-fly" stream rebroadcasting 
- removed "Allow override" checkbox from show live stream section.
- removed "auto enable live stream" checkbox from stream setting page.
- implemented authentication functionality of live dj source connection.
 2012-03-14 14:43:10 -04:00
James efee025691 CC-3406: Live Stream: Switch off live sources on disconnection 
- done
 2012-03-14 14:43:10 -04:00
James f193047a1c CC-3367: Display in Now Playing whether Live DJ stream and Live Master stream 
are connected and give user the ability to block those streams

- added stream source switch interface
- backend code
 2012-03-14 14:43:10 -04:00
James d4a387e113 - adding switch to liquidsoap 2012-03-14 14:41:00 -04:00
James dfe87723f0 - bug fix in stream setting 
- testing lisquidsoap
 2012-03-14 14:41:00 -04:00
James 128a497059 CC-3224: "On-the-fly" stream rebroadcasting 
- frond-end implementation for master dj and live dj
- db implementation
- liquidsoap is broken on this commit
 2012-03-14 14:41:00 -04:00
James 96c4462adc - delete unnecessary part from config files 2012-03-14 14:41:00 -04:00
James 1ebe3d1812 CC-3224: "On-the-fly" stream rebroadcasting 
- Live source is created when only both port and mount point are specified
 2012-03-14 14:41:00 -04:00
James 30901aa0d6 CC-3224: "On-the-fly" stream rebroadcasting 
- A section where user can setup port and mount point for harbor input in
stream setting page(front-end and back-end)
- updated the part where it rewrites the liquidsoap.cfg file
 2012-03-14 14:41:00 -04:00
James 48bb19d758 CC-3224: "On-the-fly" stream rebroadcasting 
- web interface
- auth script for liquidsoap
- DB changes
 2012-03-14 14:41:00 -04:00
james 701ed82f40 CC-3224: "On-the-fly" stream rebroadcasting 
- interface implementation. subform within the show form.
 2012-03-14 14:41:00 -04:00
James ca04a7a686 CC-3224: "On-the-fly" stream rebroadcasting 
- Form in preference section
 2012-03-14 14:41:00 -04:00
Naomi Aro 309c6da83d CC-3440 : Calendar time picker is hidden for day and week views 2012-03-14 18:05:50 +01:00
Naomi Aro 59e0436597 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-14 17:51:00 +01:00
Naomi Aro eb389d99d2 CC-3434 : Playlist Builder fast deleting 2012-03-14 17:50:48 +01:00
Daniel f399c7adab CC-3426: apache log errors from plupload 
- Updated code so the errors in the log are fixed.
- Performed sanity test on large file size that exceed disk space
  and normal uploads that are small enough to be copied
 2012-03-14 11:14:22 -04:00
Daniel d25a6b7b6b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-13 18:00:51 -04:00
Daniel a65ea6d058 CC-3404: Change "Now Playing" dashboard SQL query to take advantage of the "playout_status" field in the schedule table 
- updated the code to remove the empty declaration of $results
- updated parameters so the name has p_ prepended to it
- fixed a weird bug where $con was not sent to updateScheduleStatus
- modified previous element logic so I only store the index and after the loop test if it was set and then do the formating.
 2012-03-13 17:46:13 -04:00
Martin Konecny 1dc9f51c47 CC-3411: pypo-notify should write to its own log 
-done
 2012-03-13 16:53:10 -04:00
Daniel 0b82107d28 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-13 14:12:36 -04:00
Daniel 927e5033c8 CC-3395: Play preview for playlists and timelines for shows should show a list under the pop-up player which will play the entire playlist. 
- Updated detection of ogg or mp3 files
 2012-03-13 14:12:14 -04:00
Naomi Aro dff0265e55 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-13 16:41:19 +01:00
Naomi Aro 7e7820d366 CC-733 : broadcast logs 
adding table scroll height.
 2012-03-13 16:41:06 +01:00
Daniel 48c8607d17 CC-3423: nowPlaying getCurrentPlaylist doesn't work for next song 
-added brackets around other if condition
 2012-03-13 11:34:43 -04:00
Daniel 13e3197ebf CC-3423: nowPlaying getCurrentPlaylist doesn't work for next song 
- added brackets to an statement
 2012-03-13 11:31:24 -04:00
Daniel 9e850838ca CC-3404: Change "Now Playing" dashboard SQL query to take advantage of the "playout_status" field in the schedule table 
- Updated ApiController to use Schedule's GetPlayOrderRange which has better performance.
 2012-03-13 10:36:11 -04:00
Daniel 1e4d34447a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/models/Schedule.php
 2012-03-13 10:23:44 -04:00
Daniel cbaeda1d6b CC-3404: Change "Now Playing" dashboard SQL query to take advantage of the "playout_status" field in the schedule table 
- Updated the logic in GetPlayOrderRange now I get the previous, current and next shows and tracks to be played.
- This information is then sent back to the caller.
	- if the previous track is null the previous show is sent back as an example of the algorithm.
 2012-03-13 10:21:01 -04:00
Naomi Aro a8d61ff19c CC-3328 : Scrolling behaviour in Chrome on OSX makes Airtime unusable 2012-03-13 14:19:25 +01:00
Naomi Aro 6830af574a CC-3174 : showbuilder 
fixing some merge stuff.
 2012-03-13 12:52:41 +01:00
Martin Konecny 6f270bfb3d Merge branch '2.0.x' into devel 
Conflicts:
	VERSION
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/Show.php
	airtime_mvc/public/js/airtime/dashboard/helperfunctions.js
	install_minimal/include/airtime-constants.php
	python_apps/api_clients/api_client.py
	python_apps/pypo/pypocli.py
	python_apps/pypo/pypofetch.py
 2012-03-12 17:52:17 -04:00
Martin Konecny 926231513e -remove unused function 2012-03-12 12:24:54 -04:00
Daniel 09b5d9003b CC-3395 Play preview for playlists and timelines for shows should show a list under the pop-up player which will play the entire playlist. 
- Updated library.js because I lost my changes during merge
 2012-03-12 11:57:30 -04:00
Daniel c0b0e8079b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-12 11:33:28 -04:00
Naomi Aro 3145c24ba2 CC-3174 : showbuilder 
changing queries for datatables to use the Datatables model class.
 2012-03-12 15:32:24 +01:00
Daniel d713f830cd CC-3395: Play preview for playlists and timelines for shows should show a list under the pop-up player which will play the entire playlist. 
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/public/js/airtime/library/library.js
 2012-03-12 10:23:50 -04:00
Daniel 48aeaaf05a CC-3395: Play preview for playlists and timelines for shows should show a list under the pop-up player which will play the entire playlist. 
- merging with devel
 2012-03-12 10:20:58 -04:00
Naomi Aro 41a46b3144 CC-3174 : showbuilder 2012-03-12 15:02:34 +01:00
Naomi Aro f28f6659dc CC-3403 : Replace Now Playing with the new Timeline screen 2012-03-12 14:23:03 +01:00
Naomi Aro 3b32a16813 CC-3174 : showbuilder 
setting a timeout to refresh when the first item on the timeline starts incse there is no "current" item.
 2012-03-12 13:25:03 +01:00
Naomi Aro 20db8d6fdf CC-733 : broadcast logs 
adding time range selection for the log history.
 2012-03-12 11:47:25 +01:00
Daniel 470cf0dbf8 CC-3395: Play preview for playlists and timelines for shows should show a list under the pop-up player which will play the entire playlist. 
- Updated jplayer so it now shows a list view under the player which shows details of the track being played, and for playlists the entire playlist list.
- Also enabled playing playlists from the library.
 2012-03-09 18:47:08 -05:00
Naomi Aro 7c63387dd5 CC-733 : broadcast logs 
adding the export table tools.
 2012-03-09 13:39:12 +01:00
Naomi Aro 3bec576ad3 Merge branch 'devel' into CC-733 2012-03-09 11:28:57 +01:00
Naomi Aro b58e948825 CC-733 : adding extra error messages 2012-03-09 11:28:43 +01:00
Naomi Aro c66b55ec17 CC-733 : playout history 
translating mDataProp values to be able to search table on backend
 2012-03-09 11:13:32 +01:00
Naomi Aro 53b8eb2724 CC-733 : export broadcast logs 
exporting stats based on czech law
 2012-03-08 18:30:56 +01:00