Commit Graph

702 Commits

Author SHA1 Message Date
Martin Konecny db5d2283f4 Merge branch '2.3.x'
Conflicts:
	python_apps/pypo/pypofetch.py
2013-04-05 17:33:02 -04:00
Martin Konecny 3d135a9f4a improved logging on why files sometimes aren't removed 2013-04-05 17:31:55 -04:00
Martin Konecny 18574fd10f Merge branch '2.3.x' 2013-04-05 15:57:54 -04:00
Martin Konecny 5ff7ce857f use sigkill immediately for unresponsive telnet
-fix order of arguments
2013-04-05 15:57:16 -04:00
Martin Konecny 4595aab694 Merge branch '2.3.x' 2013-04-05 15:33:48 -04:00
Martin Konecny d1f655d79d CC-5038: Silan error: list index out of range
-fixed
2013-04-05 15:32:44 -04:00
Martin Konecny afb55c7b51 CC-5038:
Silan error: list index out of range

cosmetic bug fix to prevent so much logging
2013-04-05 14:20:34 -04:00
Martin Konecny 08c93e10fd Merge branch '2.3.x' 2013-04-05 13:57:32 -04:00
Martin Konecny cdb53048c7 ensure that an empty listener stats dict is not sent to the server 2013-04-05 13:56:41 -04:00
Martin Konecny 1a8ab6cd89 Merge branch '2.3.x' 2013-04-05 12:43:01 -04:00
Martin Konecny 266823b1d9 use sigkill immediately for unresponsive telnet 2013-04-05 12:42:05 -04:00
Martin Konecny 2b019c4615 Merge branch '2.3.x' 2013-04-05 11:28:47 -04:00
Martin Konecny f8dbbe71ab increase monit timeout after liquidsoap starts to 30 seconds. 2013-04-05 11:27:45 -04:00
Martin Konecny e2e6a4263c Merge branch '2.3.x' into devel 2013-04-03 16:48:19 -04:00
Martin Konecny ec7c898f5a fix some problems with invalid Liquidsoap PID file 2013-04-03 16:47:46 -04:00
Martin Konecny bfb252edf5 CC-4417: Opus codec support 2013-04-03 11:40:57 -04:00
Martin Konecny 0bb7fa4975 don't change monit monitor state on service start/stop 2013-04-02 12:30:15 -04:00
Martin Konecny 811abc4baf don't change monit monitor state on service start/stop 2013-04-01 19:31:13 -04:00
Martin Konecny 894887bd62 Merge branch '2.3.x' into devel 2013-03-26 15:02:17 -04:00
Martin Konecny caa2413fd8 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-03-26 15:02:08 -04:00
Martin Konecny d79bfaaef9 -fix infinite loop on invalid files 2013-03-26 15:01:44 -04:00
Martin Konecny 5ab52b12c7 CC-4417:
Opus codec support
2013-03-26 15:00:41 -04:00
Martin Konecny 38f8a0d231 more robust handling if system permissions go wrong 2013-03-24 22:58:13 -04:00
Martin Konecny 89983bd4f8 remove unnecessary file delete 2013-03-24 22:25:38 -04:00
Martin Konecny a5c8b7624e CC-1469: Crossfading support (non-equal power)
-handle file attributes changing (end time, replaygain etc.)
2013-03-22 15:56:05 -04:00
Martin Konecny 7a6940c96c Merge branch 'cc-1469-crossfade' into devel
Conflicts:
	python_apps/pypo/pypopush.py
2013-03-22 15:24:14 -04:00
Martin Konecny 8a5c82d71a CC-1469: Crossfading support (non-equal power)
-fix few bugs
2013-03-22 15:21:28 -04:00
Martin Konecny fc6742869f better frozen liquidsoap handling 2013-03-22 14:23:42 -04:00
Martin Konecny 19753429dc add wait timer before liquidsoap is shutdown 2013-03-22 14:04:50 -04:00
Martin Konecny 33ca2e7c9c CC-1469: Crossfading support (non-equal power)
-refactor
2013-03-22 12:16:17 -04:00
Martin Konecny 708d36ba9c syntax error 2013-03-19 15:22:27 -04:00
Martin Konecny 6dae7d3973 CC-1469: Crossfading support (non-equal power)
-cleanup
2013-03-15 17:00:36 -04:00
Martin Konecny 445573dcdb CC-1469: Crossfading support (non-equal power)
-webstreams scheduled in the future are now working...
2013-03-15 15:07:55 -04:00
Martin Konecny dd7fc61e23 CC-1469: Crossfading support (non-equal power)
-further implementation..
2013-03-15 12:50:23 -04:00
Martin Konecny 2b7ebafa94 CC-1469: Crossfading support (non-equal power)
-further implementation..
2013-03-14 18:29:52 -04:00
Martin Konecny 91d1243554 CC-1469:
Crossfading support (non-equal power)

