Commit Graph

475 Commits

Author SHA1 Message Date
james f4b9774b08 CC-3535: PypoFetch: make disconnect_source() and switch_source() static method
- done
2012-03-28 09:39:46 -04:00
Martin Konecny 24262d5ed5 cc-3521: remove 2 second delay 2012-03-27 15:34:56 -04:00
Martin Konecny 654ff76ea4 CC-3399: Use VBR instead of CBR for Vorbis (OGG) audio streams
-Done
2012-03-27 15:33:44 -04:00
Martin Konecny d83267e6dc -remove crossfade function from ls scripts since it wasn't doing anything. 2012-03-27 15:16:58 -04:00
James f41ebbe7a7 CC-3521: Live Stream: Remove 2 second scilence when transition happens
- reduced the blank duration to 0.1 sec
2012-03-26 18:56:28 -04:00
James 0bdfa74566 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-26 18:39:24 -04:00
Martin Konecny d7af91f306 CC-3520: Change default password of monit
-done
2012-03-26 17:59:44 -04:00
James ef801c7a10 CC-3484: Pypo: On bootup, it should grab station name and stream label
for liquidsoap

- fixed
2012-03-26 17:44:07 -04:00
James aba89824f0 CC-3490: liquidsoap_prepare_terminate.py is not using python virtual env
- fixed
2012-03-26 15:42:00 -04:00
Martin Konecny 269096b9e8 cc-3476: detect if Liquidsoap is not playing something when it should and fix it 2012-03-26 14:33:33 -04:00
Martin Konecny 1a4e6c563b cc-3476: dynamic timeout 2012-03-26 14:33:33 -04:00
Martin Konecny c301cd5256 cc-3476: dynamic timeout 2012-03-26 14:33:33 -04:00
Martin Konecny 2070de03ce cc-3476-dynamic-timeout
-finally found a way to make this simple
2012-03-26 14:33:33 -04:00
Martin Konecny a013e3b4d0 cc-3476: use dynamic timeouts in pypo 2012-03-26 14:33:33 -04:00
James b4e9f9699c CC-3483: Live Stream: default fade in/out for live stream transition
- take care of bootstrap of pypo
2012-03-20 22:29:52 -04:00
James 6b768c2f99 CC-3483: Live Stream: default fade in/out for live stream transition
- done. changing fade value doesn't require LS to restart
2012-03-20 22:16:17 -04:00
James d4142f8b8b CC-3484: Pypo: On bootup, it should grab station name and stream
label for liquidsoap

- fixed
- created new function set_bootstrap_variables()
2012-03-20 16:41:15 -04:00
Martin Konecny 6166d1d590 -updated comment in pypofetch 2012-03-18 00:38:39 -04:00
Martin Konecny d35332e0ba CC-3371: Don't pause 2 seconds between checking queue in pypo-push
-Done
2012-03-18 00:33:22 -04:00
Martin Konecny 22cc362f1c CC-3448: Cancel show shouldn't send "cancel show" msg to pypo anymore
-done
2012-03-17 23:51:58 -04:00
Martin Konecny 73eb691be2 -some cases where pypo-notify is still writing to pypo.log instead of notify.log 2012-03-17 14:16:54 -04:00
Martin Konecny 7a7eb02de5 -fix errors pointed out by pydev code completion 2012-03-17 14:16:11 -04:00
Martin Konecny db4c916d9a -add support for PyDev code analysis (need to make pypo directory a package) 2012-03-17 13:56:41 -04:00
Martin Konecny 903698efc5 CC-3470: Smarter way for pypo to recover when it should be playing something.
-fixed
2012-03-17 13:55:56 -04:00
Martin Konecny 6634e9f663 cc-3447: synchronize access to liquidsoap via telnet
-add another critical section
2012-03-16 20:47:46 -04:00
Martin Konecny c8c9e46228 cc-3447: pypo telnet class 2012-03-16 20:41:50 -04:00
Martin Konecny 4d96a16cbe -comment out unused function in pypo-fetch 2012-03-16 20:39:49 -04:00
Martin Konecny 067cd1280a -remove some annoying logging info from pypopush 2012-03-16 00:49:08 -04:00
Martin Konecny 79964186ed CC-3462: If destination file already exists in pypo cache, double...
-done
2012-03-16 00:48:39 -04:00
Martin Konecny cca3995dba cc-2675: edit ongoing show
-almost there?
2012-03-14 15:37:04 -04:00
Martin Konecny 217be89766 cc-2675: Edit ongoing show
-progress being made
2012-03-14 15:37:04 -04:00
Martin Konecny 1d1405f7fd CC-2675: Edit ongoing show
-initial commit
2012-03-14 15:37:04 -04:00
James c5c9fd7ba8 CC-3430: Live Stream: Admin should be able to kick out the source connection
- Clicking a button on UI triggers sending msg to pypo, which will lead running
'kick' command in liquidsoap.
2012-03-14 14:43:11 -04:00
James 2ee4b227fc CC-3439: Live Stream: Only admin should be able to turn on/of switch and
able to see kick out button

