Commit Graph

45 Commits

Author SHA1 Message Date
Martin Konecny f0342e9329 -remove some commented out code 2011-12-02 16:57:18 -05:00
martin 3a2eaecad8 Merge branch '1.9.1' into devel
Conflicts:
	python_apps/pypo/pypopush.py
2011-09-20 14:31:09 -04:00
martin b94004d7f4 CC-2847: Airtime doesn't resume playing audio after upgrade 2011-09-20 13:25:29 -04:00
martin 1555c83668 CC-2750: Ability to query health status for pypo, liquidsoap,
media monitor, and recorder
-cleanup
2011-09-13 17:20:34 -04:00
martin 2c2bb86698 CC-2750: Ability to query health status for pypo,
liquidsoap, media monitor, and recorder

-fixed rabbitmq not delivering messages
2011-09-13 14:56:24 -04:00
martin 0546633ac7 CC-2750:Ability to query health status for pypo, liquidsoap, media monitor, and recorder 2011-09-12 17:15:46 -04:00
martin 9c7bab616d Merge branch '1.9.1' into devel
Conflicts:
	VERSION
	airtime_mvc/application/configs/constants.php
	airtime_mvc/application/controllers/ScheduleController.php
	install_minimal/airtime-install
	install_minimal/include/AirtimeInstall.php
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
	python_apps/pypo/pypofetch.py
	python_apps/pypo/pypopush.py
2011-09-09 15:07:43 -04:00
martin ace98569ed CC-2783: Investigate Pypo taking 100% CPU on production system
-fixed
2011-09-09 14:11:56 -04:00
martin 6dab211a12 CC-2784: Stopping rabbitmq-server causes pypo CPU usage to increase dramatically
-fixed
2011-09-08 12:17:42 -04:00
martin 03efb8f293 CC-2760: Remove shebangs from files that don't need them, fix chmod of files
-done
2011-09-06 19:06:13 -04:00
James 39b688c256 CC-2661: Uptrade script for stream config feature
- codes for conserving user's liquidsoap.cfg and porting into new stream
setting config.
- extra fix: fixed a bug with shoutcast(default value has to be set for
some variables)
2011-09-01 16:02:06 -04:00
James 17e7e9b80a CC-2089: create "cancel show" command for pypo
- removed comments
2011-08-31 16:33:40 -04:00
James cab2a0f8f4 CC-2661: Upgrade script for steam config feature
- done
2011-08-29 17:44:28 -04:00
James 83bba9532e CC-2089: create "cancel show" command for pypo
- done
2011-08-29 11:54:44 -04:00
james d992457bd5 CC-2607: handling comment
- each line read is trimed now
- xtra bug fixed:
- bug on merging with 1.9.3
- state_change_restart array is filled with info for displaying
purpose
2011-08-26 13:13:02 -04:00
james 56ad8c6b3d Merge branch '1.9.1' into devel
Conflicts:
	VERSION
	airtime_mvc/application/configs/constants.php
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
	python_apps/pypo/pypofetch.py
2011-08-26 12:56:10 -04:00
James 14e1e15830 CC-2733: Resume play is broken: mp3 files skipped
- killing old pypo and liquidsoap processes
- comparing mime type againt old type of mime
2011-08-25 16:32:57 -04:00
James 58837ff89b CC-2706: Streams should have a username field
- adding "User" field on stream setting form
- change key name from "output_s1" to "s1_output" format to be consistent
- changed order of inserting in default.sql file
- hiding username field on shoutcast selection
- liquidsoap and pypo takes care of user field input
2011-08-24 17:13:56 -04:00
James 88d3fa73be CC-2721: Pypo doesn't restart when it gets new stream setting
- fixed
2011-08-23 11:13:06 -04:00
James 078aa1d05d CC-2607: Handling comments
- It handles comment lines
- adding warning text telling not to edit liquidsoap.cfg file
2011-08-23 10:12:18 -04:00
James 38256de606 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-08-18 13:54:17 -04:00
James cf55e92aa3 CC-2607: Ability to adjust stream bitrate, type, etc from UI
- removed debug code from NowPlayingController
- New Form for streamsetting
- Action created in PreferenceController
2011-08-18 13:53:12 -04:00
martin 57834097e8 -remove unneeded -dev packages from install
-remove timezone check from pypo-fetch
2011-08-17 15:50:28 -04:00
martin 03f8163764 cc-2682: not using pypo time
-Remove messages being sent to pypo to change its timezone
-fix time conversion bug in pypo-push
2011-08-16 15:07:55 -04:00
martin 61e1c56244 cc-2683-not-using-utc-time
-pypo now works in UTC time
2011-08-16 15:07:54 -04:00
James 4f2b2dba6d CC-2607: Abilitiy to adjust stream bitrate, type, etc from the UI
interface

