Commit Graph

803 Commits

Author SHA1 Message Date
Albert Santoni 7438ecd2b4 Use track metadata from Airtime in playout engine
* Resolves CC-5893: Metadata not updated on Airtime Pro
* Report track metadata in the schedule API, and make pypo pass that
  along to Liquidsoap via annotations.
* Move HTTP response sanitization for file metadata out of the REST module and into CcFiles
* Slightly improved the terrible exception handling in pypo
2014-07-15 16:41:55 -04:00
drigato 039a51121b CC-5885: Factor out cloud storage code into separate class 2014-07-11 16:16:30 -04:00
drigato 6f119b006f CC-5884: Modify Pypo -> Download files from cloud storage 2014-07-10 17:58:00 -04:00
drigato e6bbf8e84c CC-5884: Modify Pypo -> Download files from cloud storage 2014-07-10 17:57:38 -04:00
drigato c2411b6f41 CC-5884: Modify Pypo -> Download files from cloud storage 2014-07-10 17:56:41 -04:00
cliffctwang 3c40c6d627 Merge branch '2.5.x' into 2.5.x-saas 2014-03-21 09:46:30 -04:00
cliff.wang b827321093 cc-5747 Replaygain: doesnt work for aac tracks 2014-03-20 13:02:37 -04:00
Albert Santoni 2a783f3825 Merge branch '2.5.x' into 2.5.x-saas 2014-03-17 15:41:14 -04:00
Albert Santoni 73cbead4c3 CC-5729: Pypo race condition on show source kick event kills playout
* Fixed a race condition in pypo which could kill playout. Input kick
  events and non-file/webstream events could result in an exception
  being thrown. Fixed the logic error behind this, caught the exception
  just in case, and added some code to prevent uncaught pypopush
  exceptions from terminating the thread.
* Could prevent playout breakage in similar situations
2014-03-11 18:01:29 -04:00
Albert Santoni 02a96646e1 Merge branch '2.5.x' into 2.5.x-saas
Conflicts:
	python_apps/pypo/listenerstat.py
2014-02-05 17:35:59 -05:00
Albert Santoni b4e7b9324b Fixed listener stats thread hanging on network errors
* Same fix as before, urlopen() wasn't being used with a timeout.
* Fixes CC-5472 and SAAS-394 aka. listener stats breaking all the time
2014-02-05 17:29:15 -05:00
Albert Santoni dfc4c2f308 SAAS-387: Hunt playout freezes
* Really kill hung pyponotify processes.
2014-02-05 12:20:04 -05:00
Naomi Aro 49474ab5c4 Merge branch '2.5.x' into 2.5.x-saas
Conflicts:
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/forms/LiveStreamingPreferences.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/application/views/scripts/schedule/add-show-form.phtml
2013-12-17 17:20:38 -05:00
Naomi 2ab269dd29 CC-5299 : Back to back record shows doesn't work with some devices
waiting until the ecasound process has completed before starting a new recording thread.
2013-10-15 14:31:06 -04:00
Naomi f91cb39e46 CC-5363 : pushing a file twice, noticeable replaygain switch 2013-10-11 17:05:42 -04:00
Albert Santoni f34a6d201a Double the pypo->liquidsoap timeout on second attempt if first attempt failed 2013-10-07 15:39:14 -04:00
Albert Santoni 02101db088 Raise timeout for pypo->liquidsoap communication to improve reliability under load 2013-10-07 15:37:34 -04:00
Naomi a34ae69d4b CC-5347 : Random Error think to do with updating is scheduled status of a webstream
not sending a notify message if webstream source is -1
2013-09-30 15:56:26 -04:00
Naomi 9f38e5a9c6 CC-5342 : Pypo: Webstream disconnection happens when any changes on Now playing page 2013-09-26 17:03:18 -04:00
Naomi Aro 60bf334aeb Merge branch '2.4.x' into 2.4.x-saas 2013-09-02 15:46:25 -04:00
cliff.wang 12a62a3827 CC-5309:Calendar-> Recording Show: Fail to open context menu
Better error msg, also add more information in show-record.log
2013-08-23 14:23:47 -04:00
cliff.wang ceba84d1f7 CC-5308 Liquidsoap input habor will block schedule contents sometime
Remove makesafe wrapper
2013-08-22 15:03:25 -04:00
denise 694e3101a8 Merge branch '2.4.x' into 2.4.x-saas 2013-07-22 11:02:35 -04:00
denise de76b3a12f CC-5278: Exception in Pypo 2013-07-17 15:29:21 -04:00
denise 18bb477845 Merge branch '2.4.x' into 2.4.x-saas 2013-07-10 11:32:51 -04:00
denise f9a1cae72e CC-5260: Liquidsoap: Fail to play mono file
Fixed thanks to Bill Burton
2013-07-10 10:35:24 -04:00
Naomi Aro f2d5fa96da Merge branch '2.4.x' into 2.4.x-saas
Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
	utils/phone_home_stat.php
