Commit Graph

118 Commits

Author SHA1 Message Date
Albert Santoni 968b739bf4 Make 4th stream backwards compatible with the autogenerated
liquidsoap.cfg
2015-03-10 12:41:45 -04:00
Albert Santoni d61b75f105 Added a working 4th stream 2015-03-03 16:08:53 -05:00
Naomi Aro 60bf334aeb Merge branch '2.4.x' into 2.4.x-saas 2013-09-02 15:46:25 -04:00
cliff.wang ceba84d1f7 CC-5308 Liquidsoap input habor will block schedule contents sometime
Remove makesafe wrapper
2013-08-22 15:03:25 -04:00
denise 18bb477845 Merge branch '2.4.x' into 2.4.x-saas 2013-07-10 11:32:51 -04:00
denise f9a1cae72e CC-5260: Liquidsoap: Fail to play mono file
Fixed thanks to Bill Burton
2013-07-10 10:35:24 -04:00
Naomi Aro f2d5fa96da Merge branch '2.4.x' into 2.4.x-saas
Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
	utils/phone_home_stat.php
2013-06-26 01:25:26 -04:00
Martin Konecny fb80530069 CC-5229: map_metadata in Liquidsoap is applied twice
fixed
2013-06-12 16:04:57 -04:00
Martin Konecny 949ae9667b CC-5226: Metadata isn't correct during playing
-fixed using "insert_metadata" and callbacks instead.
2013-06-12 14:04:52 -04:00
Martin Konecny 0e560d89ad CC-5226:
Metadata isn't correct during playing

-should be fixed
2013-06-12 12:43:27 -04:00
Martin Konecny 2a897414a4 make operators more local to each queue source
Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
2013-05-23 13:02:50 -04:00
Martin Konecny 5c11f5fc72 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
2013-05-22 18:08:14 -04:00
Martin Konecny 4e1dc6a86e make operators more local to each queue source 2013-05-22 18:07:12 -04:00
Martin Konecny 45e5d339a1 make more operators local to each source 2013-05-22 18:03:56 -04:00
Martin Konecny 36567c85cd create on_metadata callback for each source instead of once on unified source 2013-05-22 17:39:18 -04:00
Martin Konecny 8e617b33de add ability to use id's with mksafe operator 2013-05-21 16:31:32 -04:00
Martin Konecny c693c4b015 remoe id's for mksafe (they aren't supported params) 2013-05-14 15:14:57 -04:00
Martin Konecny 298e5a9b77 better idenfication of which mksafe is being applied 2013-05-13 17:52:43 -04:00
Martin Konecny 28576adf42 disable liquidsoap's add operator normalizing audio 2013-05-10 23:19:54 -04:00
Martin Konecny 5cb950e43f Merge branch '2.3.x' 2013-04-08 18:55:54 -04:00
Martin Konecny aca651a1b4 better logging 2013-04-08 18:53:35 -04:00
Martin Konecny e2e6a4263c Merge branch '2.3.x' into devel 2013-04-03 16:48:19 -04:00
Martin Konecny ec7c898f5a fix some problems with invalid Liquidsoap PID file 2013-04-03 16:47:46 -04:00
Martin Konecny a5c8b7624e CC-1469: Crossfading support (non-equal power)
-handle file attributes changing (end time, replaygain etc.)
2013-03-22 15:56:05 -04:00
Martin Konecny 7a6940c96c Merge branch 'cc-1469-crossfade' into devel
Conflicts:
	python_apps/pypo/pypopush.py
2013-03-22 15:24:14 -04:00
Martin Konecny dd7fc61e23 CC-1469: Crossfading support (non-equal power)
-further implementation..
2013-03-15 12:50:23 -04:00
Martin Konecny 91d1243554 CC-1469:
Crossfading support (non-equal power)

-initial commit
2013-03-14 16:50:55 -04:00
Martin Konecny fe96b66fd7 CC-5016:
Allow user control for webstream metadata format

-fixed
2013-03-08 16:00:16 -05:00
Martin Konecny e669b7a91a refactor some liquidsoap code + remove unused --data argument 2013-03-05 17:31:09 -05:00
Martin Konecny 0f7063e8a6 another refactor of the switches in LS 2013-03-01 12:48:32 -05:00
Martin Konecny 7e19eba7e1 another refactor of LS source 2013-03-01 11:44:11 -05:00
Martin Konecny 6624911d2c minor refactor of LS code 2013-02-28 18:54:23 -05:00
Martin Konecny b3ecb477be minor refactor of LS code 2013-02-27 17:48:10 -05:00
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 9d8a9faca8 make code formatting easier on eyes 2013-01-28 17:00:35 -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 6e241fd3ec CC-4512: Allow changing stream "Offline" message via Web UI
- fixed
2013-01-07 18:14:57 -05:00
denise b2699fa914 merge from devel 2012-12-03 11:06:56 -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
James b746f65304 CC-4601: Do not rewrite metadata for master source and show source streams.
- fixed
2012-11-01 17:24:41 -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 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 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 6420e6a830 remove trailing whitespace 2012-09-18 17:22:14 -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 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 989f040603 CC-4371: input.harbor for rebroadcasting webstreams has hardcoded password.
-fixed
2012-09-07 11:41:20 -04:00