- done
2012-03-14 14:43:11 -04:00
James 3c6aff093e CC-3437: Live Stream: Liquidsoap(Pypo) should preserve the last switch status
when it restarts.

- Pypo contacts airtime on bootup and ask what the last switch status was
2012-03-14 14:43:10 -04:00
James 4eefc05366 CC-3427: Live Stream: Ability to switch off Scheduled Play
- done
2012-03-14 14:43:10 -04:00
James 68fa46f017 CC-3415: Live Stream: Disconnect all input.harbor connections before
terminating the process

- call prepare termiate on monit-restart()
2012-03-14 14:43:10 -04:00
James cde6db812f CC-3415: Live Stream: Disconnect all input.harbor connections before
terminating the process

- Modified init.d script. init.d script calls liquidsoap_prepare_terminate.py
2012-03-14 14:43:10 -04:00
James f193047a1c CC-3367: Display in Now Playing whether Live DJ stream and Live Master stream
are connected and give user the ability to block those streams

- added stream source switch interface
- backend code
2012-03-14 14:43:10 -04:00
James d4a387e113 - adding switch to liquidsoap 2012-03-14 14:41:00 -04:00
James dfe87723f0 - bug fix in stream setting
- testing lisquidsoap
2012-03-14 14:41:00 -04:00
James 128a497059 CC-3224: "On-the-fly" stream rebroadcasting
- frond-end implementation for master dj and live dj
- db implementation
- liquidsoap is broken on this commit
2012-03-14 14:41:00 -04:00
James 1ebe3d1812 CC-3224: "On-the-fly" stream rebroadcasting
- Live source is created when only both port and mount point are specified
2012-03-14 14:41:00 -04:00
James 30901aa0d6 CC-3224: "On-the-fly" stream rebroadcasting
- A section where user can setup port and mount point for harbor input in
stream setting page(front-end and back-end)
- updated the part where it rewrites the liquidsoap.cfg file
2012-03-14 14:41:00 -04:00
James 48bb19d758 CC-3224: "On-the-fly" stream rebroadcasting
- web interface
- auth script for liquidsoap
- DB changes
2012-03-14 14:41:00 -04:00
James ca04a7a686 CC-3224: "On-the-fly" stream rebroadcasting
- Form in preference section
2012-03-14 14:41:00 -04:00
Martin Konecny 1dc9f51c47 CC-3411: pypo-notify should write to its own log
-done
2012-03-13 16:53:10 -04:00
Martin Konecny 6f270bfb3d Merge branch '2.0.x' into devel
Conflicts:
	VERSION
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/Show.php
	airtime_mvc/public/js/airtime/dashboard/helperfunctions.js
	install_minimal/include/airtime-constants.php
	python_apps/api_clients/api_client.py
	python_apps/pypo/pypocli.py
	python_apps/pypo/pypofetch.py
2012-03-12 17:52:17 -04:00
Naomi Aro b58e948825 CC-733 : adding extra error messages 2012-03-09 11:28:43 +01:00
Martin Konecny 9715de11f5 CC-3372: Improved pypo cache delete
-Done
2012-03-05 19:02:46 -05:00
Martin Konecny 249b743dd1 CC-3384: Pypo On-Air is off and streaming is not playing on every other songs in a show.
-temporary solution to make sure we don't push same song multiple times.
2012-03-05 16:09:17 -05:00
Martin Konecny a4f528021f CC-3384: Pypo On-Air is off and streaming is not playing on every other songs in a show.
-fixed, but there is another small problem
2012-03-05 16:01:58 -05:00
Martin Konecny c353009d39 CC-3377: Airtime 2.0.2 install fails for ubuntu 11.10
-user binary_path var
2012-03-02 18:41:03 -05:00
Martin Konecny 82812e15a5 CC-3377: Airtime 2.0.2 install fails for ubuntu 11.10
-should be fixed
2012-03-02 11:45:27 -05:00
Martin Konecny d03d01bce9 CC-3366: Pypo: Use local files instead of downloading them
-done
2012-03-01 18:00:46 -05:00
Martin Konecny 92f19139b9 CC-3336: Refactor schedule API used by pypo
-done
2012-02-29 21:27:42 -05:00
Martin Konecny a6413f2d1a CC-3336: Refactor schedule API used by pypo 2012-02-28 22:33:19 -05:00
Martin Konecny 497715df44 Merge branch 'cc-3336-refactor-pypo' of dev.sourcefabric.org:airtime into cc-3336-refactor-pypo
Conflicts:
	airtime_mvc/application/models/Schedule.php
	python_apps/pypo/pypofetch.py
	python_apps/pypo/pypopush.py