2013-06-26 01:25:26 -04:00
Martin Konecny c11021af0f remove commented code 2013-06-14 16:36:47 -04:00
Martin Konecny caa3b420c4 Liquidsoap restart shouldn't timeout 2013-06-13 14:59:23 -04:00
Martin Konecny b929cc0ce5 CC-5232: During playback, a reinstall may push some tracks twice 2013-06-13 14:06:07 -04:00
Martin Konecny bc1c8129a9 CC-5232 - During playback, a reinstall may push some tracks twice 2013-06-13 12:08:25 -04:00
Martin Konecny c365373aab remove useless code and imports 2013-06-12 17:36:24 -04:00
Martin Konecny fb80530069 CC-5229: map_metadata in Liquidsoap is applied twice
fixed
2013-06-12 16:04:57 -04:00
Martin Konecny 6961ba0a00 use he-aac v2 for fdk-aac 2013-06-12 15:31:36 -04:00
Martin Konecny 949ae9667b CC-5226: Metadata isn't correct during playing
-fixed using "insert_metadata" and callbacks instead.
2013-06-12 14:04:52 -04:00
Martin Konecny 4e71345a61 CC-5226: Metadata isn't correct during playing
-fix incorrect metadata formatting
2013-06-12 12:49:28 -04:00
Martin Konecny 0e560d89ad CC-5226:
Metadata isn't correct during playing

-should be fixed
2013-06-12 12:43:27 -04:00
Martin Konecny 21c84dcaad CC-5227 - Sometimes Liquidsoap telnet is unresponsive which causes all Pypo threads to block
-restart Liquidsoap if communication fails..
2013-06-11 17:26:48 -04:00
Martin Konecny f164cf0ad4 CC-5227 - Sometimes Liquidsoap telnet is unresponsive which causes all Pypo threads to block
-initial commit
2013-06-11 15:55:17 -04:00
Martin Konecny 622a7e6ff3 CC-5212
Lucid: Installation is blocked because monit "restart" fails

fixed
2013-06-06 17:13:30 -04:00
Martin Konecny c7d0b6df92 CC-5204
Pypo: Updating stream settings will cause redundant pypopush

-fixed
2013-06-04 15:36:25 -04:00
Martin Konecny 905dd08ed5 Use proper unit conventions for Kilo 2013-05-31 15:59:20 -04:00
Martin Konecny 82a71fdb61 CC-5199
aacencplus encoder is very low quality
2013-05-31 15:59:04 -04:00
Martin Konecny bc22a8a871 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-30 14:02:13 -04:00
Martin Konecny 6fddabdd7c CC-5192
Pypo: Live Streaming in first show will block the next show's first track

