Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,913 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

694 Commits

Author SHA1 Message Date
Martin Konecny fbaba59dca CC-4974: Watchdog for ensuring Liquidsoap does not consume more than 1GB of memory 
-changed to 600MB for now. May lower even more later
 2013-02-26 14:47:48 -05:00
Martin Konecny 15f2533225 less verbose logging 2013-02-26 13:34:05 -05:00
Naomi f2773fcb01 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-02-15 16:32:43 -05:00
Naomi fe611e7c6a CC-4957 : Replay Gain undefined error, json response not being sent back properly. 2013-02-15 16:32:05 -05:00
Martin Konecny 331386f74f CC-4910: Need to properly handle non-200 http status codes in api client 
-fixed
 2013-02-04 16:05:58 -05:00
Martin Konecny 34eee60bee CC-4910: Need to properly handle non-200 http status codes in api client 
-wrap all service calls in exception
 2013-02-03 00:40:41 -05:00
Martin Konecny 1f4cfa8f65 fix pypo not auto restarting 2013-02-02 08:50:44 -05:00
Martin Konecny 149b744ba7 remove using self in a static method 2013-02-01 01:40:48 -05:00
Martin Konecny f145ede01b CC-4905: Unit tests for Pypo 
-whitespace removal
 2013-01-31 17:45:57 -05:00
Martin Konecny 8adb4b259c CC-4905: Unit tests for Pypo 2013-01-31 12:33:14 -05:00
Martin Konecny e459f739f2 indentation error fix 2013-01-30 11:29:28 -05:00
Martin Konecny 2a0cc9e45f fix indentation 2013-01-30 11:23:20 -05:00
Martin Konecny 9d4e0d2dd1 Merge branch 'martin' into 2.3.x 2013-01-29 12:17:36 -05:00
Martin Konecny 28c01760dd be more gentle to Liquidsoap when sending lots of commands 2013-01-29 12:17:05 -05:00
Martin Konecny 9d8a9faca8 make code formatting easier on eyes 2013-01-28 17:00:35 -05:00
Martin Konecny d7358338f0 improved logging in pypo fetch 2013-01-28 17:00:16 -05:00
Martin Konecny b389e44001 take liquidsoap by the horns if it misbehaves. 2013-01-27 15:00:56 -05:00
Martin Konecny c93b90cc54 prepare for improvements to way pypo communicates with LS 2013-01-26 20:05:31 -05:00
Martin Konecny 807aa6b4a6 fix restart liquidsoap being sent as default no arguments for pypo-notify 2013-01-25 15:14:40 -05:00
Martin Konecny 8dd7ffee8c locks should occur inside try/catch 2013-01-25 14:16:53 -05:00
Martin Konecny 21a04803e5 Fix Pypo giving up too early on attempting to receive schedule 2013-01-25 12:11:50 -05:00
Martin Konecny b637365f55 add some missing statements in the sql upgrade script 2013-01-18 15:58:00 -05:00
Martin Konecny 1d6ff24242 SAAS-298: Issues with http://iqkidsradio.airtime.pro/Schedule 
potential fix
 2013-01-10 10:29:57 -05:00
James 6e7f45e615 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-08 17:32:39 -05:00
James 1263c04621 CC-4796: Listener Stat: Authentication exception happens but no warning message on UI 
- done
 2013-01-08 17:32:27 -05:00
Martin Konecny 8b8e12a234 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-08 17:23:28 -05:00
Martin Konecny e79066de55 CC-4760: Airtime fails to play out 2nd webstream upon switching from one webstream to another 
-fix attempt
 2013-01-08 17:23:21 -05:00
James adda497bbb CC-4812: Property "off_air_meta" will block airtime-liquidsoap to start 
- fixed
 2013-01-08 15:52:11 -05:00
James b580a7be73 CC-4812: Property "off_air_meta" will block airtime-liquidsoap to start 
- fixed
 2013-01-08 12:31:14 -05:00