2012-02-28 19:22:13 -05:00
Martin Konecny b572b26b68 CC-3336: Refactor schedule API used by pypo
-make sure that empty arrays are objects and not arrays
-clean up some comments
2012-02-28 15:32:18 -05:00
Martin Konecny 1d02c56874 CC-3336: Refactor schedule API used by pypo
-refactored pypo-push
2012-02-28 15:04:24 -05:00
Martin Konecny 11f31effca CC-3336: Refactor schedule API used by pypo 2012-02-28 15:04:24 -05:00
Martin Konecny 99c24ed038 CC-3336: Refactor schedule API used by pypo
-removed export_source
-rewrote GetScheduledPlaylists()
2012-02-28 14:52:44 -05:00
James d8f7cce56e CC-3346: Recorder will not record shows if calendar is not touched 2
hours before the recorder starts

- apiclient should log to correct log file.
2012-02-28 14:45:33 -05:00
James d4cdac505a CC-3346: Recorder: Merge recorder with pypo
- fixed log message
2012-02-28 14:45:18 -05:00
James 5aabe89069 CC-3346: Recorder: Merge recorder with pypo
- separated rabitMQ listener part out from pypoFetch and created
pypomessagehandler.py

Conflicts:

	python_apps/pypo/pypofetch.py
2012-02-28 14:44:39 -05:00
james 91ef7f7669 CC-3346: Recorder: Merge recorder with pypo
- function parse_show was renamed to process_recorder_schedule
- using thread on self.process_schedule call
2012-02-28 14:42:43 -05:00
Martin Konecny 413d669bbf Merge branch 'cc-3336-refactor-pypo' of dev.sourcefabric.org:airtime into cc-3336-refactor-pypo
Conflicts:
	airtime_mvc/application/models/Schedule.php
	python_apps/pypo/pypofetch.py
	python_apps/pypo/pypopush.py

-weird conflict. I must have committed while I had my changes git-stash'ed
2012-02-28 13:58:10 -05:00
Martin Konecny 39fac2f88a CC-3336: Refactor schedule API used by pypo
-refactored pypo-push
2012-02-28 11:06:31 -05:00
James ba828a28bc CC-3346: Recorder will not record shows if calendar is not touched 2
hours before the recorder starts

- apiclient should log to correct log file.
2012-02-28 10:00:43 -05:00
James 33b6c2a390 CC-3346: Recorder: Merge recorder with pypo
- fixed log message
2012-02-27 18:09:07 -05:00
James f030cf4f67 CC-3346: Recorder: Merge recorder with pypo
- separated rabitMQ listener part out from pypoFetch and created
pypomessagehandler.py
2012-02-27 16:18:10 -05:00
Martin Konecny e8f329aef1 CC-3336: Refactor schedule API used by pypo 2012-02-27 13:52:35 -05:00
james 38c16df138 CC-3346: Recorder: Merge recorder with pypo
- function parse_show was renamed to process_recorder_schedule
- using thread on self.process_schedule call
2012-02-25 09:44:33 -05:00
James 446233fbd4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-02-24 14:15:06 -05:00
James f92c425890 CC-3345: Enter unusable state when liquidsoap value has an '='
character in it.

- fixed
2012-02-24 14:14:42 -05:00
James 2f689ed583 CC-3346: Recorder: Merge recorder with pypo
- Pypo fech works as msg listner for recroder now.
- recorder is part of pypo and all it does is waiting for msg from pypo
fetch and spwan a show recorder thread.
- added new parameter logger to api client. This way apiclient will log
into specific log file instead of grabbing current log file.
- show recoder is removed from all check system/status page
2012-02-24 14:11:35 -05:00
James 06c825479b CC-3345: Enter unusable state when liquidsoap value has an '='
character in it.