-initial commit
2013-03-14 16:50:55 -04:00
Martin Konecny 661a407f72 CC-5016: Allow user control for webstream metadata format
-fixed
2013-03-08 16:45:19 -05:00
Martin Konecny fe96b66fd7 CC-5016:
Allow user control for webstream metadata format

-fixed
2013-03-08 16:00:16 -05:00
Martin Konecny 0075b27947 CC-5015: Allow for cue_out points to be Null in DB
-prep for 2.4
2013-03-08 14:57:20 -05:00
Martin Konecny 30970598fe minor fixes
-don't show print subprocess commands to py-interpreter.log
2013-03-08 12:39:29 -05:00
Martin Konecny 3969e38d51 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-03-07 18:34:10 -05:00
Martin Konecny c2fb811100 CC-5012:
remove all shell=True commands for subprocess calls

-fixed
2013-03-07 18:33:55 -05:00
Martin Konecny fc261035a8 CC-4999: Do silan analysis quietly in the background
-set silan nice level to 19
2013-03-06 19:48:35 -05:00
Martin Konecny 0321464ab8 CC-4999:
Do silan analysis quietly in the background

-fixed
2013-03-06 18:24:19 -05:00
Martin Konecny 7ca178295f CC-4993: airtime-check-system reports airtime-liquidsoap as down
-fixed
2013-03-06 13:43:22 -05:00
Martin Konecny 8e314477c7 CC-5005: airtime-purge doesn't remove all files
-cleanup
2013-03-06 12:26:07 -05:00
Martin Konecny e669b7a91a refactor some liquidsoap code + remove unused --data argument 2013-03-05 17:31:09 -05:00
Martin Konecny 215e5ccb4c CC-5001: remove /etc/monit/conf.d/monit-airtime-rabbitmq-server.cfg on 2.3.1 upgrade
-don't even install rabbitmq monit file
2013-03-05 16:21:05 -05:00
Martin Konecny 05b988fc6a CC-4758: File removed before Liquidsoap finishes reading it?
-fixed
2013-03-01 16:15:28 -05:00
Martin Konecny 259f70bc21 CC-4915: Media-Monitor cannot handle rabbitmq restart event
-fixed
2013-03-01 16:05:55 -05:00
Martin Konecny 764ee0389f CC-4916: Pypo cannot handle Schedule updates after rabbitmq restart happens
-fixed
2013-03-01 15:52:41 -05:00
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 ae503121d8 CC-4984: Exception for replaygain
-fixed
2013-02-28 18:26:15 -05:00
Martin Konecny 5ae4ed67a5 CC-4986: Installation fail because of monit-airtime-liquidsoap.cfg
-fixed
2013-02-28 16:33:59 -05:00
Martin Konecny 66fbfa1554 CC-4986: Installation fail because of monit-airtime-liquidsoap.cfg
-fixed
2013-02-28 16:27:52 -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 15f2533225 less verbose logging 2013-02-26 13:34:05 -05:00
Naomi f2773fcb01 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-02-15 16:32:43 -05:00
Naomi fe611e7c6a CC-4957 : Replay Gain undefined error, json response not being sent back properly. 2013-02-15 16:32:05 -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 1f4cfa8f65 fix pypo not auto restarting 2013-02-02 08:50:44 -05:00
Martin Konecny 149b744ba7 remove using self in a static method 2013-02-01 01:40:48 -05:00
Martin Konecny f145ede01b CC-4905: Unit tests for Pypo
-whitespace removal
2013-01-31 17:45:57 -05:00
Martin Konecny 8adb4b259c CC-4905: Unit tests for Pypo 2013-01-31 12:33:14 -05:00
Martin Konecny e459f739f2 indentation error fix 2013-01-30 11:29:28 -05:00
Martin Konecny 2a0cc9e45f fix indentation 2013-01-30 11:23:20 -05:00
Martin Konecny 9d4e0d2dd1 Merge branch 'martin' into 2.3.x 2013-01-29 12:17:36 -05:00
Martin Konecny 28c01760dd be more gentle to Liquidsoap when sending lots of commands 2013-01-29 12:17:05 -05:00
Martin Konecny 9d8a9faca8 make code formatting easier on eyes 2013-01-28 17:00:35 -05:00
Martin Konecny d7358338f0 improved logging in pypo fetch 2013-01-28 17:00:16 -05:00
Martin Konecny b389e44001 take liquidsoap by the horns if it misbehaves. 2013-01-27 15:00:56 -05:00
Martin Konecny c93b90cc54 prepare for improvements to way pypo communicates with LS 2013-01-26 20:05:31 -05:00
Martin Konecny 807aa6b4a6 fix restart liquidsoap being sent as default no arguments for pypo-notify 2013-01-25 15:14:40 -05:00
Martin Konecny 8dd7ffee8c locks should occur inside try/catch 2013-01-25 14:16:53 -05:00
Martin Konecny 21a04803e5 Fix Pypo giving up too early on attempting to receive schedule 2013-01-25 12:11:50 -05:00
Martin Konecny b637365f55 add some missing statements in the sql upgrade script 2013-01-18 15:58:00 -05:00
Martin Konecny 1d6ff24242 SAAS-298: Issues with http://iqkidsradio.airtime.pro/Schedule
potential fix
2013-01-10 10:29:57 -05:00
James 6e7f45e615 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-08 17:32:39 -05:00
James 1263c04621 CC-4796: Listener Stat: Authentication exception happens but no warning message on UI
- done
2013-01-08 17:32:27 -05:00
Martin Konecny 8b8e12a234 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-08 17:23:28 -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 adda497bbb CC-4812: Property "off_air_meta" will block airtime-liquidsoap to start
- fixed
2013-01-08 15:52:11 -05:00
James b580a7be73 CC-4812: Property "off_air_meta" will block airtime-liquidsoap to start
- fixed
2013-01-08 12:31:14 -05:00
James 6e241fd3ec CC-4512: Allow changing stream "Offline" message via Web UI
- fixed
2013-01-07 18:14:57 -05:00
Martin Konecny 225a5d8f48 CC-4733: Stream statistics for Shoutcast users
-initial implementation
2013-01-04 18:32:20 -05:00
James ae7b6fe092 CC-4732: Ask for admin username + password in Stream Settings page
- done
2013-01-03 17:58:50 -05:00
James a05259bd8f CC-4771: System -> Streams: It will restart liquidsoap every time when I click "Save" button without changing anything
- fixed
2013-01-03 14:42:12 -05:00
Martin Konecny b9d829a33c CC-4754: Replay gain modifier
-make pypo repush song if its replay_gain changed
2012-12-28 13:58:55 -05:00
denise b2699fa914 merge from devel 2012-12-03 11:06:56 -05:00
Martin Konecny fed39077c0 Merge branch '2.2.x' into devel 2012-11-20 11:21:29 -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
Rudi Grinberg 2e59eca131 moved files to pypo dir 2012-11-14 14:43:33 -05:00
Rudi Grinberg d5cacf4011 moved replay gain to pypo for better saas performance 2012-11-14 14:43:10 -05:00
James 6145f9bcad Merge branch '2.2.x' into devel 2012-11-08 17:28:23 -05:00
James 628e6bed37 CC-4689: Live Stream: The 1st song of a show won't play if there is another show have live stream assigned and finished right before
- fixed
2012-11-08 17:26:55 -05:00
James 7300b608cf Merge branch 'cc-4661-listener-statistics' into devel
Conflicts:
	python_apps/api_clients/api_client.py
