56ad8c6b3d
Merge branch '1.9.1' into devel
...
Conflicts:
VERSION
airtime_mvc/application/configs/constants.php
install_minimal/include/airtime-upgrade.php
python_apps/api_clients/api_client.py
python_apps/pypo/pypofetch.py
2011-08-26 12:56:10 -04:00
fd64c917d5
CC-2728: Liquidsoap doesn't play mono files
...
-fixed
2011-08-24 18:13:15 -04:00
58837ff89b
CC-2706: Streams should have a username field
...
- adding "User" field on stream setting form
- change key name from "output_s1" to "s1_output" format to be consistent
- changed order of inserting in default.sql file
- hiding username field on shoutcast selection
- liquidsoap and pypo takes care of user field input
2011-08-24 17:13:56 -04:00
a73612afd2
CC-2607: Ability to adjust stream bitrate,type,etc from the UI interface
...
- Modified "Descriptioin" to "Name/Description"
- mount point is not append with extension anymore
- fix on auto generated stream url
- name is used in shoutcast
2011-08-19 16:35:23 -04:00
cf55e92aa3
CC-2607: Ability to adjust stream bitrate, type, etc from UI
...
- removed debug code from NowPlayingController
- New Form for streamsetting
- Action created in PreferenceController
2011-08-18 13:53:12 -04:00
4125f83ae7
CC-2590: Make bitrate for liquidsoap adjustable, support multiple
...
stream
- done
2011-08-11 14:43:45 -04:00
3dca3fd800
CC-2590: support multiple stream on liquidsoap
...
- temp commit
2011-08-10 18:04:48 -04:00
773f948d58
- some unintended changes were pushed to devel
2011-08-08 16:26:18 -04:00
c79fb81c37
- temp commit
2011-08-03 10:05:42 -04:00
8f5e2a6739
CC-2590 : Make bitrate for liquidsoap and show-recorder adjustable from the config file
2011-07-26 18:39:26 +02:00
f0bf7c00c3
CC-2590 : Make bitrate for liquidsoap and show-recorder adjustable from the config file
2011-07-26 16:21:20 +02:00
80115856ba
-use alsa as default output for liquidsoap
2011-07-08 12:21:36 -04:00
3dc1380fab
-updated liquidsoap scripts + library to be liquidsoap-beta2 compliant
2011-07-06 11:14:51 -04:00
1bb2e79a78
CC-2397: Support output to Shoutcast
...
Simply added some config file variables and added the output type in
the liquidsoap script.
2011-06-20 17:34:16 -04:00
e90e6d7c12
cc-2015: on reboot resume show
...
-liquidsoap is having some problems with cue points right now
need to check if this is my fault.
2011-06-16 13:26:37 -04:00
9cfec2c8ef
-reorganized/cleaned up python_apps/pypo directory.
2011-06-14 14:37:09 -04:00
james
martin
James
Naomi Aro
Paul Baranowski