- fixed
2012-02-24 14:10:27 -05:00
James 695535ae64 CC-3346: Recorder: Merge recorder with pypo
- Pypo fech works as msg listner for recroder now.
- recorder is part of pypo and all it does is waiting for msg from pypo
fetch and spwan a show recorder thread.
- added new parameter logger to api client. This way apiclient will log
into specific log file instead of grabbing current log file.
- show recoder is removed from all check system/status page
2012-02-24 13:12:50 -05:00
Paul Baranowski ca535ea763 Removed OBP refs and code. 2012-02-23 16:08:16 -05:00
Martin Konecny c433b08158 CC-3336: Refactor schedule API used by pypo
-removed export_source
-rewrote GetScheduledPlaylists()
2012-02-23 15:20:25 -05:00
Martin Konecny da012af6ed CC-3336: Refactor schedule API used by pypo
-removed export_source
-rewrote GetScheduledPlaylists()
2012-02-22 20:41:24 -05:00
Martin Konecny 54f81ca5de CC-3342: Pypo: if a user doesn't update anything on calendar for 24 hrs, it could cause a problem.
-make it so that we cannot use all CPU if spinning in while loop
-remove Message Acknowledge exception
2012-02-22 19:23:48 -05:00
Martin Konecny d5a8f63d36 CC-3342: Pypo: if a user doesn't update anything on calendar for 24 hrs, it could cause a problem.
-fixed
2012-02-22 17:56:17 -05:00
Martin Konecny 5862324da9 CC-3326: Make /etc/monit/conf.d is empty of any old Airtime files before upgrading!
-fixed
2012-02-14 09:37:20 -05:00
Martin Konecny 0424a7f1d1 -We don't want any of our python services running at install time. Disable them early on. 2012-02-12 11:44:23 -05:00
Martin Konecny 885572b36d CC-3321: Multiple messages are sent to Pypo via RabbitMq at one time, causing multiple telnet connections to Liquidsoap.
-Fixed
2012-02-11 23:53:43 -05:00
Martin Konecny eadf68cb61 CC-3318: When changing stream settings (Liquidsoap + Pypo restart), sometimes Airtime does not resume playback
-fixed
2012-02-10 18:43:40 -05:00
Martin Konecny 33b594c39a CC-3318: When changing stream settings (Liquidsoap + Pypo restart), sometimes Airtime does not resume playback
-syntax error
2012-02-10 14:58:48 -05:00
Martin Konecny ccb942838a CC-3318: When changing stream settings (Liquidsoap + Pypo restart), sometimes Airtime does not resume playback
-initial commit
2012-02-10 14:53:22 -05:00
Martin Konecny 58b4576ae1 CC-3297: Depend on zendframework and php-pear as external packages
-DB dependency should now be externalized
2012-02-06 14:18:03 -05:00
Martin Konecny 6215eb0dba -fix upgrade for large result sets. 2012-01-25 05:01:56 -05:00
James 438340ff9a CC-3266: Pypo: pypopush will perfom better if it only process the
lastest msg from the rabbitMQ queue

- done
2012-01-18 17:52:09 -05:00
Martin Konecny b2a9abe3ef CC-3231: Tracks are still playing after a show ends
-fixed
2012-01-09 17:46:42 -05:00
james 9216da7f03 Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x 2011-12-24 11:03:02 -05:00
james c9c6a08a1c CC-3220: Stream Setting: Status box is stuck on waiting if nothing is
changed and click save

- done
- liquidsoap_update_error and liquidsoap_update_connection functions are
combined into one function, liquidsoap_update_status, in various place
- created various telnet commands in liquidsoap( connection check for each
stream, connection status for all streams)
- In liquidsoap, shoutcast stream doesn't use default id. It is more
informative by using id with "shoutcast_stream_#{stream_number}
2011-12-24 10:59:09 -05:00
Martin Konecny 00a05e146b CC-3222: Add option to disable auto starting Airtime services (after install and after system restart)
-Done
2011-12-23 15:53:30 -05:00
James 579484a91c Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x 2011-12-15 16:10:42 -05:00
James 22b2b466e5 CC-3207: Exception 'latin-1' codec can't encode character u'\u2013' in
position 32: ordinal not in range(256)

- fixed
2011-12-15 16:09:58 -05:00
Martin Konecny 7d60530312 CC-3206: Add ability to do Airtime upgrade without restarting liquidsoap
-done
2011-12-15 11:22:22 -05:00
Martin Konecny 76fac6fbef CC-3206: Add ability to do Airtime upgrade without restarting liquidsoap
-done
2011-12-15 11:16:14 -05:00
James 8463262190 CC-3169: Default liquidsoap.cfg file is missing sX_user
- fixed
2011-12-07 11:31:21 -05:00
Martin Konecny 21643a3734 SAAS-56: RabbitMQ virtual host support
-Add support for specifying vhost in config files
2011-12-05 21:05:28 -05:00
Martin Konecny b8e1884583 CC-3155: Show doesn't resume playback on system crash / restarting pypo
-fixed
2011-12-02 17:28:57 -05:00
Martin Konecny f0342e9329 -remove some commented out code 2011-12-02 16:57:18 -05:00
Martin Konecny cbc2ba660f CC-3074: Give users the choice of which hardware sound API they wish to use (instead of hardcoded to ALSA)
-done
2011-12-02 13:39:16 -05:00
Martin Konecny 6bcd96db88 CC-3133: Enabling hardware audio output causes all playout to fail with Portaudio error in write_stream: Output underflowed
-should be fixed
2011-12-02 13:39:16 -05:00
James 043f0c29a1 CC-3074: Give users the choice of which hardware sound API they wish to
use (instead of hardcoded to ALSA)

