Lucas Bickel
acdc529139
Do not bundle liquidsoap library
...
I think the code was bundled into legacy upstream before it was
readily available in liquidsoap proper. These snippets are now
maintained at https://github.com/savonet/liquidsoap/tree/master/scripts .
On all distros I checked these scripts are installed to /usr/bin/liquidsoap
by the corresponding package. Liquidsoap loads them from there by
default.
By not bundling this we will be ready to profit from new features and
bugfixes in liquidsoap that is expected to land on opam soon. We'll
need to figure out how to get debian and others updated when that
happens.
2017-03-28 12:26:11 +02:00
Lucas Bickel
b267036483
Fix recording through ecasound
...
This is part 2 of fixing ecasound recordings from line-in. Part 1 restored the User-Interface, part 2 takes care of getting to the point where ecasound gets started, records something and uploads it through rest when done. Part 3 will take care of making sure that the recorded file is mapped to the show and not just stored as a new track.
I refactored api_clients to not use urllib2 for posting multipart data since I was loosing my sanity over it and requests seems to have a modern approach to doing this compared to what api_clients was previously doing.
2017-03-24 15:15:37 +01:00
Lucas Bickel
5f04dbb8a8
Get base_recorder_file config from proper subsection in conf
...
It took me way too long to figure this one out it wasn't logging nicely. With this ecasound actually gets called again. It's still failing on my install but I'm not yet sure why exactly.
2017-03-23 13:18:52 +01:00
Lucas Bickel
c6225f9db5
Reverse pypo changes
...
The TODO seems to have been wrong due to the fact that everything works as advertised w/0 the change.
2017-03-19 13:15:59 +01:00
Robb Ebright
1b90dbd4ca
working python liquidsoap reconfigure script, might need further refinement
2017-03-14 04:02:51 +00:00
Robb Ebright
67ffd2d34a
Making show and master source ports and mount points editable.
2017-03-14 01:15:14 +00:00
Robb
479bdb1c80
Merge pull request #76 from radiorabe/feature/no-more-std_err_override-for-pypo
...
Problem: std_err_override is a hack for python < 2.7
2017-03-13 14:44:01 -04:00
Lucas Bickel
dfe3f077fd
Replace std_err_override with logging.captureWarnings(True) in pypo
...
The quite ugly hack with std_err_override seems to have been made for python < 2.7. Since all major distros
have al least python 2.7 installed we can stop using the std_err_override hack.
This removes it from pypo, media-monitor still uses the module and we can completely delete it when we have
remove media-monitor after having maybe backported the watched folders feature to analyzer.
2017-03-13 16:28:07 +01:00
Lucas Bickel
99a0ce37cc
Fix fix_cue_in to work with liquidsoap 1.2
...
The previous syntax only worked with 1.1, this one should work on both.
2017-03-13 14:30:51 +01:00
Lucas Bickel
ac5f608bd8
Refactor into def check_version
...
Make the code more readable :)
2017-03-12 14:18:06 +01:00
Lucas Bickel
80373ca7bc
cue_cut workaround
...
This is the workaround for <https://github.com/savonet/liquidsoap/issues/390 >.
I still need to do proper testing on it and maybe we should figure out the proper "formula" for getting to the 0.04 value.
2017-03-12 14:18:06 +01:00
Lucas Bickel
0e8d0868e8
Make pypo media downloader port aware
...
This is needed if the base port is not 80 like in the vagrant setup.
2017-03-10 19:10:15 +01:00
Albert Santoni
a26f1a70e3
Respawn liquidsoap and pypo indefinitely if they fail to launch. Throttled it though.
2015-12-04 15:56:06 -05:00
Albert Santoni
91e1252b86
SAAS-1239: Listener stats with Shoutcast not working
2015-12-04 15:05:17 -05:00
Albert Santoni
2eea558dfd
SAAS-1267: AAC streams stuck at 64 kbps, even at higher bitrates
2015-12-04 10:51:07 -05:00
Albert Santoni
bb05fa996a
SAAS-1132: Improve safety of XML parsing for listener stats
2015-11-09 19:32:56 -05:00
Albert Santoni
3592eceb22
Merge branch 'saas' into saas-dev
2015-08-24 17:11:52 -04:00
Albert Santoni
f21fcb3dcc
SAAS-1011 - Fixed one mimetype problem and fixed installer
2015-08-24 16:25:09 -04:00
Albert Santoni
fdb2d4fae2
SAAS-1011: Files on NFS with incorrect file extensions won't play out
...
* Simplified the mime type detection code in pypo and made it actually work
2015-08-24 11:29:45 -04:00
Albert Santoni
dab0f00736
Fixed m4a file extension mapping in pypo
2015-08-11 08:59:44 -04:00
Duncan Sommerville
1816be156f
SAAS-922 - change file extensions in pypo based on mime-type, update lists of accepted mime types
2015-07-16 16:26:52 -04:00
Albert Santoni
238bb15793
SAAS-941: Liquidsoap fails to start for stations with the substrings true/false in their names
2015-07-09 22:32:34 -04:00
Duncan Sommerville
dd2ffd148d
Fix bug where pypo fails to restart liquidsoap; uncomment adding pypo template files
2015-06-29 12:20:39 -04:00
Duncan Sommerville
d9f17f3919
SAAS-871 - Fix consumer cancellation bug
2015-06-26 17:11:04 -04:00
Albert Santoni
d54eb37317
Merge branch 'saas' into saas-dev
2015-06-24 15:19:38 -04:00
Albert Santoni
195935cccf
Slightly better exception handling and logging to help with SAAS-884
2015-06-22 15:49:23 -04:00
Duncan Sommerville
92ad5bde6d
Add fields to airtime.example.conf for compatibility, remove /etc/init scripts to prevent duplicate processes on startup
2015-06-17 14:49:12 -04:00
Albert Santoni
3996e757b7
Merge branch 'saas-dev' into saas-installer-albert
2015-06-10 12:02:08 -04:00
Albert Santoni
146146e35f
CC-6052: Fix problem with stream passwords
2015-06-08 14:18:19 -04:00
Albert Santoni
01ea6f27ae
Merge branch 'saas-dev' into saas-installer-albert
...
Conflicts:
python_apps/api_clients/api_clients/api_client.py
2015-06-02 15:40:57 -04:00
Albert Santoni
700fddbada
SAAS-818: If the network connection is interrupted, pypo sometimes can't recover
2015-06-02 14:51:20 -04:00
drigato
532bd1ea85
SAAS-772: Send metadata to Tunein
...
Made Improvement so Airtime always makes a request to TuneIn every 4
minutes so TuneIn does not turn metadata off
2015-05-25 15:37:45 -04:00
Albert Santoni
6fad0a3ee6
Merge branch 'saas-dev' into saas-installer-albert
2015-05-22 19:09:30 -04:00
Albert Santoni
fc02de4920
Revert "Add on_metadata wrapper to liquidsoap master/show sources"
...
This reverts commit 415a0d21f9
.
2015-05-22 19:09:04 -04:00
Albert Santoni
d3f89c9507
Revert "Add on_metadata wrapper to liquidsoap master/show sources"
...
This reverts commit 82c801cb79
.
2015-05-22 19:08:48 -04:00
Albert Santoni
9ffbdfbfa3
Merge branch '2.5.x-installer' into saas-installer-albert
2015-05-22 18:43:28 -04:00
Albert Santoni
b81069ace3
Added missing requests dependency to pypo's requirements
2015-05-22 18:43:05 -04:00
Albert Santoni
6ca0e340a4
Merge branch '2.5.x-installer' into saas-installer-albert
...
Conflicts:
python_apps/pypo/pypo/pypofile.py
2015-05-22 18:26:16 -04:00
Albert Santoni
027adc7749
Three bugfixes
...
* Removed Support Settings nav link
* SAAS-801: pypo log configuration files are overkill and must be removed
* CC-6043: CTRL-C doesn't work in pypo / airtime-playout
2015-05-22 18:20:45 -04:00
Albert Santoni
11c6818e61
Merge branch '2.5.x-installer' into saas-installer-albert
...
Conflicts:
.gitignore
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/configs/conf.php
airtime_mvc/application/controllers/SystemstatusController.php
airtime_mvc/application/controllers/UpgradeController.php
airtime_mvc/application/upgrade/Upgrades.php
airtime_mvc/application/views/scripts/systemstatus/index.phtml
airtime_mvc/build/airtime.conf
airtime_mvc/build/sql/defaultdata.sql
airtime_mvc/public/index.php
airtime_mvc/tests/application/helpers/AirtimeInstall.php
install_minimal/airtime-install
install_minimal/include/airtime-constants.php
install_minimal/include/airtime-copy-files.sh
install_minimal/include/airtime-db-install.php
install_minimal/include/airtime-initialize.sh
install_minimal/include/airtime-install.php
install_minimal/include/airtime-installed-check.php
install_minimal/include/airtime-remove-files.sh
install_minimal/include/airtime-upgrade.php
python_apps/media-monitor/install/media-monitor-copy-files.py
python_apps/monit/monit-airtime-generic.cfg
python_apps/pypo/airtime-playout
python_apps/pypo/install/pypo-copy-files.py
python_apps/pypo/liquidsoap/generate_liquidsoap_cfg.py
python_apps/pypo/liquidsoap/ls_script.liq
python_apps/pypo/pypo/__main__.py
python_apps/pypo/pypo/media/update/replaygain.py
python_apps/pypo/pypo/media/update/replaygainupdater.py
python_apps/pypo/pypo/media/update/silananalyzer.py
python_apps/python-virtualenv/airtime_virtual_env.pybundle
python_apps/python-virtualenv/requirements
utils/airtime-check-system.php
2015-05-22 16:05:29 -04:00
Duncan Sommerville
196e08fc90
Fix bug where users can't connect to Master source due to hardcoded path in liquidsoap
2015-05-21 12:49:26 -04:00
Duncan Sommerville
415a0d21f9
Add on_metadata wrapper to liquidsoap master/show sources
2015-05-15 15:46:45 -04:00
Duncan Sommerville
82c801cb79
Add on_metadata wrapper to liquidsoap master/show sources
2015-05-15 15:15:49 -04:00
drigato
e2ca218ac2
Merge remote-tracking branch 'stash/saas-four-streams' into saas-embed-player
2015-03-23 15:54:04 -04:00
Albert Santoni
cca9ba0c36
Fixed pypo config file loading
2015-03-12 19:09:00 -04:00
Albert Santoni
b49e98693b
Ignore artist_name and track_titles that aren't strings (fixes playout
...
for empty artist name or track titles)
2015-03-12 10:52:28 -04:00
Albert Santoni
a29d464eb2
SAAS-642: Files with doublequotes in their track titles fail to playout
...
(pypo->LS communication bug)
* Fixed it by escaping the command
2015-03-11 18:34:50 -04:00
Albert Santoni
0042fb50fe
Refactor some stuff related to four streams, Liquidsoap is a piece of
...
shit too - no dynamic variables
2015-03-10 19:15:38 -04:00
Albert Santoni
6232e3f4f0
Better backwards compatibility fix for 4 streams
2015-03-10 12:52:00 -04:00
Albert Santoni
968b739bf4
Make 4th stream backwards compatible with the autogenerated
...
liquidsoap.cfg
2015-03-10 12:41:45 -04:00