Commit Graph

182 Commits

Author SHA1 Message Date
Martin Konecny 0f7063e8a6 another refactor of the switches in LS 2013-03-01 12:48:32 -05:00
Martin Konecny 7e19eba7e1 another refactor of LS source 2013-03-01 11:44:11 -05:00
Martin Konecny 6624911d2c minor refactor of LS code 2013-02-28 18:54:23 -05:00
Martin Konecny b3ecb477be minor refactor of LS code 2013-02-27 17:48:10 -05:00
Martin Konecny fbaba59dca CC-4974: Watchdog for ensuring Liquidsoap does not consume more than 1GB of memory
-changed to 600MB for now. May lower even more later
2013-02-26 14:47:48 -05:00
Martin Konecny 331386f74f CC-4910: Need to properly handle non-200 http status codes in api client
-fixed
2013-02-04 16:05:58 -05:00
Martin Konecny 34eee60bee CC-4910: Need to properly handle non-200 http status codes in api client
-wrap all service calls in exception
2013-02-03 00:40:41 -05:00
Martin Konecny 9d4e0d2dd1 Merge branch 'martin' into 2.3.x 2013-01-29 12:17:36 -05:00
Martin Konecny 9d8a9faca8 make code formatting easier on eyes 2013-01-28 17:00:35 -05:00
Martin Konecny b389e44001 take liquidsoap by the horns if it misbehaves. 2013-01-27 15:00:56 -05:00
Martin Konecny 1d6ff24242 SAAS-298: Issues with http://iqkidsradio.airtime.pro/Schedule
potential fix
2013-01-10 10:29:57 -05:00
Martin Konecny e79066de55 CC-4760: Airtime fails to play out 2nd webstream upon switching from one webstream to another
-fix attempt
2013-01-08 17:23:21 -05:00
James 6e241fd3ec CC-4512: Allow changing stream "Offline" message via Web UI
- fixed
2013-01-07 18:14:57 -05:00
denise b2699fa914 merge from devel 2012-12-03 11:06:56 -05:00
Martin Konecny 62b3c39c5b CC-4702: Webstream: When webstream is playing, it isn't marked as 'media_item_played' in cc_schedule
-fixed
2012-11-15 17:35:06 -05:00
Martin Konecny 5f534b5ef6 CC-4702Webstream: When webstream is playing, it isn't marked as 'media_item_played' in cc_schedule 2012-11-15 17:29:25 -05:00
Martin Konecny 8c73731c41 CC-4633: Use David's new method of Liquidsoap webstream switching
-fixed
2012-11-15 16:43:22 -05:00
Martin Konecny 2010778876 cleanup redundant code, remove whitespace 2012-11-15 13:33:27 -05:00
James b746f65304 CC-4601: Do not rewrite metadata for master source and show source streams.
- fixed
2012-11-01 17:24:41 -04:00
Martin Konecny e40d49219b add missing gstreamer.liq file 2012-10-29 16:29:10 -04:00
Martin Konecny e285bcfba1 update liquidsoap library scripts
-git commit hash f776e7f4c5d3729cbcf863381f3cadd96c578a5b
2012-10-26 12:54:10 -04:00
Martin Konecny 795ffbbf63 CC-2236: Overbooked shows do not respect default fade time
-move map_metadata after crossfade function
2012-10-22 16:36:57 -04:00
Martin Konecny 780a05c2aa CC-2236: Overbooked shows do not respect default fade time
-once a release we manage to break fades :) fixed.
2012-10-22 16:23:33 -04:00
Martin Konecny bd5fef0bcd CC-4487: Webstream could not be heard unless you restart playout as well
-fixed
2012-10-19 16:29:31 -04:00
Martin Konecny 1d4b905572 CC-4564: Webstream Book same webstream twice in Scheduler, the 2nd one doesn't get played
-small syntax error in last commit
2012-10-19 15:18:48 -04:00
Martin Konecny 77b430ce01 CC-4564: Webstream Book same webstream twice in Scheduler, the 2nd one doesn't get played
-fixed
2012-10-19 15:14:52 -04:00
Martin Konecny 6420e6a830 remove trailing whitespace 2012-09-18 17:22:14 -04:00
Martin Konecny 8787a72195 -ensure stream metadata formatting is correct 2012-09-18 17:21:57 -04:00
Martin Konecny 4c58c4c9a9 CC-4473: On Air button greys out when one out of two same Webstreams is cancelled
-fixed
2012-09-18 15:27:27 -04:00
Martin Konecny be80eeb5fd CC-4404: restart airtime-liquidsoap will interrupt the output stream and never resume until restart playout engine
-fixed
2012-09-14 18:20:46 -04:00
Martin Konecny ac8610ca06 CC-4385: Problem with mono streams for stream rebroadcasting
-fixed
2012-09-10 12:18:19 -04:00
Martin Konecny 989f040603 CC-4371: input.harbor for rebroadcasting webstreams has hardcoded password.
-fixed
2012-09-07 11:41:20 -04:00
Martin Konecny fbea75e680 CC-4335: Timeline: Scheduling multiple webstreams, they can not be playing smoothly
-fixed
2012-08-31 18:12:11 -04:00
Martin Konecny 3ed15d565e CC-4327: Timeline: Cancel a track, the following webscream does not get played
-fixed
2012-08-31 17:21:24 -04:00
Martin Konecny f9dca67376 CC-4322: Prevent pypo-notify from hanging if server becomes unresponsive
-up timeout to 45 sec
2012-08-30 15:58:05 -04:00
Martin Konecny 796885594f CC-4322: Prevent pypo-notify from hanging if server becomes unresponsive
-fixed
2012-08-30 15:56:34 -04:00
Martin Konecny 859445c766 CC-3301: Add ability to switch stereo/mono stream in stream settings
-fixed
2012-08-29 17:39:24 -04:00
Martin Konecny 8d81ecf3ad CC-4114: separate Liquidsoap into its own init.d script
if liquidsoap restarts, automatically notify pypo
2012-08-28 15:14:57 -04:00
Martin Konecny 20cfd01f80 CC-1665: Scheduled stream rebroadcasting and recording
-ls_script cleanup
2012-08-21 12:20:15 -04:00
James 1c9e290982 CC-4218: Live resource: Cannot connect live resource.
- fixed
2012-08-20 16:03:29 -04:00
Martin Konecny 5315d1efd0 CC-4114: use liquidsoap shutdown() command to restart liquidsoap
-fixed syntax error
2012-08-20 14:52:35 -04:00
Martin Konecny 0dd3dd506e add logging in scripts so we know which telnet command is issued 2012-08-20 14:40:46 -04:00
Martin Konecny 1dd1ba4420 CC-4114: use liquidsoap shutdown() command to restart liquidsoap
-moved liquidsoap into its own init.d script. Still need to do some testing.
2012-08-18 22:02:15 -04:00
Martin Konecny 84b616cd28 CC-1665: Scheduled stream rebroadcasting and recording
-reduce liquidsoap CPU percentage from 20 -> 17%.
2012-08-17 16:32:26 -04:00
Martin Konecny d8c48a53fe CC-1665: Scheduled stream rebroadcasting and recording
-take care of situation where stream metadata has apostrophe in it.
2012-08-17 16:12:37 -04:00
Martin Konecny 704a8d0805 CC-1665: Scheduled stream rebroadcasting and recording
-make sure any buffers are cleared out from stream when queue is playing and vice-versa
2012-08-16 23:50:32 -04:00
Martin Konecny 50b7597e28 CC-4242: MP3 streams have the artist name duplicated
-fixed
2012-08-16 23:49:37 -04:00
Martin Konecny 5c1c836f11 CC-1665: Scheduled stream rebroadcasting and recording
-pre buffer streams part 3
-finished
2012-08-15 18:30:12 -04:00
Martin Konecny 1e57c12ce7 CC-1665: Scheduled stream rebroadcasting and recording
-pre buffer streams part 1
2012-08-15 16:43:01 -04:00
Martin Konecny d773dcd112 CC-1665: Scheduled stream rebroadcasting and recording
-send stream name back to Airtime: [("url","http://idobiradio.com/"), ("title","Good Charlotte - Like It's Her Birthday")]
2012-08-15 15:12:44 -04:00
Martin Konecny 1891a11373 CC-1665: Scheduled stream rebroadcasting and recording
-Step 1 to make Liquidsoap send back web stream metadata to UI
2012-08-03 18:45:22 -04:00
Martin Konecny 3b25f676c9 CC-3412: Icecast stream name not defined
-fix name being assigned twice
2012-08-03 16:20:48 -04:00
Martin Konecny 194b4ec36e Merge branch '2.1.x' into devel 2012-08-02 18:10:12 -04:00
Martin Konecny 4f1300f58a CC-3412: Icecast stream name not defined 2012-08-02 18:08:17 -04:00
Martin Konecny 63b89043b6 CC-1665: Scheduled stream rebroadcasting and recording
on-air light works with streams now
2012-08-01 14:51:56 -04:00
Martin Konecny fbc5b72f14 CC-1665: Scheduled stream rebroadcasting and recording
-webstreams now start and stop at the correct time.
2012-07-26 14:49:32 -04:00
Martin Konecny 2ad7e78e10 CC-1665: Scheduled stream rebroadcasting and recording
-initial prototype
2012-07-26 14:41:39 -04:00
Martin Konecny 832eafdea1 CC-4104: airtime-uninstall should not purge airtime database be default
-small fix
2012-07-16 15:43:17 -04:00
Martin Konecny 35d3d63e08 CC-4104: airtime-uninstall should not purge airtime database be default
-on reinstall use the database
2012-07-16 15:34:09 -04:00
Martin Konecny e056e5ff01 correctly rename AirTime to Airtime 2012-07-16 15:33:44 -04:00
Martin Konecny 62287a2313 -Remove useless api_client interface 2012-07-12 16:51:11 -04:00
Martin Konecny 5c1af49252 CC-430: Audio normalization (Replaygain Support)
-Added support on Liquidsoap side
2012-07-05 23:24:34 -04:00
denise 335dd1516b Merge branch '2.1.x' into devel
Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
2012-06-29 10:57:14 -04:00
Martin Konecny d6a5200d58 CC-4029: Pypo Notify script incorrectly attempts to use pypo.log log file (should use notify log file)
-fixed
2012-06-27 12:42:38 -04:00
Martin Konecny 4061059d3a CC-3938: Mono sources don't work for stream rebroadcasting
-fixed
2012-06-26 18:04:05 -04:00
denise 3f0a06ee2b CC-3578: Stream label for scheduled shows could fall back to show or station name when no song is currently playing
-done
2012-06-13 12:23:00 -04:00
denise f27fbc14f7 CC-3578: Stream label for scheduled shows could fall back to show or station name when no song is currently playing
-done (falls back to stream name)
2012-06-12 17:40:00 -04:00
denise f3b925daa2 CC-3412: Icecast stream name not defined
-done
2012-06-12 17:08:36 -04:00
Martin Konecny d8ae8002d2 -make sure to autogenerate liquidsoap.cfg before liquidsoap starts 2012-05-28 18:48:40 -04:00
Martin Konecny dc789b808d CC-3852: Liquidsoap source.skip just skip current item in the queue instead of all the items in the queue
-replace queue.ignore with queue.remove
2012-05-18 18:11:51 -04:00
Martin Konecny 86282a8d8a CC-3699: Calls to system() function from our Liquidsoap script are blocking
-fixed
2012-04-22 12:01:40 -04:00
James 7a983b52ed CC-3641: Stream Transition: When a song is added to the for the first time
, the transition fade effects fade in

