Commit Graph

4056 Commits

Author SHA1 Message Date
martin 7c605c4a28 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-03-23 13:43:22 -04:00
martin d982419b16 CC-1894: Warn users about time zone differences or clock drift problems on the server
-An error msg now appears in pypo log when pypo and server timezones do not match
2011-03-23 13:43:11 -04:00
lukabazuka 3a2d8298b8 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-03-23 18:39:33 +01:00
lukabazuka ca6fd4b9ee Issue CC-2063 resolved 2011-03-23 18:19:53 +01:00
naomiaro 224fa1a0b8 CC-1985 : Automatic rebroadcast of recorded content
sending group_id instead of playlist id to playout
anything not in a playlist won't have a playlist id
scheduling just a file for rebroadcast shows.
2011-03-23 12:09:29 -04:00
paul.baranowski c4b632e8ad Merge branch 'master' of dev.sourcefabric.org:airtime 2011-03-23 01:09:48 -04:00
paul.baranowski 78b33b9e23 CC-2084: Integrate RabbitMQ for immediate schedule updates and commands
Implemented RabbitMQ on the pypo side.  Schedule updates are now
almost instantaneous and we are only polling the server once per
hour if we aren't updated in that time.  Canceling a show happens
right away.
2011-03-23 01:09:27 -04:00
naomiaro 8ebd70a61c CC-1630 : Automatic recording of shows
don't need to give specific device, just using default.
2011-03-23 00:36:34 -04:00
naomiaro 1f4c08b1a3 CC-1630 : Automatic recording of shows
need to run show recorder as root to have access to soundcard using daemontools
2011-03-23 00:33:46 -04:00
paul.baranowski 7f7800aa2b CC-2084: Integrate RabbitMQ for immediate schedule updates and commands
Fixed minor issue where schedule was pushed back to pypo after updating
the "played" flag for media files and playlists.

Found one other spot where this was happening and fixed it.
2011-03-23 00:27:31 -04:00
paul.baranowski 72c9e44a91 CC-2084: Integrate RabbitMQ for immediate schedule updates and commands
Fixed minor issue where schedule was pushed back to pypo after updating
the "played" flag for media files and playlists.  This isnt necessary.
2011-03-23 00:17:41 -04:00
naomiaro 44d83051b1 CC-1630 : Automatic recording of shows
using alsahw since users will have pulseaudio removed.
2011-03-22 18:41:02 -04:00
naomiaro 6c5a51e0fa Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-03-22 18:20:39 -04:00
naomiaro f592254246 CC-1630 : Automatic recording of shows
scripts to install recorder using daemon tools.
haven't tested without pulse audio yet.
2011-03-22 18:20:22 -04:00
martin a1d7bcad90 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-03-22 18:08:49 -04:00
naomiaro 8ffcd75682 bug, forgot to delete useless line 2011-03-22 18:07:00 -04:00
martin e92be3c186 CC-1990: Widget to display schedule and "Now Playing" on any website
-First working version, needs to be called using:

<script>
    $(document).ready(function() {
        $("#headerLiveHolder").airtimeLiveInfo();
        $("#onAirToday").airtimeShowSchedule();
    });
</script>
2011-03-22 18:04:27 -04:00
martin 278938f746 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-03-22 13:39:55 -04:00
martin 582c05a192 CC-2077: Show is marked as Recording, when it's not set to record
-Fixed
2011-03-22 13:39:01 -04:00
naomiaro 8016737968 Merge branch 'master' of dev.sourcefabric.org:campcaster
Conflicts:
	application/models/Shows.php
2011-03-22 12:16:42 -04:00
naomiaro fae71ed051 CC-1985 : Automatic rebroadcast of recorded content
scheduling the recorded file in any rebroadcast shows.
2011-03-22 12:08:09 -04:00
paul.baranowski 3e27a3de01 CC-2079: Airtime 1.7 stops playing after a certain amount of time
CC-2080: Turn pypo-fetch and pypo-push into threads of the same process

Fixed bug where it wasnt possible to exit the program with Control-C.
2011-03-22 11:42:09 -04:00
paul.baranowski b650abcbb8 Merge branch 'master' of dev.sourcefabric.org:airtime
Conflicts:
	application/models/Shows.php
2011-03-22 10:00:37 -04:00
paul.baranowski d38e2adb58 CC-2084: Integrate RabbitMQ for immediate schedule updates and commands
This is the code for the server side to push the schedule to RabbitMQ.
Right now it is disabled and should cause no changes in behavior.