James 6e241fd3ec CC-4512: Allow changing stream "Offline" message via Web UI 
- fixed
 2013-01-07 18:14:57 -05:00
Martin Konecny 225a5d8f48 CC-4733: Stream statistics for Shoutcast users 
-initial implementation
 2013-01-04 18:32:20 -05:00
James ae7b6fe092 CC-4732: Ask for admin username + password in Stream Settings page 
- done
 2013-01-03 17:58:50 -05:00
James a05259bd8f CC-4771: System -> Streams: It will restart liquidsoap every time when I click "Save" button without changing anything 
- fixed
 2013-01-03 14:42:12 -05:00
Martin Konecny b9d829a33c CC-4754: Replay gain modifier 
-make pypo repush song if its replay_gain changed
 2012-12-28 13:58:55 -05:00
denise b2699fa914 merge from devel 2012-12-03 11:06:56 -05:00
Martin Konecny fed39077c0 Merge branch '2.2.x' into devel 2012-11-20 11:21:29 -05:00
Martin Konecny 62b3c39c5b CC-4702: Webstream: When webstream is playing, it isn't marked as 'media_item_played' in cc_schedule 
-fixed
 2012-11-15 17:35:06 -05:00
Martin Konecny 5f534b5ef6 CC-4702Webstream: When webstream is playing, it isn't marked as 'media_item_played' in cc_schedule 2012-11-15 17:29:25 -05:00
Martin Konecny 8c73731c41 CC-4633: Use David's new method of Liquidsoap webstream switching 
-fixed
 2012-11-15 16:43:22 -05:00
Martin Konecny 2010778876 cleanup redundant code, remove whitespace 2012-11-15 13:33:27 -05:00
Rudi Grinberg 2e59eca131 moved files to pypo dir 2012-11-14 14:43:33 -05:00
Rudi Grinberg d5cacf4011 moved replay gain to pypo for better saas performance 2012-11-14 14:43:10 -05:00
James 6145f9bcad Merge branch '2.2.x' into devel 2012-11-08 17:28:23 -05:00
James 628e6bed37 CC-4689: Live Stream: The 1st song of a show won't play if there is another show have live stream assigned and finished right before 
- fixed
 2012-11-08 17:26:55 -05:00
James 7300b608cf Merge branch 'cc-4661-listener-statistics' into devel 
Conflicts:
	python_apps/api_clients/api_client.py
 2012-11-07 17:20:12 -05:00
Martin Konecny 34d0ee5954 CC-4661: Listener Statistics 
-add mount point names
 2012-11-02 18:04:32 -04:00
Martin Konecny 5bd0fe0300 clean up source file tailing whitespace 2012-11-02 17:51:02 -04:00
Martin Konecny 6438b54a5f CC-4661: Listener Statistics 
-backend part working
 2012-11-02 17:50:43 -04:00
Rudi Grinberg dfc3cf9267 removed useless tests 2012-11-02 15:05:08 -04:00
denise 135aadf16b Merge branch '2.2.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/views/scripts/library/library.phtml
	airtime_mvc/public/js/airtime/showbuilder/builder.js
	airtime_mvc/public/js/airtime/showbuilder/main_builder.js
 2012-11-02 12:28:21 -04:00
James b746f65304 CC-4601: Do not rewrite metadata for master source and show source streams. 
- fixed
 2012-11-01 17:24:41 -04:00
Rudi Grinberg 3b8181062c pointless refactoring of stuff that's never used 2012-10-30 17:35:10 -04:00
Martin Konecny 5f0fd0ef09 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-29 16:29:20 -04:00
Martin Konecny e40d49219b add missing gstreamer.liq file 2012-10-29 16:29:10 -04:00
Rudi Grinberg 3b51c93766 Refactored pyponotify. Removed code duplication and made runner reusable by other scripts. 2012-10-29 11:25:05 -04:00
Martin Konecny e285bcfba1 update liquidsoap library scripts 
-git commit hash f776e7f4c5d3729cbcf863381f3cadd96c578a5b
 2012-10-26 12:54:10 -04:00