- finished everything except LS part(including upgrade and UI)
2011-12-02 13:39:14 -05:00
Martin Konecny c48154ef2f SAAS-83: Add ability to install Airtime components separately
-fixed
2011-11-30 17:59:00 -05:00
James 48d9d2d93b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-29 20:16:01 -05:00
James 9c65bfeba7 CC-3131: Latency of stream authentication warning in Stream Settings page
- it compares boot time of liquidsoap and the time user clicks on "Save"
on stream setting page. The status only gets updated if the
"boot_time" > "user update time"
- as soon as a user click on save, status is set to "wating"
- since there is no timing issue, quering interval is reduced to 1 sec
2011-11-29 20:15:38 -05:00
Yuchen Wang 53aecd1c00 CC-3130: Disabling a Shoutcast stream causes the service type to revert back to Icecast
This happens because we use same field in the db to store whether stream is disabled, and which
type is it (Icecast/Shoutcast). Thus when we disable a stream, we forget about the fact that
it was set to Shoutcast before.

Fixed by separating out the enable/disable state from stream type.
Whether a stream is enabled/disabled is stored in new fields sx_enable.
Stream type is stored in the old fields, sx_output.
2011-11-29 16:25:30 -05:00
Martin Konecny 15a27526f9 SAAS-83: Add ability to install Airtime components separately
-fixed
2011-11-24 18:10:06 -05:00
martin 4c388f0a1a CC-3056: Liquidsoap binaries not working on Ubuntu Maverick
-compiled all liquidsoap binaries
2011-11-18 18:45:37 -05:00
Martin Konecny 34252d680a CC-3056: Liquidsoap binaries not working on Ubuntu Maverick
-use absolute paths since the testing scripts need this.
2011-11-18 15:50:21 -05:00
Martin Konecny 7b872fa89b CC-3056: Liquidsoap binaries not working on Ubuntu Maverick
-better messages at install time
2011-11-18 15:17:30 -05:00
James 6b7d7646c9 CC-3062: Stream Setting: Status box is not working for shoutcast
- fixed. added on_error and on_connect callback to shoutcast()
2011-11-18 11:18:35 -05:00
Martin Konecny 84e2fff36e CC-3058: Extranenous string during install process
-fixed
2011-11-17 18:15:27 -05:00
Martin Konecny 7a9e53fa04 CC-3040: Debian Squeeze requires the Liquidsoap natty binary instead of the generic one
-done
2011-11-14 14:12:12 -05:00
Martin Konecny c3429cbe2a CC-2952: Put in final Liquidsoap 1.0 binaries
-set binaries to executable
2011-11-14 13:08:26 -05:00
Martin Konecny 9270ff01a2 CC-2952: Put in final Liquidsoap 1.0 binaries
-Done
2011-11-10 23:55:15 -05:00
Martin Konecny 38a0f8697a CC-2758: Make airtime-install script Debian/Ubuntu compatible
-cleanup
2011-11-01 22:43:12 -04:00
martin f2ef006385 CC-2758: Make airtime-install script Debian/Ubuntu compatible
-cosmetic changes
2011-11-01 15:21:09 -04:00
Martin Konecny fccaa554f5 CC-2758: Make airtime-install script Debian/Ubuntu compatible
-further tweaks
2011-10-28 17:24:38 -04:00
Martin Konecny 56edfe4e68 CC-2758: Make airtime-install script Debian/Ubuntu compatible
-uninstall script added
2011-10-28 12:35:58 -04:00
Martin Konecny b25b0c7ea0 CC-2758: Make airtime-install script Debian/Ubuntu compatible
-rename old files
2011-10-27 16:16:36 -04:00
Martin Konecny 87970740a0 CC-2758: Make airtime-install script Debian/Ubuntu compatible
-install complete
2011-10-27 15:53:54 -04:00
Martin Konecny cf4f151302 CC-2758: Make airtime-install script Debian/Ubuntu compatible
-fixes
2011-10-27 15:22:35 -04:00
Martin Konecny 8cafc52cad CC-2758: Make airtime-install script Debian/Ubuntu compatible
-initial commit
2011-10-27 14:01:59 -04:00
James efbd2f53d0 CC-2745: Show status of liquidsoap/icecast connection on Stream
Settings page

