From 1405c73c87bca5bd7a3cf80ac55bdc038947ac74 Mon Sep 17 00:00:00 2001
From: Alexander Grothe <seahawk1986@gmx.de>
Date: Sun, 17 Dec 2017 10:02:09 +0100
Subject: [PATCH] Install vdr-plugin-pulsectrl and vdr-plugin-osd2web

use the bluecd instead of blue
---
 Manual.org                                                 | 6 ++++--
 roles/pulseaudio/tasks/main.yml                            | 3 ++-
 roles/yavdr-xorg/tasks/setup-xorg.yml                      | 3 ++-
 roles/yavdr-xorg/templates/systemd/user/osd2web.service.j2 | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Manual.org b/Manual.org
index 3026974..76df4d6 100644
--- a/Manual.org
+++ b/Manual.org
@@ -1021,7 +1021,7 @@ install_avahi: true
 #+BEGIN_SRC yaml :tangle roles/pulseaudio/tasks/main.yml :mkdirp yes :padline no
 ---
 
-- name: apt | install pulseaudio and pavucontrol
+- name: apt | install pulseaudio, pavucontrol and vdr-plugin-pulsectrl
   apt:
     name: '{{ item }}'
     state: present
@@ -1029,6 +1029,7 @@ install_avahi: true
   with_items:
     - pulseaudio
     - pavucontrol
+    - vdr-plugin-pulsectrl
 
 - name: create /etc/asound.conf with pulseaudio as default device
   template:
@@ -1527,6 +1528,7 @@ b'\xde\xad\xbe\xef'
     - read-edid
     - tmux
     - vdr-plugin-desktop
+    - vdr-plugin-osd2web
     #- yavdr-xorg
 
 - name: apt | install desktop programs
@@ -2139,7 +2141,7 @@ ConditionFileNotEmpty=%h/.second_display
 [Service]
 EnvironmentFile=%h/.second_display
 PassEnvironment=XDG_RUNTIME_DIR DBUS_SESSION_BUS_ADDRESS
-ExecStart=/usr/bin/on_vdr -o -c 'kiosk-browser "http://localhost:4444/skins/horchiTft/index.html?theme=blue&onlyView=1"'
+ExecStart=/usr/bin/on_vdr -o -c 'kiosk-browser "http://localhost:4444/skins/horchiTft/index.html?theme=bluecd&onlyView=1"'
 KillSignal=SIGINT
 
 [Install]
diff --git a/roles/pulseaudio/tasks/main.yml b/roles/pulseaudio/tasks/main.yml
index c212d7e..f9f68cd 100644
--- a/roles/pulseaudio/tasks/main.yml
+++ b/roles/pulseaudio/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 
-- name: apt | install pulseaudio and pavucontrol
+- name: apt | install pulseaudio, pavucontrol and vdr-plugin-pulsectrl
   apt:
     name: '{{ item }}'
     state: present
@@ -8,6 +8,7 @@
   with_items:
     - pulseaudio
     - pavucontrol
+    - vdr-plugin-pulsectrl
 
 - name: create /etc/asound.conf with pulseaudio as default device
   template:
diff --git a/roles/yavdr-xorg/tasks/setup-xorg.yml b/roles/yavdr-xorg/tasks/setup-xorg.yml
index feeb77d..92c4a9c 100644
--- a/roles/yavdr-xorg/tasks/setup-xorg.yml
+++ b/roles/yavdr-xorg/tasks/setup-xorg.yml
@@ -32,7 +32,7 @@
 - name: vdr-config | start softhddevice detached and set audio to pulseaudio
   lineinfile:
     path: /etc/vdr/conf.avail/softhddevice.conf
-    line: '{{ item }}'
+    line: '{{ item }}ys
   with_items:
       - '-D'
       # - '-a pulse' # do we need this with our existing asound.conf?
@@ -61,6 +61,7 @@
     - read-edid
     - tmux
     - vdr-plugin-desktop
+    - vdr-plugin-osd2web
     #- yavdr-xorg
 
 - name: apt | install desktop programs
diff --git a/roles/yavdr-xorg/templates/systemd/user/osd2web.service.j2 b/roles/yavdr-xorg/templates/systemd/user/osd2web.service.j2
index 71e08ad..fef6f5f 100644
--- a/roles/yavdr-xorg/templates/systemd/user/osd2web.service.j2
+++ b/roles/yavdr-xorg/templates/systemd/user/osd2web.service.j2
@@ -7,7 +7,7 @@ ConditionFileNotEmpty=%h/.second_display
 [Service]
 EnvironmentFile=%h/.second_display
 PassEnvironment=XDG_RUNTIME_DIR DBUS_SESSION_BUS_ADDRESS
-ExecStart=/usr/bin/on_vdr -o -c 'kiosk-browser "http://localhost:4444/skins/horchiTft/index.html?theme=blue&onlyView=1"'
+ExecStart=/usr/bin/on_vdr -o -c 'kiosk-browser "http://localhost:4444/skins/horchiTft/index.html?theme=bluecd&onlyView=1"'
 KillSignal=SIGINT
 
 [Install]