Martin Konecny 795ffbbf63 CC-2236: Overbooked shows do not respect default fade time 
-move map_metadata after crossfade function
 2012-10-22 16:36:57 -04:00
Martin Konecny 780a05c2aa CC-2236: Overbooked shows do not respect default fade time 
-once a release we manage to break fades :) fixed.
 2012-10-22 16:23:33 -04:00
Martin Konecny ef78cefcd9 CC-4487: Webstream could not be heard unless you restart playout as well 
-cleanup of unused variables
 2012-10-19 16:49:01 -04:00
Martin Konecny bd5fef0bcd CC-4487: Webstream could not be heard unless you restart playout as well 
-fixed
 2012-10-19 16:29:31 -04:00
Martin Konecny 9dfee6aa68 CC-4564: Webstream: Book same webstream twice in Scheduler, the 2nd one doesn't get played 
-fixed
 2012-10-19 15:39:45 -04:00
Martin Konecny 1d4b905572 CC-4564: Webstream Book same webstream twice in Scheduler, the 2nd one doesn't get played 
-small syntax error in last commit
 2012-10-19 15:18:48 -04:00
Martin Konecny 77b430ce01 CC-4564: Webstream Book same webstream twice in Scheduler, the 2nd one doesn't get played 
-fixed
 2012-10-19 15:14:52 -04:00
Martin Konecny a929561088 CC-4565: Pypopush: Error happens when trying to insert a song right behind a Webstream as well as that Webstream is just finished 
-make sure we don't return a negative when calculating interval
seconds
 2012-10-16 11:59:37 -04:00
Martin Konecny 6420e6a830 remove trailing whitespace 2012-09-18 17:22:14 -04:00
Martin Konecny 8787a72195 -ensure stream metadata formatting is correct 2012-09-18 17:21:57 -04:00
Martin Konecny 4c58c4c9a9 CC-4473: On Air button greys out when one out of two same Webstreams is cancelled 
-fixed
 2012-09-18 15:27:27 -04:00
Martin Konecny c0f3395a61 CC-4404: restart airtime-liquidsoap will interrupt the output stream and never resume until restart playout engine 
-fixed
 2012-09-14 19:01:21 -04:00
Martin Konecny be80eeb5fd CC-4404: restart airtime-liquidsoap will interrupt the output stream and never resume until restart playout engine 
-fixed
 2012-09-14 18:20:46 -04:00
Martin Konecny da72c00f28 CC-4370: Transitioning between two webstreams: a hiccup in the stream is audible 
-fixed
 2012-09-13 16:10:17 -04:00
Martin Konecny 3107286799 CC-4370: Transitioning between two webstreams a hiccup in the stream is audible 2012-09-10 15:35:32 -04:00
Martin Konecny ac8610ca06 CC-4385: Problem with mono streams for stream rebroadcasting 
-fixed
 2012-09-10 12:18:19 -04:00
Martin Konecny d20c450226 CC-4370: Transitioning between two webstreams a hiccup in the stream is audible 
-some major refactoring before fixing this problem
 2012-09-07 17:38:24 -04:00
Martin Konecny 989f040603 CC-4371: input.harbor for rebroadcasting webstreams has hardcoded password. 
-fixed
 2012-09-07 11:41:20 -04:00
Rudi Grinberg f4848a8306 cc-4241: Tweaked metadata handling again 2012-09-05 10:59:56 -04:00
Rudi Grinberg d12833a71e Pypo debugging 2012-09-05 10:36:32 -04:00
Rudi Grinberg ab9fbc48ae MM2: Added docstrings 2012-09-05 10:24:10 -04:00
Rudi Grinberg b08874ad97 Changed pypo recordeder to output title metadata with media monitor compatible output. To avoid extra parsing. 2012-09-04 17:24:29 -04:00
Martin Konecny fbea75e680 CC-4335: Timeline: Scheduling multiple webstreams, they can not be playing smoothly 
-fixed
 2012-08-31 18:12:11 -04:00