- temp commit
2011-10-11 14:40:30 -04:00
James d8c6b722ac Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-11 10:00:39 -04:00
Martin Konecny 8fe10830d5 -fixed on-air light not working. 2011-10-11 13:36:07 +02:00
james d3833f9a32 CC-2745: Show status of liquidsoap/icecast connection on Stream Settings
page

- initial commit
2011-10-10 20:14:27 -04:00
Martin Konecny ffeeabc7c9 -need to install natty liquidsoap binary for oneiric 2011-10-09 02:29:16 -04:00
martin 8d5efd7752 -update liquidsoap to pre-release 1.0 version 2011-10-05 11:44:44 -04:00
martin b0f6f1e39b CC-2925: Airtime scripts broken with Liquidsoap 1.0 pre-release
-fixed
-also updated the liquidsoap library scripts
2011-10-04 13:50:03 -04:00
martin eb549fe71a CC-2897: Liquidsoap doesn't start when no streams are enabled
-fixed
2011-09-28 13:53:11 -04:00
martin 1cbc098e91 CC-2750: Ability to query health status for pypo, liquidsoap, media monitor, and recorder 2011-09-28 12:15:13 -04:00
martin 974612badf CC-2888: Create a monit file for each airtime component 2011-09-26 14:40:26 -04:00
martin 5cc7de95ee CC-2833: Use ClassLoaders for PHP Files
-Done for class User
2011-09-23 17:00:55 -04:00
martin ee1a173953 CC-2850: Liquidsoap doesn't rotate its log files in Airtime
-fixed
-also noticed files were being chmod'd to 755, which is unnecessary. Also fixed.
2011-09-23 12:23:33 -04:00
martin 9bb901945e CC-2833: Use ClassLoaders for PHP Files
-shows.php
2011-09-23 10:54:20 -04:00
martin 5d7b51dafc CC-2833: Use ClassLoaders for PHP Files 2011-09-22 18:24:54 -04: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 3601f37904 CC-2846: On crash recovery, Pypo pushes playlists up to 5 times to Liquidsoap.
-fixed
2011-09-20 12:44:48 -04:00
martin 15f91ca0e1 CC-2838: Character encoding errors with telnet'ing show name to Liquidsoap
-enforce UTF-8
2011-09-18 19:39:36 -04:00
martin 904c53c449 Merge branch '1.9.1' into devel
Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
2011-09-18 19:34:45 -04:00
martin 0e503517f5 CC-2838: Character encoding errors with telnet'ing
show name to Liquidsoap

-fixed
2011-09-18 19:32:39 -04:00
martin 3485b5a39f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-09-16 17:53:37 -04:00
martin 659e412eb7 CC-2750: Ability to query health status for pypo, liquidsoap, media monitor, and recorder
-progress being made
2011-09-16 17:51:28 -04:00
James 7c94734277 CC-2810: More chmnod fixes for scripts
- removed shebang from .py files
- removed cron folder and its content as we don't use them
- .js files are from 3rd party(datatable) so we should leave them as they are
2011-09-16 14:01:23 -04:00
martin b5684bb5b1 Merge branch '1.9.1' into devel
Conflicts:
	install_full/ubuntu/airtime-full-install
	utils/airtime-update-db-settings.py
2011-09-15 17:44:07 -04:00
James c15d599dba CC-2827: Python shebangs should specify the version python2.6
- done
2011-09-15 12:28:31 -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 f1c77845ea CC-2783: Investigate Pypo taking 100% CPU on production system
-fixed
2011-09-09 14:49:12 -04:00
martin ace98569ed CC-2783: Investigate Pypo taking 100% CPU on production system
-fixed
2011-09-09 14:11:56 -04:00
martin 611630d4eb CC-2788: Airtime uses both /bin/bash and /bin/sh in different scripts
-forgot notify.sh
2011-09-08 13:44:33 -04:00
martin 805e358d9c CC-2788: Airtime uses both /bin/bash and /bin/sh in different scripts
-fixed
2011-09-08 12:36:51 -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 59a3076e42 CC-2726: monit monitor and unmonitor order change
- fixed
2011-08-26 15:44:19 -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
martin fd64c917d5 CC-2728: Liquidsoap doesn't play mono files
-fixed
2011-08-24 18:13:15 -04:00
James 95cb1858c7 CC-2726: create custom restart script for the Monit to use
- using Monit restart instead of start in full insatll script
- create new "monit-restart" function in pypo init.d
2011-08-24 17:17:28 -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 a73612afd2 CC-2607: Ability to adjust stream bitrate,type,etc from the UI interface
- Modified "Descriptioin" to "Name/Description"
- mount point is not append with extension anymore
- fix on auto generated stream url
- name is used in shoutcast
2011-08-19 16:35:23 -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 58c1eff283 CC-2689: Build latest liquidsoap version
-Done
2011-08-17 18:34:45 -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 13285fdd63 CC-2607: Ability to adjust stream bitrate, type, etc from UI interface
- created table cc_stream_setting and it's initial entries
- pypo installation will generate liquidsoap.cfg on install time
based on information on cc_stream_setting table
2011-08-12 15:19:30 -04:00
James 1c81d0d238 CC-2631: Convert pypo to accept commands from RabbitMQ
- initial commit
2011-08-11 16:20:20 -04:00
James 4125f83ae7 CC-2590: Make bitrate for liquidsoap adjustable, support multiple
stream

