Commit Graph

516 Commits

Author SHA1 Message Date
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