Martin Konecny 3ed15d565e CC-4327: Timeline: Cancel a track, the following webscream does not get played 
-fixed
 2012-08-31 17:21:24 -04:00
Martin Konecny 1aa73c7347 CC-4321: NowPlaying: Cancelling Webstream has no effect and results in OnAir being grayed out 
-syntax error :/
 2012-08-31 12:52:07 -04:00
Martin Konecny 61537c550e CC-4321: NowPlaying: Cancelling Webstream has no effect and results in OnAir being grayed out 
-fix out of bounds error
 2012-08-31 12:49:35 -04:00
Martin Konecny 0ceb0167fe Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-31 12:18:48 -04:00
Martin Konecny c043053407 CC-4321: NowPlaying: Cancelling Webstream has no effect and results in OnAir being grayed out 
-fixed
 2012-08-31 12:18:37 -04:00
Daniel James 4ffbbfa164 Update the text sent to the console, since binary is no longer installed here 2012-08-31 14:36:05 +01:00
Martin Konecny f9dca67376 CC-4322: Prevent pypo-notify from hanging if server becomes unresponsive 
-up timeout to 45 sec
 2012-08-30 15:58:05 -04:00
Martin Konecny 796885594f CC-4322: Prevent pypo-notify from hanging if server becomes unresponsive 
-fixed
 2012-08-30 15:56:34 -04:00
Martin Konecny c201473dbd CC-4311: On Air button gets greyed out few seconds after show starts 
-fixed
 2012-08-30 12:02:26 -04:00
Martin Konecny 859445c766 CC-3301: Add ability to switch stereo/mono stream in stream settings 
-fixed
 2012-08-29 17:39:24 -04:00
Martin Konecny ec4343deb0 CC-4313Make sure any service can re-create its log file if the file is removed 
-fixed
 2012-08-29 11:04:56 -04:00
Martin Konecny 67d79b97e4 CC-4114: separate Liquidsoap into its own init.d script 
-changed my mind - don't restart liquidsoap if pypo restarts
 2012-08-28 15:32:25 -04:00
Martin Konecny 8d81ecf3ad CC-4114: separate Liquidsoap into its own init.d script 
if liquidsoap restarts, automatically notify pypo
 2012-08-28 15:14:57 -04:00
Rudi Grinberg 03015ac89c cc-4305: removed unnecessary temporary variable 2012-08-28 11:11:01 -04:00
Rudi Grinberg 7a926edd8f cc-4305: renamed time variable not to interefere with time module 2012-08-28 11:07:32 -04:00
Rudi Grinberg 52b2423596 cc-4305: documented set_metadata_and_save 2012-08-28 10:54:55 -04:00
Martin Konecny 15eae0698b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-21 16:55:17 -04:00
Rudi Grinberg 3871540e62 big code reformatting in pypo 2012-08-21 16:39:37 -04:00
Rudi Grinberg 64a36ea21a cc-4240: fixed 2012-08-21 16:33:37 -04:00
Rudi Grinberg 8a0774d298 cc-4240: Added more tracebacks 2012-08-21 15:56:08 -04:00
Rudi Grinberg 36c3bf5763 cc-4240: added recorder stacktrace print 2012-08-21 15:12:45 -04:00
Rudi Grinberg e15d345b4f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-21 12:50:42 -04:00
Martin Konecny 20cfd01f80 CC-1665: Scheduled stream rebroadcasting and recording 
-ls_script cleanup
 2012-08-21 12:20:15 -04:00
Martin Konecny 656e5eb429 Merge branch '2.1.x' into devel 
Conflicts:
	python_apps/pypo/install/pypo-initialize.py
 2012-08-21 12:07:21 -04:00