- done
2011-08-11 14:43:45 -04:00
james 3dca3fd800 CC-2590: support multiple stream on liquidsoap
- temp commit
2011-08-10 18:04:48 -04:00
James 773f948d58 - some unintended changes were pushed to devel 2011-08-08 16:26:18 -04:00
James c79fb81c37 - temp commit 2011-08-03 10:05:42 -04:00
James b46abe0234 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-07-26 12:42:56 -04:00
James 9da83197a1 CC-2552: removing liquidsoap.cfg from /usr/lib/...
-done
2011-07-26 12:42:39 -04:00
Naomi Aro 8f5e2a6739 CC-2590 : Make bitrate for liquidsoap and show-recorder adjustable from the config file 2011-07-26 18:39:26 +02:00
Naomi Aro f0bf7c00c3 CC-2590 : Make bitrate for liquidsoap and show-recorder adjustable from the config file 2011-07-26 16:21:20 +02:00
martin 6205b30152 CC-2566: Separate URL config out of config files and put them with API_CLIENT
-fixed
2011-07-19 19:42:23 -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
James 107c100cc4 Merge branch 'devel' of dev.sourcefabric.org:airtime into cc-2528-use-virtualenv-for-installing
Conflicts:
	python_apps/media-monitor/airtime-media-monitor
2011-07-19 15:09:55 -04:00
James b4e887eb2d temp comit 2011-07-19 15:06:35 -04:00
martin ff2fcde7c0 CC-2567: Install api_client separately from pypo 2011-07-19 12:07:31 -04:00
James e19bf33f51 temp comit 2011-07-18 17:04:46 -04:00
martin 49c399b7a8 -small code cleanup.. 2011-07-12 17:39:15 -04:00
martin 80115856ba -use alsa as default output for liquidsoap 2011-07-08 12:21:36 -04:00
martin d23a6ef0fe -liquidsoap beta2 binaries 2011-07-06 11:40:30 -04:00
martin 3dc1380fab -updated liquidsoap scripts + library to be liquidsoap-beta2 compliant 2011-07-06 11:14:51 -04:00
martin 95b69b403b CC-2429: Liquidsoap should be run with higher priority
-On a range of -20 to 20, where -20 gives the highest
 priority, set Liquidsoap nice to -15.
2011-06-23 14:06:02 -04:00
martin 9e4b4a0e93 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-06-20 17:38:27 -04:00
martin aa56344a29 CC-2410: Clean up install process
-hiding a few more warnings.
2011-06-20 17:38:18 -04:00
Paul Baranowski 1bb2e79a78 CC-2397: Support output to Shoutcast
Simply added some config file variables and added the output type in
the liquidsoap script.
2011-06-20 17:34:16 -04:00
martin fe14113b58 CC-2410: Clean up install process
-reduced number of messages
-got rid of some warnings.
-moved airtime-install.php, airtime-upgrade.php, airtime-uninstall.php
2011-06-20 17:24:12 -04:00
martin 9744507078 -Remove unused logging statements 2011-06-20 16:31:53 -04:00
martin 4d790ac42a CC-2015: On reboot, resume at the current time in the show
-added new liquidsoap binaries with cue-in/cue-out support
-revision hash c3c118e
2011-06-17 16:27:04 -04:00
martin 948a0e584d -added quotes to all paths in rm -rf statements 2011-06-17 11:16:27 -04:00
martin 2f5a1c4df6 cc-2055: switch to init.d
-monit is now temporarily disabled when intentionally stopped a service
2011-06-16 20:01:37 -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 4facadf521 -remove some symbolic links from /usr/bin. These are now
handled through init.d script
2011-06-16 17:29:05 -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 9cfec2c8ef -reorganized/cleaned up python_apps/pypo directory. 2011-06-14 14:37:09 -04:00
martin b6262438bd Merge branch '1.8.2' into devel
Conflicts:
	python_apps/pypo/airtime-liquidsoap
	python_apps/pypo/pypopush.py