2012-11-07 17:20:12 -05:00
Martin Konecny 34d0ee5954 CC-4661: Listener Statistics
-add mount point names
2012-11-02 18:04:32 -04:00
Martin Konecny 5bd0fe0300 clean up source file tailing whitespace 2012-11-02 17:51:02 -04:00
Martin Konecny 6438b54a5f CC-4661: Listener Statistics
-backend part working
2012-11-02 17:50:43 -04:00
Rudi Grinberg dfc3cf9267 removed useless tests 2012-11-02 15:05:08 -04:00
denise 135aadf16b Merge branch '2.2.x' into devel
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/views/scripts/library/library.phtml
	airtime_mvc/public/js/airtime/showbuilder/builder.js
	airtime_mvc/public/js/airtime/showbuilder/main_builder.js
2012-11-02 12:28:21 -04: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
Rudi Grinberg 3b8181062c pointless refactoring of stuff that's never used 2012-10-30 17:35:10 -04:00
Martin Konecny 5f0fd0ef09 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-29 16:29:20 -04:00
Martin Konecny e40d49219b add missing gstreamer.liq file 2012-10-29 16:29:10 -04:00
Rudi Grinberg 3b51c93766 Refactored pyponotify. Removed code duplication and made runner reusable by other scripts. 2012-10-29 11:25:05 -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 ef78cefcd9 CC-4487: Webstream could not be heard unless you restart playout as well
-cleanup of unused variables
2012-10-19 16:49:01 -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 9dfee6aa68 CC-4564: Webstream: Book same webstream twice in Scheduler, the 2nd one doesn't get played
-fixed
2012-10-19 15:39:45 -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 a929561088 CC-4565: Pypopush: Error happens when trying to insert a song right behind a Webstream as well as that Webstream is just finished
-make sure we don't return a negative when calculating interval
seconds
2012-10-16 11:59:37 -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 c0f3395a61 CC-4404: restart airtime-liquidsoap will interrupt the output stream and never resume until restart playout engine
-fixed
2012-09-14 19:01:21 -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 da72c00f28 CC-4370: Transitioning between two webstreams: a hiccup in the stream is audible
-fixed
2012-09-13 16:10:17 -04:00
Martin Konecny 3107286799 CC-4370: Transitioning between two webstreams a hiccup in the stream is audible 2012-09-10 15:35:32 -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 d20c450226 CC-4370: Transitioning between two webstreams a hiccup in the stream is audible
-some major refactoring before fixing this problem
2012-09-07 17:38:24 -04:00
Martin Konecny 989f040603 CC-4371: input.harbor for rebroadcasting webstreams has hardcoded password.
-fixed
2012-09-07 11:41:20 -04:00
Rudi Grinberg f4848a8306 cc-4241: Tweaked metadata handling again 2012-09-05 10:59:56 -04:00
Rudi Grinberg d12833a71e Pypo debugging 2012-09-05 10:36:32 -04:00
Rudi Grinberg ab9fbc48ae MM2: Added docstrings 2012-09-05 10:24:10 -04:00
Rudi Grinberg b08874ad97 Changed pypo recordeder to output title metadata with media monitor compatible output. To avoid extra parsing. 2012-09-04 17:24:29 -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 1aa73c7347 CC-4321: NowPlaying: Cancelling Webstream has no effect and results in OnAir being grayed out
-syntax error :/
2012-08-31 12:52:07 -04:00
Martin Konecny 61537c550e CC-4321: NowPlaying: Cancelling Webstream has no effect and results in OnAir being grayed out
-fix out of bounds error
2012-08-31 12:49:35 -04:00
Martin Konecny 0ceb0167fe Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-31 12:18:48 -04:00
Martin Konecny c043053407 CC-4321: NowPlaying: Cancelling Webstream has no effect and results in OnAir being grayed out
-fixed
2012-08-31 12:18:37 -04:00
Daniel James 4ffbbfa164 Update the text sent to the console, since binary is no longer installed here 2012-08-31 14:36:05 +01: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 c201473dbd CC-4311: On Air button gets greyed out few seconds after show starts
-fixed
2012-08-30 12:02:26 -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 ec4343deb0 CC-4313Make sure any service can re-create its log file if the file is removed
-fixed
2012-08-29 11:04:56 -04:00
Martin Konecny 67d79b97e4 CC-4114: separate Liquidsoap into its own init.d script
-changed my mind - don't restart liquidsoap if pypo restarts
2012-08-28 15:32:25 -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