- fixed
2012-04-13 13:25:40 -04:00
James 268ba66194 CC-3566: Preferences->"Fade In" is not respected when Show starts
- adding some comments
2012-04-11 13:44:24 -04:00
James f82aef2a85 CC-3566: Preferences->"Fade In" is not respected when Show starts
- millisecond value of fade was sent wrong from php side.
- crossfade() call was removed and it was causing fade in/out not working.
2012-04-11 12:27:41 -04:00
James 4d9abb5f7c CC-3533: "On the fly" Stream Rebroadcasting-> interruption problem
while pause in-between DJ stream tracks

- fixed by wrapping all the input.harbor source with mksafe()
2012-03-30 16:30:17 -04:00
Martin Konecny 24262d5ed5 cc-3521: remove 2 second delay 2012-03-27 15:34:56 -04:00
Martin Konecny 654ff76ea4 CC-3399: Use VBR instead of CBR for Vorbis (OGG) audio streams
-Done
2012-03-27 15:33:44 -04:00
Martin Konecny d83267e6dc -remove crossfade function from ls scripts since it wasn't doing anything. 2012-03-27 15:16:58 -04:00
James f41ebbe7a7 CC-3521: Live Stream: Remove 2 second scilence when transition happens
- reduced the blank duration to 0.1 sec
2012-03-26 18:56:28 -04:00
James 6b768c2f99 CC-3483: Live Stream: default fade in/out for live stream transition
- done. changing fade value doesn't require LS to restart
2012-03-20 22:16:17 -04:00
Martin Konecny 1d1405f7fd CC-2675: Edit ongoing show
-initial commit
2012-03-14 15:37:04 -04:00
James 2ee4b227fc CC-3439: Live Stream: Only admin should be able to turn on/of switch and
able to see kick out button