- dummy page "Stream Setting" page for the test
- StreamSetting model is added
- set owner and group as 'pypo' for liquidsoap.cfg
- pypofech handle 'update_stream_setting' command
2011-08-15 16:10:46 -04:00
martin b538f1cc82 CC-1942: Add ability to set timezone in preferences
-change timezone in python
2011-08-15 10:06:42 -04:00
James 1c81d0d238 CC-2631: Convert pypo to accept commands from RabbitMQ
- initial commit
2011-08-11 16:20:20 -04:00
martin bbabdcda67 -remove CueFile imports. 2011-07-19 17:16:42 -04:00
James cef2361bc2 - removed cue_file because it's handled by liquidsoap itself. 2011-07-19 16:31:02 -04:00
martin 49c399b7a8 -small code cleanup.. 2011-07-12 17:39:15 -04:00
martin ec6db96025 cc-2015: on reboot resume show
-use native capabilities of liquidsoap cue-in cue-out
 for song cue-in/cue-out
2011-06-16 18:59:15 -04:00
martin e90e6d7c12 cc-2015: on reboot resume show
-liquidsoap is having some problems with cue points right now
 need to check if this is my fault.
2011-06-16 13:26:37 -04:00
martin e5ed11ee51 cc-2015: on reboot resume show
-removed cue file from pypo responibility
2011-06-16 13:26:37 -04:00
martin 0d13b9013b cc-2015: on reboot resume show
-calculating the amount of seconds since track began complete
2011-06-16 13:26:36 -04:00
martin 12ae5a289f cc-2015: on reboot resume show 2011-06-16 13:26:36 -04:00
martin 8d3b99e440 cc-2055: switch to init.d
-fixed pypo hanging if it was started before rabbitmq.
2011-06-08 14:26:19 -04:00
martin 6ab5ac4582 cc-2055: switch to init.d
-allow install script to be created from any location (no hardcoded paths)
-make python install scripts return 1 on error
-daemon now started automatically on boot using rc.local autostart
-change all prints to logs instead
-create airtime-uninstall shell script (and remove pypo user in here)
-create pypo user in shell script
2011-06-02 18:07:48 -04:00
martin 33b24b581c CC-2175: Overbooking: Cut off shows when they are done
-fixed
2011-04-14 00:20:19 -04:00
martin 2148de0e92 CC-2149: Adjustments for DEB packaging
-Done
2011-04-13 12:07:00 -04:00
martin eb74c5718f Merge branch 'master' of dev.sourcefabric.org:airtime
Conflicts:
	python_apps/api_clients/api_client.py
2011-03-29 18:35:57 -04:00
martin 2702363a33 -CC-2044: remove hardcoded settings from application/configs/conf.php
-rearranged some stuff...some bugs still to go
2011-03-29 18:32:53 -04:00
Paul Baranowski 9ebe7ec1ca Better error message when timezones dont match up between pypo and airtime. 2011-03-29 17:31:22 -04:00
martin 161505a6df CC-2044: remove hardcoded settings from application/configs/conf.php
-refactored some code to begin work on this...
2011-03-29 16:10:00 -04:00
martin 5c8719d90c CC-2016: Rearrange python scripts for reusability
-moved files
2011-03-24 00:00:46 -04:00