-merged RC5/final 1.8.2 to devel
2011-06-13 10:51:09 -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 50ff1984f2 -python interpreter exceptions are now redirected to a file so
we can see messages related to indentation errors etc. File should
 be useful for devel purposes only.
-a merge with the 1.8.2 branch incorrectly changed the version string. Fixed.
2011-06-08 12:33:38 -04:00
martin 6e35a77268 CC-2376: pypo-push thread sys.exits when exception is raised. 2011-06-07 16:54:38 -04:00
martin 7d51a04082 CC-2375: Liquidsoap cannot access the ALSA device
-fixed
2011-06-07 14:34:14 -04:00
martin f97cd4d635 -remove apache2 as a daemon start prerequisite since apache may be remote. 2011-06-03 17:40:58 -04:00
martin d516b963e4 cc-2055: switch to init.d
-initial upgrade script
2011-06-02 18:07:48 -04:00
martin 4c9c86bf4f cc-2055: switch to init.d
-remove update-rc.d on uninstall
-remove unecessary imports in install/uninstall scripts
-all daemons now wait until apache2 is available before starting (LSB Init Script)
2011-06-02 18:07:48 -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 079d9d36b0 cc-2055: switch to init.d
-fix uninstall scripts
-make daemon script for media-monitor and show-recorder
-create pid file for liquidsoap
-fix airtime-check-system
-make sure all startup scripts are using exec
2011-06-02 18:07:47 -04:00
martin 79e24e5af5 cc-2055: switch to init.d
-Change all python apps to log directly to file
-change airtime-pypo to airtime-playback
-fix airtime install started/completed message bumpers
2011-06-02 18:07:47 -04:00
martin c05c2f1e28 cc-2055: switch to init-d
-fix daemon being able to start multiple times
-make airtime-install shell script to call installers seperately
-
2011-06-02 18:07:47 -04:00
martin 5803635d50 cc-2055: switch to init.d
-disable daemon from starting twice
2011-06-02 18:07:47 -04:00
james 0492ba79c7 CC-2277:Rename airtime-pypo to airtime-playout 2011-05-30 15:46:13 -04:00
martin 4eb8a7f394 CC-2325: no audio after running airtime-pypo-stop/start
-seems to work after re-enabling multilog.
2011-05-27 15:51:09 -04:00
Martin Konecny e8dab2340a CC-2320: liquidsoap.cfg vorbis metadata value does not effect the stream.
-fixed
2011-05-25 13:58:50 -04:00
Martin Konecny 05e02f6081 -fix hanging of pypo at system boot. 2011-05-24 20:31:05 -04:00
martin 35e617911b -show which process id is being shutdown when calling airtime-xxx-stop 2011-05-17 11:55:16 -04:00
martin c2960e9c2a -Fix unbound "response" variable when pypo got 404 error
-Sleep for few seconds after failing is_server_compatible instead of
exiting and instantly being awoken by daemon tools (less stuff in log
files)
-removed some useless try/except blocks
2011-05-13 16:08:04 -04:00
martin f7b2c04aba cc-2241 20 second delay natty
-added special liquidsoap binaries for natty
2011-05-13 13:26:40 -04:00
mkonecny b9c1f7356f CC-2250: airtime-pypo-stop doesnt work
-fixed
2011-05-05 23:18:24 -04:00
mkonecny 3eafdeef5d CC-2215: Add ability to enable metadata for ogg streams
-done
2011-05-05 17:15:58 -04:00
mkonecny ed0f24831d CC-2239-remove-sudo
-done! Replaced with su
2011-05-04 17:39:19 -04:00
martin 0f209d9f00 -liquidsoap-i386 compiled under 64-bit machine by mistake :/. Fixed. 2011-05-02 18:16:45 -04:00
martin 8e2019a935 cc-2182: Convert back to restful design
-done
2011-05-02 16:33:37 -04:00
martin b3beab1dbd CC-2216: Update to latest liquidsoap binaries
-Done
2011-04-29 17:11:31 -04:00
martin 171828f8ad CC-2186: Integration of a logger tool
-initial check-in. Everything appears to be working...
2011-04-20 00:46:03 -04:00
martin c1dd1e7415 CC-2198: airtime-pypo-stop airtime-pypo-start are ineffective
-fixed
2011-04-18 14:51:44 -04:00