- done
2012-03-14 14:43:11 -04:00
James 4eefc05366 CC-3427: Live Stream: Ability to switch off Scheduled Play
- done
2012-03-14 14:43:10 -04:00
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 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 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 ca04a7a686 CC-3224: "On-the-fly" stream rebroadcasting
- Form in preference section
2012-03-14 14:41:00 -04:00
Martin Konecny eadf68cb61 CC-3318: When changing stream settings (Liquidsoap + Pypo restart), sometimes Airtime does not resume playback
-fixed
2012-02-10 18:43:40 -05:00
james c9c6a08a1c CC-3220: Stream Setting: Status box is stuck on waiting if nothing is
changed and click save

- done
- liquidsoap_update_error and liquidsoap_update_connection functions are
combined into one function, liquidsoap_update_status, in various place
- created various telnet commands in liquidsoap( connection check for each
stream, connection status for all streams)
- In liquidsoap, shoutcast stream doesn't use default id. It is more
informative by using id with "shoutcast_stream_#{stream_number}
2011-12-24 10:59:09 -05:00
James 8463262190 CC-3169: Default liquidsoap.cfg file is missing sX_user
- fixed
2011-12-07 11:31:21 -05:00
Martin Konecny cbc2ba660f CC-3074: Give users the choice of which hardware sound API they wish to use (instead of hardcoded to ALSA)
-done
2011-12-02 13:39:16 -05:00
Martin Konecny 6bcd96db88 CC-3133: Enabling hardware audio output causes all playout to fail with Portaudio error in write_stream: Output underflowed
-should be fixed
2011-12-02 13:39:16 -05:00
James 043f0c29a1 CC-3074: Give users the choice of which hardware sound API they wish to
use (instead of hardcoded to ALSA)

- finished everything except LS part(including upgrade and UI)
2011-12-02 13:39:14 -05:00
James 48d9d2d93b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-29 20:16:01 -05:00