Martin Konecny 2a497bf941 remove symlink, not actual binary 2012-08-21 12:06:07 -04:00
Rudi Grinberg bb1e67a83c small refactoring of to os.path.join instead of manual path concatenation. 2012-08-21 10:46:48 -04:00
Martin Konecny a874e9fff7 CC-4114: use liquidsoap shutdown() command to restart liquidsoap 
-tying up loose ends
 2012-08-20 16:54:01 -04:00
James 1c9e290982 CC-4218: Live resource: Cannot connect live resource. 
- fixed
 2012-08-20 16:03:29 -04:00
Martin Konecny 5315d1efd0 CC-4114: use liquidsoap shutdown() command to restart liquidsoap 
-fixed syntax error
 2012-08-20 14:52:35 -04:00
Martin Konecny 4ad3927554 CC-4114: use liquidsoap shutdown() command to restart liquidsoap 
-shutdown liquidsoap on install
 2012-08-20 14:41:34 -04:00
Martin Konecny 0dd3dd506e add logging in scripts so we know which telnet command is issued 2012-08-20 14:40:46 -04:00
Martin Konecny 79ea05bc1b CC-4114: use liquidsoap shutdown() command to restart liquidsoap 
-more fixes
 2012-08-20 12:11:03 -04:00
Martin Konecny 72de78bcd1 CC-4114: use liquidsoap shutdown() command to restart liquidsoap 
-changed to use init.d script to restart.
 2012-08-19 00:41:25 -04:00
Martin Konecny 1dd1ba4420 CC-4114: use liquidsoap shutdown() command to restart liquidsoap 
-moved liquidsoap into its own init.d script. Still need to do some testing.
 2012-08-18 22:02:15 -04:00
Martin Konecny a6d10d8378 CC-1665: Scheduled stream rebroadcasting and recording 
-fix syntax error
 2012-08-18 21:48:57 -04:00
Martin Konecny b3ef67e617 CC-1665: Scheduled stream rebroadcasting and recording 
-info about current pre-buffering webstream should be persistent...
 2012-08-17 17:10:42 -04:00
Martin Konecny 84b616cd28 CC-1665: Scheduled stream rebroadcasting and recording 
-reduce liquidsoap CPU percentage from 20 -> 17%.
 2012-08-17 16:32:26 -04:00
Martin Konecny d8c48a53fe CC-1665: Scheduled stream rebroadcasting and recording 
-take care of situation where stream metadata has apostrophe in it.
 2012-08-17 16:12:37 -04:00
Martin Konecny 86c0b7db37 CC-1665: Scheduled stream rebroadcasting and recording 
-fix syntax error
 2012-08-17 15:55:28 -04:00
Martin Konecny e2425dd22f EOL vim fixes 2012-08-17 15:38:40 -04:00
Martin Konecny a08b31dd39 CC-1665: Scheduled stream rebroadcasting and recording 
-ability to schedule streams without a 5 second pre-buffer
 2012-08-17 15:38:24 -04:00
Martin Konecny 831a1b1923 CC-4242: MP3 streams have the artist name duplicated 
-fixed
 2012-08-16 23:51:11 -04:00
Martin Konecny 704a8d0805 CC-1665: Scheduled stream rebroadcasting and recording 
-make sure any buffers are cleared out from stream when queue is playing and vice-versa
 2012-08-16 23:50:32 -04:00
Martin Konecny 50b7597e28 CC-4242: MP3 streams have the artist name duplicated 
-fixed
 2012-08-16 23:49:37 -04:00
Martin Konecny 5c1c836f11 CC-1665: Scheduled stream rebroadcasting and recording 
-pre buffer streams part 3
-finished
 2012-08-15 18:30:12 -04:00
Martin Konecny 4ee0c368ac CC-1665: Scheduled stream rebroadcasting and recording 
-pre buffer streams part 2
 2012-08-15 17:03:14 -04:00
Martin Konecny 1e57c12ce7 CC-1665: Scheduled stream rebroadcasting and recording 
-pre buffer streams part 1
 2012-08-15 16:43:01 -04:00
