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

417 Commits

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