From 922fc08387555c784f7191d022aac0a3f7dd0af3 Mon Sep 17 00:00:00 2001
From: Gottfried Gaisbauer <gogo@servus.at>
Date: Thu, 12 Apr 2018 20:24:54 +0200
Subject: [PATCH] changes in lqs (up to 5 outs and 5 stream outs possible),
 adapted requirements and README

---
 README.md        | 34 ++++++++++++++++++++++++++--------
 requirements.txt |  7 +++----
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 337a71f..7fb7e20 100644
--- a/README.md
+++ b/README.md
@@ -23,9 +23,8 @@ On a debian machine:
 sudo apt install \
     git \
     python3 python3-pip \
-    redis-server redis-tools \
+    redis-server \
     liquidsoap liquidsoap-plugin-alsa liquidsoap-plugin-flac liquidsoap-plugin-icecast liquidsoap-plugin-pulseaudio \
-    libev4 libev-dev \
     mariadb-server libmariadbclient-dev \
     quelcom
 ```
@@ -35,16 +34,16 @@ sudo apt install \
 
 ```bash
 sudo pip3 install \
-    Flask Flask-Babel Flask-SQLAlchemy Flask-WTF \
-    mysqlclient redis simplejson mutagen
-    pyev python-dateutil
+    Flask Flask-SQLAlchemy \
+    mysqlclient redis simplejson \
+    mutagen validators
 ```
 
-#### get the code
+#### Grab the code
 
 git clone https://gitlab.servus.at/autoradio/engine
 
-#### Set Up a database
+#### Set up a database
 
 ```bash
 mysql -u root -p
@@ -61,7 +60,8 @@ Create the audio folder defined in your aura.ini
 ```bash
 mkdir /var/audio
 mkdir /etc/aura
-cp {where you cloned the repo}/configuration/aura.ini /etc/aura/aura.ini
+cp {where you cloned the repo}/configuration/engine.ini /etc/aura/engine.ini
+edit engine.ini to your needs
 ```
 
 edit installation dir and database settings in aura.ini
@@ -87,3 +87,21 @@ AURA Engine ist tested with an ASUS Xonar DGX. It should work with every by ALSA
 #### Hard/Soft
 
 When you use ALSA, you will have to play around with ALSA settings. In the folder ./modules/liquidsoap is a scipt called alsa_settings_tester.liq. You can start it with 'liquidsoap -v --debug alsa_settings_tester.liq'. Changing and playing with settings can help you to find correct ALSA settings. 
+
+### Recordings
+
+You can configure up to five recorders. You find the settings in the main config file engine.ini. You can choose between wav, flac, ogg or mp3 output
+
+### Streams
+
+You can configure up to five streams. You find the settings in the engine.ini. You can choose between aac, aacplus, fdkaac, flac, mp3, ogg, opus stream
+
+If you experience 'hangs' on the stream
+ * reduce the quality or
+ * invest in better hardware or
+ * install the realtime kernel
+   ```bash
+   apt install linux-image-rt-amd64
+   reboot
+   ```
+   Should be sufficient.
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index 8775dc8..cce67df 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,10 +1,9 @@
 Flask==0.12.2
 Flask-Babel==0.11.2
-Flask-SQLAlchemy==2.2
-Flask-WTF==0.14.2
+Flask-SQLAlchemy==2.3.2
 mysqlclient==1.3.7
-redis==2.10.5
+redis==2.10.6
 simplejson==3.11.1
-mutagen==1.38
+mutagen==1.40
 python-dateutil==2.6.0
 validators==0.12.1
-- 
GitLab