Martin Konecny d773dcd112 CC-1665: Scheduled stream rebroadcasting and recording 
-send stream name back to Airtime: [("url","http://idobiradio.com/"), ("title","Good Charlotte - Like It's Her Birthday")]
 2012-08-15 15:12:44 -04:00
Martin Konecny f8d63b70d8 fix installer breaking liquidsoap package install 2012-08-08 00:21:19 -04:00
Martin Konecny f33485f8ea Merge branch '2.1.x' into devel 2012-08-08 00:09:13 -04:00
Martin Konecny b5e542ad36 make sure airtime-liquidsoap DNE before attempting to create 2012-08-07 17:41:24 -04:00
Martin Konecny 1891a11373 CC-1665: Scheduled stream rebroadcasting and recording 
-Step 1 to make Liquidsoap send back web stream metadata to UI
 2012-08-03 18:45:22 -04:00
Martin Konecny 3b25f676c9 CC-3412: Icecast stream name not defined 
-fix name being assigned twice
 2012-08-03 16:20:48 -04:00
Cliff edd4cbba13 Merge branch '2.1.x' into devel 2012-08-03 14:25:54 -04:00
Cliff 17e2417f18 put apt-get args in correct location 2012-08-03 14:24:39 -04:00
Martin Konecny eb4b3cfcfa Merge branch '2.1.x' into devel 
Conflicts:
	install_full/ubuntu/airtime-full-install
 2012-08-03 09:45:55 -04:00
Martin Konecny 3f10f94d8f CC-4147: Make Airtime work nicer with Debian package generation scripts. 
-liquidsoap is installed from sofab repo
-make sure new deb-multimedia name takes effect
 2012-08-03 09:42:41 -04:00
Martin Konecny 194b4ec36e Merge branch '2.1.x' into devel 2012-08-02 18:10:12 -04:00
Martin Konecny 4f1300f58a CC-3412: Icecast stream name not defined 2012-08-02 18:08:17 -04:00
Martin Konecny fcce4bf64c CC-1665: Scheduled stream rebroadcasting and recording 
-cancelling a webstream works
 2012-08-02 16:26:41 -04:00
Martin Konecny 5f8a5a618d Remove unecessary trailing whitespace 2012-08-01 14:52:21 -04:00
Martin Konecny 63b89043b6 CC-1665: Scheduled stream rebroadcasting and recording 
on-air light works with streams now
 2012-08-01 14:51:56 -04:00
Martin Konecny eb4c23b0b6 CC-1665: Scheduled stream rebroadcasting and recording 
-Fix scheduled streams mixed with scheduled files
 2012-07-26 14:49:32 -04:00
Martin Konecny fbc5b72f14 CC-1665: Scheduled stream rebroadcasting and recording 
-webstreams now start and stop at the correct time.
 2012-07-26 14:49:32 -04:00
Martin Konecny 2ad7e78e10 CC-1665: Scheduled stream rebroadcasting and recording 
-initial prototype
 2012-07-26 14:41:39 -04:00
Rudi Grinberg 34194e6411 cc-4105: Removed -u from running pypo and mediamonitor. Not necessary anymore. 2012-07-18 11:16:55 -04:00
Rudi Grinberg b021c3e925 Added todo comment 2012-07-17 16:43:04 -04:00
Rudi Grinberg 98b4e3c47b cc-4105: Tweaked php method to have more consistent return values 2012-07-17 16:43:04 -04:00
Rudi Grinberg 68a218d277 cc-4105: fixed runtime error where recorder would initialize and api client instance from a method that would not exist\n\tRefactored getDateTimeObj a little bit 2012-07-17 16:43:04 -04:00
Rudi Grinberg 20e32b98ba Merge branch 'devel' into mediamonitor2 
Conflicts:
	python_apps/api_clients/api_client.py
 2012-07-16 17:41:36 -04:00
Martin Konecny 832eafdea1 CC-4104: airtime-uninstall should not purge airtime database be default 
-small fix
 2012-07-16 15:43:17 -04:00
