drigato 0a45de7fba Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas ...

Conflicts:
	.gitignore
	airtime_mvc/application/configs/airtime-conf.php
	airtime_mvc/application/configs/classmap-airtime-conf.php
	airtime_mvc/application/models/RabbitMq.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/application/models/airtime/map/CcShowInstancesTableMap.php
	airtime_mvc/application/models/airtime/map/CcShowTableMap.php
	airtime_mvc/application/models/airtime/om/BaseCcShow.php
	airtime_mvc/application/models/airtime/om/BaseCcShowInstances.php
	airtime_mvc/application/models/airtime/om/BaseCcShowInstancesPeer.php
	airtime_mvc/application/models/airtime/om/BaseCcShowInstancesQuery.php
	airtime_mvc/application/models/airtime/om/BaseCcShowPeer.php
	airtime_mvc/application/models/airtime/om/BaseCcShowQuery.php
	airtime_mvc/application/modules/rest/Bootstrap.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
	airtime_mvc/build/sql/schema.sql
	airtime_mvc/public/index.php

2014-11-03 12:29:58 -05:00

..

install

Merge branch '2.4.x' into 2.4.x-saas

2013-06-26 01:25:26 -04:00

liquidsoap_bin @ 492242f4bb

put apt-get args in correct location

2012-08-03 14:24:39 -04:00

liquidsoap_scripts

Merge branch 'cc-5709-airtime-analyzer' into saas

2014-07-15 16:46:20 -04:00

media

cc-5747 Replaygain: doesnt work for aac tracks

2014-03-20 13:02:37 -04:00

tests

CC-4905: Unit tests for Pypo

2013-01-31 17:45:57 -05:00

__init__.py

-add support for PyDev code analysis (need to make pypo directory a package)

2012-03-17 13:56:41 -04:00

airtime-liquidsoap

add parameter parsing to airtime-liquidsoap script.

2013-05-15 13:06:16 -04:00

airtime-liquidsoap-init-d

use proper parameters for earlier versions of 'timeout' command

2013-05-28 16:29:07 -04:00

airtime-playout

Merge branch '2.3.x-saas' into 2.4.x-saas

2013-05-21 16:40:10 -04:00

airtime-playout-init-d

CC-5049: Error messages on Liquidsoap start up/shut down after Airtime install

2013-05-27 13:41:36 -04:00

AUTHORS

fix worst offenders of > 80 character row length

2013-04-25 22:32:27 -04:00

cloud_storage_downloader.py

Commented cloud storage classes

2014-10-29 17:42:42 -04:00

eventtypes.py

CC-1469: Crossfading support (non-equal power)

2013-03-15 15:07:55 -04:00

LICENSE

CC-2016: Rearrange python scripts for reusability

2011-03-24 00:00:46 -04:00

listenerstat.py

Merge branch '2.5.x' into 2.5.x-saas

2014-02-05 17:35:59 -05:00

logging.cfg

CC-4032: pyponotify.py fails because not all files in /var/log/airtime/pypo are read/writable by pypo

2012-06-28 17:09:41 -04:00

monit-airtime-liquidsoap.cfg

CC-5123

2013-05-28 15:24:26 -04:00

monit-airtime-playout.cfg

fix pypo not auto restarting

2013-02-02 08:50:44 -05:00

monit-pre530-airtime-liquidsoap.cfg

CC-5212

2013-06-06 17:13:30 -04:00

notify_logging.cfg

CC-4032: pyponotify.py fails because not all files in

2012-06-28 17:17:36 -04:00

pure.py

make up for lack of 'total_seconds()' lib function for pre 2.7 version of python

2013-05-16 12:25:21 -04:00

pypo.cfg

CC-3664: setting of pypo.cfg -> cache_for does not take effect

2012-04-17 10:23:15 -04:00

pypocli.py

Merge branch '2.4.x' into 2.4.x-saas

2013-06-26 01:25:26 -04:00

pypofetch.py

CC-5935 - Added fix for insidious pypofetch bug causing dangling RabbitMQ channel

2014-10-30 17:41:00 -04:00

pypofile.py

Reverted pypo's copy file method to how it was without cloud files

2014-10-24 15:50:52 -04:00

pypoliqqueue.py

CC-5192

2013-05-30 14:02:05 -04:00

pypoliquidsoap.py

CC-5729: Pypo race condition on show source kick event kills playout

2014-03-11 18:01:29 -04:00

pypomessagehandler.py

cleanup of unecessary code

2013-04-25 22:11:26 -04:00

pyponotify.py

fix restart liquidsoap being sent as default no arguments for pypo-notify

2013-01-25 15:14:40 -05:00

pypopush.py

CC-5729: Pypo race condition on show source kick event kills playout

2014-03-11 18:01:29 -04:00

recorder.py

CC-5299 : Back to back record shows doesn't work with some devices

2013-10-15 14:31:06 -04:00

telnetliquidsoap.py

Use track metadata from Airtime in playout engine

2014-07-15 16:41:55 -04:00

testpypoliqqueue.py

CC-1469:

2013-03-14 16:50:55 -04:00

timeout.py

Double the pypo->liquidsoap timeout on second attempt if first attempt failed

2013-10-07 15:39:14 -04:00