-fixed. Was caused by clashing keys
2013-05-30 14:02:05 -04:00
Martin Konecny 1e9829e85c CC-5182
Liquidsoap: Sometime the tracks in schedule cannot be played
2013-05-28 18:06:23 -04:00
Martin Konecny 73a908055a Revert "CC-5123 Pypo: Redundant Pypopush happens after restart pypo service"
This reverts commit 4c3d2b20db.
2013-05-28 16:38:15 -04:00
Martin Konecny 176dd91e20 use proper parameters for earlier versions of 'timeout' command
-hide warning if older version of timeout doesn't support --version
2013-05-28 16:29:07 -04:00
Martin Konecny 3247c7288d use proper parameters for earlier versions of 'timeout' command
-small typo
2013-05-28 16:21:45 -04:00
Martin Konecny a4ca2deb0f use proper parameters for earlier versions of 'timeout' command
-lucid has timeout with incompatible parameters compared to newer
versions of ubuntu.
2013-05-28 16:18:29 -04:00
Martin Konecny 4c3d2b20db CC-5123 Pypo: Redundant Pypopush happens after restart pypo service
-if does not exist does not work on pre 5.2 monit version
2013-05-28 15:54:31 -04:00
Martin Konecny 66bb1f6d93 CC-5123 Pypo: Redundant Pypopush happens after restart pypo service
-added timeout so that monit doesn't try to start Liquidsoap while
it is already being restarted.
2013-05-28 15:48:15 -04:00
Martin Konecny 82c0fe1088 CC-5123
Pypo: Redundant Pypopush happens after restart pypo service

-added timeout so that monit doesn't try to start Liquidsoap while
it is already being restarted.
2013-05-28 15:24:26 -04:00
Martin Konecny 1130cf961c CC-5049: Error messages on Liquidsoap start up/shut down after Airtime install
-fixed
2013-05-27 13:41:36 -04:00
Martin Konecny ca37ec3aff CC-5049:
Error messages on Liquidsoap start up/shut down after Airtime install

Suppress global warning messages. Clients should decide whether to print
or not.
2013-05-23 17:17:00 -04:00
Martin Konecny 2a897414a4 make operators more local to each queue source
Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
2013-05-23 13:02:50 -04:00
Martin Konecny 5c11f5fc72 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
2013-05-22 18:08:14 -04:00
Martin Konecny 4e1dc6a86e make operators more local to each queue source 2013-05-22 18:07:12 -04:00
Martin Konecny 45e5d339a1 make more operators local to each source 2013-05-22 18:03:56 -04:00
Martin Konecny dc19d3f0b0 Merge branch '2.4.x' into 2.4.x-saas 2013-05-22 17:39:33 -04:00
Martin Konecny 36567c85cd create on_metadata callback for each source instead of once on unified source 2013-05-22 17:39:18 -04:00
Martin Konecny ab89b80b85 remove unnecessary install code for saas 2013-05-21 17:36:57 -04:00
Martin Konecny ab5639ef79 remove unnecessary install code for saas 2013-05-21 17:27:34 -04:00
Martin Konecny 3b9b23a7dd Merge branch '2.3.x-saas' into 2.4.x-saas
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/models/Schedule.php
	python_apps/pypo/airtime-playout
2013-05-21 16:40:10 -04:00
Martin Konecny 8e617b33de add ability to use id's with mksafe operator 2013-05-21 16:31:32 -04:00
Martin Konecny 76a02796b7 implement method stub 2013-05-17 12:16:04 -04:00
Martin Konecny d205b0dbd3 remove string literal 2013-05-17 12:14:33 -04:00
Martin Konecny 59785a952f make up for lack of 'total_seconds()' lib function for pre 2.7 version of python 2013-05-16 12:25:21 -04:00
Martin Konecny d2f29b1f88 more informative message to user about new init.d script behaviour 2013-05-16 12:08:32 -04:00
Martin Konecny 1ab27e3cf8 be more idiomatic 2013-05-15 17:18:42 -04:00
Martin Konecny 95bb5b2f36 CC-5153:
Cancel show won't cut off current song after airtime-playout is restarted