Martin Konecny 35d3d63e08 CC-4104: airtime-uninstall should not purge airtime database be default 
-on reinstall use the database
 2012-07-16 15:34:09 -04:00
Martin Konecny e056e5ff01 correctly rename AirTime to Airtime 2012-07-16 15:33:44 -04:00
Martin Konecny 4ebcb1b1f9 Merge branch '2.1.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/PlaylistController.php
	airtime_mvc/application/models/Playlist.php
	python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py
	python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
 2012-07-16 14:31:03 -04:00
Rudi Grinberg 120305f383 cleared up a lot of boilerplate with lazy properties 2012-07-13 11:28:16 -04:00
Martin Konecny 62287a2313 -Remove useless api_client interface 2012-07-12 16:51:11 -04:00
Martin Konecny ee3447f903 CC-4090: Make code style PSR compliant 
-User.php
-removed all trailing whitespace
 2012-07-10 18:51:32 -04:00
Martin Konecny aecee0574d Random commits gathered and put into one 
-since we had an accidental merge between devel and 2.1.x, I'm rounding
up these changes that need to be in 2.1.x and putting them here.
 2012-07-09 18:58:22 -04:00
Martin Konecny 5c1af49252 CC-430: Audio normalization (Replaygain Support) 
-Added support on Liquidsoap side
 2012-07-05 23:24:34 -04:00
denise bc93119adc Merge branch '2.1.x' into devel 2012-07-04 09:46:30 -04:00
Martin Konecny 00745d372d CC-4058: Timeline -> Cannot add song twice if last cursor is selected 
-fixed
 2012-07-03 17:06:35 -04:00
Martin Konecny 7f66d735a1 fix spelling 2012-07-03 16:43:33 -04:00
denise 3e75b28c9d Merge branch '2.1.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
 2012-07-03 10:42:29 -04:00
James 06ac33b130 CC-4052: Pypo: it's not manually grabbing schedule when it times out. 
- fixed
 2012-06-29 16:07:03 -04:00
denise 001f0790f9 Merge branch '2.1.x' into devel 2012-06-29 12:26:45 -04:00
James e5e0c925e6 CC-4043: Pypo: add same song twice and cancel the first song, the 
following song wont play any more

- fixed
 2012-06-29 12:11:38 -04:00
denise 335dd1516b Merge branch '2.1.x' into devel 
Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
 2012-06-29 10:57:14 -04:00
James 93bdcf0b26 CC-4032: pyponotify.py fails because not all files in 
/var/log/airtime/pypo are read/writable by pypo

- fix
 2012-06-28 17:17:36 -04:00
Martin Konecny 13fb3a02c5 CC-4032: pyponotify.py fails because not all files in /var/log/airtime/pypo are read/writable by pypo 
-fixed
 2012-06-28 17:09:41 -04:00
Martin Konecny dd098d47fa CC-4041: get_current_chain, get_next_schedule_chain should use same utc time variable 
-fixed
 2012-06-28 16:43:22 -04:00
Martin Konecny f16d8eb438 Log file cleanup + improvements 
-Don't show queue timeout as error
-Show UTC time and current timezone on pypo startup
 2012-06-28 16:16:02 -04:00
Martin Konecny 226b6e8709 CC-4040: Pypo can start before Liquidsoap 
-fixed
 2012-06-28 16:15:39 -04:00
Martin Konecny 939fa24495 CC-4039: pypo-push can sometimes die 
-fixed
 2012-06-28 15:29:38 -04:00
Martin Konecny 7f735fe2fa Log file cleanup + improvements 
-Don't show queue timeout as error
-Show UTC time and current timezone on pypo startup
 2012-06-28 12:12:22 -04:00
Martin Konecny 81c9eacd00 CC-3892: Pypopush can be executed before Pypofile copying file 
-fixed
 2012-06-27 16:29:33 -04:00