Also added comments to functions and formatted code correctly.
2011-03-22 09:55:33 -04:00
martin 730df4c345 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-03-22 01:29:38 -04:00
martin cbe8f98a7c CC-1990: Widget to display schedule and "Now Playing" on any website
-initial checkin, some hardcoded values
2011-03-22 01:29:23 -04:00
naomiaro 864cda6c34 CC-1630 : Automatic recording of shows
multi threading now used in recorded for back to back shows.
recorded file id is put into show instances table.
2011-03-22 00:46:31 -04:00
martin 73238f92af CC-2082: OGG stream dies after every song when using MPlayer
-Fixed all issues related to OGG streams, including mplayer being confused because the silence
mp3 file sent was too silent (no data was being sent because the file was too quiet)
-silent mp3 file is no longer used, inaudible white noise is generated instead
2011-03-21 16:50:20 -04:00
naomiaro 60649cba8a CC-1987 : Automatic upload of recorded shows to Soundcloud
created Soundcloud.php in models, added upload track method.
using python-setuptools in install to find poster package to be able to upload recoded file to airtime and then to soundcloud.
2011-03-21 15:48:44 -04:00
martin a3a8ae104a CC-2030: Icon needed for Cue In/Out
-Implemented
2011-03-21 15:01:43 -04:00
martin 9dae306526 .gitignore file now only ignores "files/" folder in the root airtime directory 2011-03-21 13:51:36 -04:00
martin 4812c17d22 CC-2082: OGG stream dies after every song when using MPlayer
-small typo fix
2011-03-21 13:43:25 -04:00
martin 9f7a223159 CC-2082: OGG stream dies after every song when using MPlayer
-Problem fixed
-Also replaced 40MB silence.mp3 file with new 172KB file
2011-03-21 13:35:50 -04:00
martin b922e42918 CC-2080: Turn pypo-fetch and pypo-push into threads of the same process
Fixed install scripts to remove old instances of pypo properly
2011-03-21 10:58:30 -04:00
martin d9431f95b4 -removed pp.sh helper script from dev_tools 2011-03-20 22:57:48 -04:00
martin b20294d7e9 -changed LAME to re-encode to 128kbps (from 32) by default when cutting a file. 2011-03-20 20:17:10 -04:00
martin e64e30d6da CC-2080: Turn pypo-fetch and pypo-push into threads of the same process
First implementation
2011-03-20 19:34:43 -04:00
Naomi 6ba4881ff2 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-03-18 17:15:23 -04:00
Naomi 3a0f9ddcd1 CC-1987 : Automatic upload of recorded shows to Soundcloud
Added fields to preference form for the station's soundcloud user/pass
need to generalize file upload as commented out in the new Soundcloud.php file.
2011-03-18 17:15:12 -04:00
Paul Baranowski ea93535846 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-03-18 17:12:59 -04:00
Paul Baranowski 7484f1a837 Added php-amqp library to talk to RabbitMQ.
You can get this from https://github.com/tnc/php-amqplib
but I updated the demo programs so that they work.
2011-03-18 17:12:48 -04:00
Naomi 10706ec72a CC-1987 : Automatic upload of recorded shows to Soundcloud
added a method to the php soundcloud api to allow use to connect with a user's username and password.
2011-03-18 15:34:28 -04:00
Naomi 5ddd670979 CC-1630 : Automatic recording of shows
not going to use ECI python bindings, has deprecated code in the ubuntu package currently
also simpler just to call a subprocess
2011-03-18 15:33:23 -04:00
naomiaro 28b7d8e882 CC-1985 : Automatic rebroadcast of recorded content
can't move a rebroadcast show infront of it's original recorded show,
know how to print form element errors out in a custom view script,
removed show content option from a recorded show's context menu.
2011-03-18 00:20:38 -04:00
naomiaro 01ad277984 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-03-17 18:23:23 -04:00
naomiaro e3e8f10021 CC-1985 : Automatic rebroadcast of recorded content
added url column to cc_shows table, logic to show/hide form components for rebroadcast
2011-03-17 18:23:05 -04:00
Paul Baranowski ef0bb8ed78 Moved all install functions into an AirtimeInstall class.
Formatted all the install files according to our code formatting standards.
Output more info if something goes wrong during DB create or DB user create.
2011-03-16 13:21:40 -04:00
Paul Baranowski 4b27fcc0c9 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-03-16 13:07:23 -04:00
naomiaro 20f3c49dcb CC-1985 : Automatic rebroadcast of recorded content
rebroadcast shows are automatically resized if parent recorded shows are altered.
progress bar is removed from recorded/rebroadcast shows, waiting on special icons.
2011-03-16 11:33:08 -04:00
naomiaro f104872175 CC-1985 : Automatic rebroadcast of recorded content
modified full calendar code to allow disabling resize of specific events (rebrodcast shows)
2011-03-15 17:26:59 -04:00