Commit Graph

1846 Commits

Author SHA1 Message Date
Martin Konecny 9f3e1d61d1 Use proper unit conventions for Kilo 2013-06-07 11:17:35 -04:00
Martin Konecny eeb73b7206 CC-5199
aacencplus encoder is very low quality
2013-06-07 11:17:35 -04:00
denise 586bdf99e9 Merge branch '2.4.x'
Conflicts:
	python_apps/pypo/pypopush.py
	python_apps/pypo/schedule/pypofetch.py
	python_apps/pypo/schedule/pypofile.py
	python_apps/pypo/schedule/pypoliqqueue.py
2013-05-30 15:21:32 -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
Naomi 6b12dcdc2a Merge branch '2.4.x' 2013-05-27 14:46:48 -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 b0eda6e915 Merge branch '2.4.x'
Conflicts:
	airtime_mvc/public/js/airtime/preferences/streamsetting.js
	python_apps/pypo/pypocli.py
	python_apps/pypo/schedule/telnetliquidsoap.py
2013-05-22 12:07:08 -04:00
Martin Konecny 8e617b33de add ability to use id's with mksafe operator 2013-05-21 16:31:32 -04:00
Martin Konecny d86edd43ab fix reference to non-existent var 2013-05-21 12:58:19 -04:00
Martin Konecny 46364bec44 fix reference to non-existent var 2013-05-17 14:54:23 -04:00
Martin Konecny e4b6eef22d remove unecessary backslashes 2013-05-17 14:52:49 -04:00
Martin Konecny bda22baf0c fix playout not working
-silly mistake due to inf recursion
2013-05-17 14:00:09 -04:00
Martin Konecny 85b73706dc stricter error checking when adding to queues 2013-05-17 12:18:29 -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 19506fb8c2 remove hard-coded string 2013-05-17 11:55:51 -04:00
Martin Konecny 9165ddc0ec more DRY code. also use "with" instead of try/except 2013-05-17 11:55:14 -04:00
Martin Konecny e51e046dd0 more lintian fixes
-mostly lines with length > 79
2013-05-16 17:37:01 -04:00
Martin Konecny d0a0487840 clean up some pylint warnings
-silly copy paste error
2013-05-16 17:12:21 -04:00
Martin Konecny 36462b6dc9 clean up some pylint warnings 2013-05-16 17:05:37 -04:00
Martin Konecny 060980d8c6 Ensure only telnetliquidsoap has telnet responsibilities
-also added module docstrings
2013-05-16 16:19:00 -04:00
Martin Konecny 888e6db812 more structural organization of files/packages 2013-05-16 13:41:56 -04:00
Martin Konecny 1c87d51b8e Major reorganization of the pypo directory.
Much better organization of files into packages
2013-05-16 13:22:15 -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 8545803dbf CC-5126: Media Monitor: Exception happens when cuein value is 00:00:00
-slightly better way of not writing cue-in/cue-out
2013-05-15 13:19:29 -04:00
Martin Konecny 4a82fe2e52 Revert "CC-5126: Media Monitor: Exception happens when cuein value is 00:00:00"
This reverts commit 9ad42b2b2c.
2013-05-15 13:13:37 -04:00
Martin Konecny ba3703b556 Revert "CC-5126:"
This reverts commit a2b500729c.
2013-05-15 13:10:56 -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 9ad42b2b2c CC-5126: Media Monitor: Exception happens when cuein value is 00:00:00
-also removed functions that query for cue-in/cue-out,
since we don't care about these.
2013-05-14 22:26:48 -04:00
Martin Konecny a2b500729c CC-5126:
Media Monitor: Exception happens when cuein value is 00:00:00

-fixed this be ensuring we're not writing cue-in/out values to the file.
This should never have been allowed.
2013-05-14 22:16:30 -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