Martin Konecny 63aae4d9b5 pypocli.py cleanup 2012-06-27 14:37:40 -04:00
Martin Konecny a0723b7007 CC-4030: POLL interval should be 1/2 of the schedule being sent 
-fixed
 2012-06-27 14:37:16 -04:00
Martin Konecny d6a5200d58 CC-4029: Pypo Notify script incorrectly attempts to use pypo.log log file (should use notify log file) 
-fixed
 2012-06-27 12:42:38 -04:00
Martin Konecny 0a3c9c7351 clean up indentation + imports for python apps 2012-06-26 22:41:11 -04:00
Martin Konecny 4061059d3a CC-3938: Mono sources don't work for stream rebroadcasting 
-fixed
 2012-06-26 18:04:05 -04:00
Martin Konecny 43c4b943f2 CC-4017: Run airtime-playour process as root user 
fixed world readable permissions when caching file
 2012-06-26 17:50:26 -04:00
Martin Konecny a6eb74b1fd CC-4017: Run airtime-playour process as root user 
-Done
 2012-06-26 17:00:14 -04:00
Martin Konecny 7e7f8147da CC-4017: Run airtime-playour process as root user 
-done
 2012-06-26 14:55:19 -04:00
denise f029124447 Merge branch '2.1.x' into devel 2012-06-19 17:57:27 -04:00
Martin Konecny 27a6326c58 Merge branch '2.1.2' into 2.1.x 
Conflicts:
	python_apps/pypo/pypofetch.py
 2012-06-18 14:57:22 -04:00
denise ad978c7843 Merge branch '2.1.x' into devel 2012-06-18 11:23:42 -04:00
Martin Konecny ff35322ae9 CC-3988: Pypo: pypo doesn't update last schedule update time when pyp… 2012-06-17 23:24:15 -04:00
James 53af1928cf CC-3988: Pypo: pypo doesn't update last schedule update time when pypo pulls 
schedule from the server

- fixed
 2012-06-15 21:31:08 -04:00
denise 3f0a06ee2b CC-3578: Stream label for scheduled shows could fall back to show or station name when no song is currently playing 
-done
 2012-06-13 12:23:00 -04:00
denise f27fbc14f7 CC-3578: Stream label for scheduled shows could fall back to show or station name when no song is currently playing 
-done (falls back to stream name)
 2012-06-12 17:40:00 -04:00
denise f3b925daa2 CC-3412: Icecast stream name not defined 
-done
 2012-06-12 17:08:36 -04:00
James 67c90ae3d6 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-08 14:58:48 -04:00
James 0040f29fd2 CC-3953: Airtime will not auto query for new schedule after 1 hour if it 
received new messages unrelated to schedule in the meantime

- fixed
 2012-06-08 14:57:59 -04:00
Martin Konecny 2d78f58d42 CC-3947: Pypo log history is too brief 
-increased history by 10x
 2012-06-08 11:43:55 -04:00
Martin Konecny b128050cc2 CC-3889: Add line "export TERM=xterm" to pypo bash script startup file 
-fixed
 2012-06-05 13:07:59 -04:00
Martin Konecny b6446442ba CC-3917: record_date field in recorded shows causing problem 
-fixed
 2012-06-04 11:43:41 -04:00
Martin Konecny 3f481309b8 fix cache not being removed 2012-05-30 18:26:49 -04:00
Martin Konecny 8f214c2ae6 make sure pypo user can write /etc/airtime/liquidsoap.cfg 2012-05-29 11:23:42 -04:00
Martin Konecny 11b52905df CC-3892: Pypopush can be executed before Pypofile copying file 
-temp solution
 2012-05-29 11:10:48 -04:00
Martin Konecny d8ae8002d2 -make sure to autogenerate liquidsoap.cfg before liquidsoap starts 2012-05-28 18:48:40 -04:00
Martin Konecny b9c6eab39c make sure we explicitly need to tell Airtime services to start 2012-05-28 17:42:48 -04:00