-fixed
2013-05-15 17:18:15 -04:00
Martin Konecny 80686b7063 add parameter parsing to airtime-liquidsoap script.
-Allow us to prevent running as daemon
2013-05-15 13:06:16 -04:00
Martin Konecny c693c4b015 remoe id's for mksafe (they aren't supported params) 2013-05-14 15:14:57 -04:00
Martin Konecny a59fc69d17 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-14 15:10:13 -04:00
Martin Konecny b3f0a2fcdd CC-5144:
SHOUTcast listener stats auth not working
2013-05-14 15:10:04 -04:00
Martin Konecny 298e5a9b77 better idenfication of which mksafe is being applied 2013-05-13 17:52:43 -04:00
Martin Konecny f5a0d0a9a4 CC-5123:
Pypo: Redundant Pypopush happens after restart pypo service

-was clearing the queue after fetching the schedule :S
2013-05-13 17:52:22 -04:00
Martin Konecny be465be9b2 CC-5133: Make sure Liquidsoap 1.1.1 is used
add missing file
2013-05-13 16:10:21 -04:00
Martin Konecny 85afe53c89 CC-5133: Make sure Liquidsoap 1.1.1 is used
fixed
2013-05-13 15:45:56 -04:00
Martin Konecny 28576adf42 disable liquidsoap's add operator normalizing audio 2013-05-10 23:19:54 -04:00
Martin Konecny 56b9d0580f CC-5071:
Better RabbitMQ passwords

-fixed
2013-05-08 15:25:30 -04:00
Martin Konecny f0e846db75 CC-5049: Error messages on Liquidsoap start up/shut down after Airtime install
fixed
2013-05-08 13:47:24 -04:00
Martin Konecny 3ae3c7e802 sanity check to warn if cue_out - cue_in != end - start 2013-05-07 15:05:14 -04:00
Martin Konecny 1895686c85 CC-5098: Liquidsoap: Restart liquidsoap will make the output stream silence until next song starts
-fixed
2013-05-06 16:39:17 -04:00
Martin Konecny 2fc4afef68 ensure a proper environment everytime we restart liquidsoap 2013-05-06 12:11:19 -04:00
Martin Konecny 2eaf81d366 ensure a proper environment everytime we restart liquidsoap 2013-05-06 12:08:57 -04:00
Martin Konecny 3a1048bdec ensure pypo registers with server before doing Liquidsoap check 2013-05-06 11:42:39 -04:00
Martin Konecny ec7eb5f264 CC-5094 Liquidsoap crash if unsupported encoder in the liq script
-keep up with liquidsoap changes
2013-05-04 14:11:21 -04:00
Martin Konecny fdcfc4d06c CC-5094
Liquidsoap crash if unsupported encoder in the liq script
2013-05-04 10:57:22 -04:00
Martin Konecny 6c42064c14 refactor methods into appropriate locations 2013-05-02 18:46:16 -04:00
Martin Konecny 84efb4a9b7 work around to work with annoying static methods - should remove these later.. 2013-05-02 17:59:03 -04:00
Martin Konecny 1e25d786ee Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-02 17:31:42 -04:00
Martin Konecny f2564cf732 temporarily disable opus + aac until liquidsoap binaries are ready 2013-05-02 16:09:04 -04:00
Martin Konecny 88ba36601f Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-01 00:37:26 -04:00
Martin Konecny 21bed91678 add brackets to force operator precedence 2013-04-26 15:56:48 -04:00
Martin Konecny 49d1755b52 fix incorrect merge 2013-04-26 13:58:44 -04:00
Martin Konecny 705329ee5d cleanup of unecessary code
-we shouldn't be loading config file multiple times.
2013-04-26 13:48:15 -04:00
Martin Konecny 628e075828 pypo syntax error 2013-04-26 11:35:52 -04:00
Martin Konecny 1158fc2c9e more legible comment 2013-04-25 22:38:06 -04:00
Martin Konecny ca86d6b68b fix potential out-of-bounds string index error 2013-04-25 22:36:21 -04:00