From 8138bd651116d4f8a20e2bdf60615e3cd9c8eaf2 Mon Sep 17 00:00:00 2001
From: isra67 <isramko@gmail.com>
Date: Wed, 1 Feb 2017 14:12:12 +0100
Subject: [PATCH] dbus command error checking

---
 evidenceup.sh      |  22 -------
 hid                | Bin 0 -> 9065 bytes
 hid_init.sh        |  15 +++++
 indoor.ini         |   4 +-
 my_lib/__init__.py |   3 +
 my_lib/itools.py   |  21 +------
 my_lib/watches.py  | 129 +++++++++++++++++++++++++++++++++++++++++
 pjindoor.py        | 139 ++++++++++-----------------------------------
 share/indoor.sh    |   3 +-
 9 files changed, 182 insertions(+), 154 deletions(-)
 delete mode 100755 evidenceup.sh
 create mode 100755 hid
 create mode 100755 hid_init.sh
 create mode 100644 my_lib/watches.py

diff --git a/evidenceup.sh b/evidenceup.sh
deleted file mode 100755
index 50fee5d..0000000
--- a/evidenceup.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/bash
-
-PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/node/bin
-
-pustaj() {
-	while true
-	do
-		## working dir
-		cd /root/test_stream/indoor
-
-		## Inoteska Evidence python App
-		/usr/bin/python indoor.py
-		sleep 5
-	done
-}
-
-sleep 1
-
-## working dir
-#cd /home/pi/is-kivy-test
-
-pustaj >& /dev/null &
diff --git a/hid b/hid
new file mode 100755
index 0000000000000000000000000000000000000000..69a6834ddb74b157a81b52fe3d05dffbde113db4
GIT binary patch
literal 9065
zcmb_h4R9OBbzTslLQxb2%A_re9Q$IEDIJsG(Sqe#u{!*fNQ<Hvl5&(f2?PR10SySC
zz)_-Hc0$^UqfG3Gv6aM0oB-`;GP0Y=C^L4eCUUDbo>bE~QzdpMY9{UQM;FSp+{zi-
zRa?dA_ubx72Sk~+)9m2k?R)Rrw|l$$_ICF^)jP1m<M9ZU%0#oEbneqa1i@Qw5~9o}
z%7a1^6|mhd8fZ_a{rH=cQ~?~x=g=B(mJQBGvK^vOxnuXz201t@=~l=jmWSFVFd=3n
zO`|Rn%Tq^;)Oo-?VibyfAl6HJ8Q4+akHSW}0+~cR>mUsQKQt?;2Qo?7K5Us$h`*Lt
z9&SZjB0koZh_)u;$;qkKaAqPl9>}HwTUdZTh=F^tb8s*IWqVk5Gl=$D5c`1kKP~_G
zcfY)E@bQ1#{?mbV(aoDbJ6!h{wAFyBKz!zPASU*)N_<9D&wAuprW(Y0)`BWQOz#7+
z&J7@9SdKFFUH-0)@{ZXrl-1S@h>n?W(ndY~b?pB7^lk5c%<uoBXQ#FH<z4NkA6<X?
z?oZaeclk)|!JmF@dg#TI{^>VsHaz^*4{i9wm!59O=bqaT7~KA@=g$8)f#OB!GcHL(
ze!wMfM1HJ9zN17YMkVGsw^X9ssswP#s=uhF{BdTSL>a@rnkfIyswD9rDUo9(@`p?0
zREhkd5?NrrL^wmXinNi*q%tBDif2=i`|l5BvypIeT%;$>tO$>#GNwpp;z@H{Oc)bc
z!vqiolBrN46$zX1R8nM&a8$%o5i=noiB#4QskD(4*@R)FMb^wjCekRw`a)SVoH0Wa
z;doLU%EV0r`U4ZGq@xdsodf+{-JyE|_pRn+zm{Q+lwqz&Ui$BWo^zXXkLi|p9Mi=s
zzJxq=wYFR)^2js2T;maSC~yS)W+0D}W0E~VjtMtMj){4k925K*a!llB$uUv$<e0oC
z$l>QCIVSkG$Wh@bas<f><e2=Y$uarQkYgg8B}X7tbhN(SBg7jOGcR58&9_><`J7cf
ze{8<u%3oRL6KLoUjxARF{S%AkwKJB=CtUfcEB`T9e$<s8aOHbk`3GG2pex_v$~U_5
z4X%8xD_`Zx`&{{J|AjW6$}fre{F2ZA^^5DZ{DM!zGm2Kre>P|N&bC@rB4<_UIqRPa
zg*V;=r9Ur(`8dW5ycYUeEoXW4WAkPD)5}7PEZtUU^Zd9_Sc!g4#;YF~p}lGeF}&o_
z@?N2RzZ{r_^XOj<zS+M*pM!m534L5)<DL8#;Mng+uog4veXXxooqBSy_n&t!?%#@b
zX}cD^;?d=O%nRiGGs{BHFX{R^s}H&c@E-75@D6Yd`~mQH0{NvXKk(Y@@&@4R^j+2v
z_|4!N?2W)RfC~*c`qj=ZU%3}`u#EnNWe?hiDfY8@>evSTsb!!3v|Z0R>R3jfTP_3c
zX5db{%2oi!c4+>3>r7M5s(E17VwK*#7zBAlexb~tU+`iaK8wDdbNTNM<`>w`X_tSt
zcc06*7xf`je%9wISB3icJdLPtz*XP9CG}09z6McmwbbRTDDur>oz<+@+v9>Tdwx@S
z&e{XL2mQ3wBUa{v*PoO9fsm=JMfulibJqR9VH_4Xrho3}e-8Z?m;My=>e-vo7C!SC
z_{0jZApH3y%DaG97#$dnhtM9g$HfPJ)9-O?@(Z2^@=NY=+fh!}cP%!fJqgrH%$?A+
z;F(&SXTlQl{HQNyZH69WxiZk0vvk<#$BQvoXZxtP%LdUdHD6SF*k<}~aQqWr>fZ<d
zWzb`fvU1Ivv&xa@{Pbfyu(YgPzB6ZC*y8k~e`el~`n~$>yib31wH>d&S9pVZkN(&q
z%lWl>>jcX<bI~h?7cLhH+fKm$o4~S9*sf=8lFw~HSK6)_V1EuhpL+^zU>Wt?KXUol
z@A!D_20r@W<A;uqjuIbdpjZ9GabtTl$JgK7z*hx)orb;%?Gea-5BY1uIqTXzcuvMw
z$5YE!n0MmJi!u5>)@07Ha^!tZ%zOjoUb!P@y}S`?7y6la5BimTdP;wFA*=uOFVu5B
z4eSYEp8<Bw|A0LT>~vYq`XV@=<=fyKM-%O3J$m~ti*x@%P0o5m+U&WHxY<lx8|=4(
z2OQja;L;_y4hP5hBCbw<*lGp88N3DjiFP&SKVH5Y@-$`kjsBD64??a)xx2vC_;U`g
zLA?Ai>T!=hUV+cQ(3!K6s(!2wK4;DkLiemEXYB>Yt9Io$+F7SPY`4L^HZg{}f#EY>
z^yjSY$`|6j1<wrZQYUoowsfE^_e1Ay3u7>d`l!DR^|hcrz5QW3=2(XZbH`op2Y_S$
zsQ3}@#~O`(@cZlSxuM2dxZ>wllqroL`exkxYoYMn1l~cn1H*CsU2u*U=U3JFU5onB
zmoB{w&{@z7-gk4L<Dgd{KMVdt@Dt!=*ngY^KMV3<Z{g|l&Ag2K1rji2eZIN3X*(vw
zCXfd5^@-U=@F1uh`5y35khia5CJJtXW<cjr{y6wa&>7H0&=t^CkTxeoGpGlIcrN%(
zwc>sL<YLwN-HR1i>nix1=tI62yl>^cj5T`Y+>`JLx&WF7wc!1X?axXxIM;(laE!}}
z298(mN&`6iL!AHIqNsT365rhesBZ`~3fd2ffv)!AJ-$D`&^MH``tn%ohK|iw=1Io9
zCyn>oOn%|depPtm!9O{*aP`wKRfrDkIrJ}HTm#?l!(6S<u#R^eS>!vvQj9MAd!euy
zxJ#ptq8<?I<z9jN0q!N+qQ=3tSUj2uAJVxu$Z&r!HGVGzeM+}=O;bYbO@_x3hGwQT
zZg@46ibo7!4uSgmd;0fu?;P&w9qAtF|NUO5#ITXZZd&UxvXM+YZKg8XNc<6Fo7NPq
zEW+OqyG@9uSZqpzk>@Dozw;x5ox9<EIDAMO3{TKow%9(@_t6n)ABr8${<^(?aK|2L
z?@x}WP>onSHkmaKr|p($%}v?6;Bf6hBN<I)wrToQlOBvsv5vLrOe#7VG2P0_y;);h
zWq{qMWdKI6Inp61X|n%%dFGIh?i>ZsZ#)t-hohO;_NJ*8@C5i>+M!I!G|)-f*kRM)
z!|}YKp?>maB5Z{MY@<mu>G#-uwRfZoeKjDu5|f6RN|`)2JrvKFli`HeW5x`Q?Y?&k
zpOU*k%y;ZRn?X#}k?=khmyXCYsEJtPy#UYn_28J-_8EExa)TpNcYIcecit<cE`ygt
zjy@*O!JKdGyXQfO8T))v2hM~wT})x`iWm_yAfCy2=Dr0KL;cL}2j}?^%Ywi)h|Lk6
zDINL(INN&#yc+WVHSu0TrMFT3|3k_T`Ofa{ZCZ1WF%}OewP0XtU`uOz@a{}H-hP)9
zMP~r8un``M3r{1m<y*y?H5Hz<p31U~zFJS6=N9iK&#j)#W%b?$Pm4zcvWF+k@EEw6
zkvyhyIH?+$v<M_IX#$;H{jFyBfFm79P6oy%<G3Y>M@4{AES!yrK=g1D{v<au(sIzq
zWO=r=VU7@jEn_5zmzi|J6oGg$j(^jb!v8n~m{QTO85V)g;oSjaDjuB@0V5U~&mcS{
zJQU7k!iObX<^Lc8@9-R+h(}Os3f`obv20cZBB_Z9BMBXShD|dQADculuy_A=iF1{s
z%efWAoa9{>=dns^<nM$6?`Iol-$lWoDG<2N$+v?mTzVFFZoqNmR8qJ;C^-LFFJt03
zaQl$Qd%;e`k$OPyV%`$Rn7IrbW3?1F2p!{wID7p@hSQd90keJi!5;!Ko`_@YMIkWe
zR3et?6ClP7ag3R2H0BQERlU@cJ_%x+G0#}jf#Zw7T`xrO2#9xG#4%R)1IJiZ{vg^i
znq=d;z!}>y7-o<sZaqlhcn!d|QqMK$5)53AR3eV)Ga!Yt;}(Y3Y>WIOj`S2r;dq~V
z4ukV8Hqc4R-!qUEj%%J-E!$m+`-X$#^G*Xd4cyx-=p^Oun~<SSKMHQ&(PEHTE#P)i
zxbHw>ar&E@0|BRO1giY^kY`zrG1p?=y($}2tNFh}eglX&uF*5U0rx8Gtd}_62^{$i
zxC^jzEQphLx$+*D^MHwM;Bzg2ls~TNQ&_x*pi_xB(l0;?cMiC7z`2HF^*JsBM?LH1
z{l<CV+|NrNOmBgh*C`+ocZbZ{|Fn_*69ivrTZzA40@tPlaODqbyG~_#KVCkS%ILyT
z#W7RKw+YVCDcF09Q4rgTF16=8pFt(_cDyHD3YTjIS>?f5ne{rY<NCzJdqF0yLrh+$
z#m84=*;8Csq@630TtB4D5tZwNl;voucc|AH5yri=Gs1-(-%{oqUB<DLxkAZ!m9mUj
z#-)@Q;qrTilw}k!&ZNv4E8|JZ>^T`XQs$`0_>eMp1Tqe!%$<R-=ev}-laTXT%5uk{
z-uGUCn<OO8Qzoyy<3RgXWeg?~=N*%`=*>ZSv#nQuUhIq{QfhqSt-^!Is`27X*$tWN
zk4)8qcCHID)!6dY5<Axynf$h0wGStslGu8yK>xnS6~0=0#U+<v<zRi9%T7GkSDC8p
z_NnpU3i6yXf%AEYzfyvqT5aD3@yinYuOO?tM%+Hz^}piuC)-bdYTwC~jWMQV)!q(Q
zdo|cO9_(ii#)Hqp^-ZQ)(T1#&J=jUoe~+vDL$E7Z`A@j)^v88orklhVvP$+~=SjPo
z58O%2Dk$`7ym_vb$uIk}#Q!C}-0W0s+mAnaU8eujE}8A;`BEl1e%D;`v6A|U=RL9;
zA9KmHr(JUCc(H!Ie`MMyz6SqF_FxB2yBbe{@q7+;C3Ae;iT&{+>}ou?bN>Nk6@T~|
zApQZe>R;M%Ik6g#9>gQttJV+h5Lmx&H9pqc_6nDL73KMSKHxTDK2^9DXRa2TA*=Y&
zF#noL?Ds)d<Lk%x_LkW9LVnGezqIc!!fz4>AagvYo%-#K6Y@-~e+G6HUmFo$kC*s+
z3bIPXpD2-Egsj@{NBjS_#Qu{K`QKc!27m9lWcshhJ4nT2P1z<<51H!?`>zIXt`9=y
zeA*A0{kaXYN-Y0SiTsBp@?((Q{dE+wTL0+pSP4E~f<Fn_JsvMW=C=|JuPT=ROILXf
z?fH>QX8ZmHvRdCZVh4G##4g$<vl;s%@_|UC4d0KQFUdG1@mLlcZ^OZ@Ef8>iHv&X5
zW_utd8l$2y{M&IChr38Pk#Kz^{OveS(s9Pjnv>(>fe5}rKG;1R8t5Mx4TT^?Q=tQi
z)L1wXisF(c8wyWO2^_%E3Bxp^fqS=Zx$nlH5RZTIJQu=YEpu4dXTDH$a$@2zinyc@
zPmM)TT$r>PQ(@ME78!~0Rzd=)5ft1pj60rC?_iJJJhoNki`+y-sOO`&4(jhl8JETW
z>MBAz2ljMz4utmX*fG*O8XE2F8tCQI+8<^k*-5+g&iC4m4)rBAD0m8$A84KLz;0tG
zgyZSz=Ud*x6j^D+y%C#j*r!?CECHR7ABT&e_R(3olO^P5X*b6H#OzjJs9cT1_v&I}
z$tUMxW6^hK-rp6QquEp_7EVSJ_(t8o2W^hVlcCA1fj++8W9(zd#h=5A{S<vuziztE
z`IvrP6GRs!;av`veHB(@RQ-6p!-f4FJ@nwg(6DhJp2f9CcOsn4;#R=^YF|{^ZmIoo
H-mU&`*@G;^

literal 0
HcmV?d00001

diff --git a/hid_init.sh b/hid_init.sh
new file mode 100755
index 0000000..3840c67
--- /dev/null
+++ b/hid_init.sh
@@ -0,0 +1,15 @@
+HID=./hid
+OUTPUT_CONTROL=0x1019
+EQ_GAIN_LOW=0x10D7
+EQ_GAIN_HIGH=0x10D8
+DSP_ENABLE_R1=0x117A
+DSP_ENABLE_R2=0x117B
+DSP_INIT_1=0x117C
+DSP_INIT_2=0x117D
+
+$HID w $OUTPUT_CONTROL 0x88
+$HID w $EQ_GAIN_LOW 0xB2
+$HID w $EQ_GAIN_HIGH 0x3F
+$HID w $DSP_ENABLE_R1 0x05
+$HID w $DSP_INIT_2 0x1
+
diff --git a/indoor.ini b/indoor.ini
index 4cfe30a..a1a6dc2 100644
--- a/indoor.ini
+++ b/indoor.ini
@@ -15,7 +15,7 @@ sip_p4ssw0rd =
 [devices]
 sound_device_in = 
 sound_device_out = 
-volume = 40
+volume = 60
 
 [gui]
 btn_call_hangup = HangUp Call
@@ -49,5 +49,5 @@ inet = dhcp
 serial = 0000000066c8dcbe
 app_name = Indoor 2.0
 app_ver = 2.0.0.0
-uptime = 21:17:15.730000
+uptime = 0:55:29.490000
 
diff --git a/my_lib/__init__.py b/my_lib/__init__.py
index def5f3f..5aaf052 100644
--- a/my_lib/__init__.py
+++ b/my_lib/__init__.py
@@ -6,3 +6,6 @@
 
 # ### tools ###
 from itools import *
+
+# ### watches classes ###
+from watches import *
diff --git a/my_lib/itools.py b/my_lib/itools.py
index e8d0b09..1082179 100644
--- a/my_lib/itools.py
+++ b/my_lib/itools.py
@@ -61,7 +61,6 @@ def whoami():
 
 def playWAV(dt):
     "start play"
-#    global RING_WAV
     send_command(RING_WAV)
 
 
@@ -83,25 +82,9 @@ def send_dbus(dst,args):
 	print whoami(), dst,args, ':', 'out:',proc
     except subprocess.CalledProcessError as e:
         print whoami(), dst,args, ':', 'ERR:',e.output
+	return False
 
-#    proc = subprocess.Popen([DBUSCONTROL_SCRIPT, dst] + args, stdout=subprocess.PIPE, shell=True)
-#    (out, err) = proc.communicate()
-#    print whoami(), dst,args, ':', 'out:',out, 'err:',err
-
-    return
-
-    errs = ''
-    outs = ''
-
-    try:
-	proc = subprocess.Popen([DBUSCONTROL_SCRIPT, dst] + args)
-	try:
-	    outs, errs = proc.communicate(timeout=2)
-	except TimeoutExpired:
-	    proc.kill()
-	    print whoami(), 'timeout'
-    except:
-	pass
+    return True
 
 
 # ##############################################################################
diff --git a/my_lib/watches.py b/my_lib/watches.py
new file mode 100644
index 0000000..8ddcb4e
--- /dev/null
+++ b/my_lib/watches.py
@@ -0,0 +1,129 @@
+#!/bin/python
+
+# ###############################################################
+#
+# Imports
+#
+# ###############################################################
+
+import kivy
+kivy.require('1.9.0')
+
+from kivy.clock import Clock
+from kivy.graphics import Color, Line, Rectangle, Ellipse
+from kivy.uix.floatlayout import FloatLayout
+from kivy.uix.label import Label
+from kivy.uix.screenmanager import Screen
+from kivy.uix.widget import Widget
+
+from math import cos, sin, pi
+
+import datetime
+
+
+
+###############################################################
+#
+# Declarations
+#
+# ###############################################################
+
+ACTIVE_DISPLAY_BACKGROUND = Color(.0,.0,.9)
+INACTIVE_DISPLAY_BACKGROUND = Color(.0,.0,.0)
+
+
+# ###############################################################
+#
+# Classes
+#
+# ###############################################################
+
+class DigiClockWidget(FloatLayout):
+    "Clock class - digital"
+    pass
+
+
+# ##############################################################################
+
+class DigiClock(Label):
+    "Label with date & time"
+    def __init__(self, **kwargs):
+        super(DigiClock, self).__init__(**kwargs)
+        Clock.schedule_interval(self.update, 1)
+
+    def update(self, *args):
+	t = datetime.datetime.now()
+        self.text = t.strftime("%H:%M:%S")
+#	if int(t.strftime('%S')) % 2:
+#            self.text = t.strftime("%H:%M:%S")
+#	else:
+#            self.text = t.strftime("%H:%M.%S")
+
+
+# ##############################################################################
+
+class MyClockWidget(FloatLayout):
+    "Clock class - analog"
+    pass
+
+
+# ##############################################################################
+
+class SetScreen(Screen):
+    "Settings screen"
+    pass
+
+
+# ##############################################################################
+
+class Ticks(Widget):
+    "Analog watches"
+#    galleryIndex = 0
+#    gallery = []
+#    ln = Label()
+
+    def __init__(self, **kwargs):
+        super(Ticks, self).__init__(**kwargs)
+        self.bind(pos = self.update_clock)
+        self.bind(size = self.update_clock)
+
+#        self.ln.pos = self.pos
+#        self.ln.size = self.size
+#        self.ln.font_size = '32sp'
+#        self.ln.text_size = self.size
+#        self.ln.halign = 'right'
+#        self.ln.valign = 'bottom'
+#        self.ln.markup = True
+
+        Clock.schedule_interval(self.update_clock, 1)
+
+
+    def update_clock(self, *args):
+        time = datetime.datetime.now()
+        self.canvas.clear()
+
+#        self.remove_widget(self.ln)
+#        self.ln.pos = self.pos
+#        self.ln.size = self.size
+##        self.ln.text = '[color=0000f0] ' + APP_NAME + ' [/color]'
+#        self.ln.text_size = self.size
+#        self.add_widget(self.ln)
+
+        with self.canvas:
+            Color(.1, .1, .6, .15)
+            Ellipse(pos={self.y + 19,self.width / 4}, size={self.width / 2, self.height - 38})
+
+            Color(0.6, 0.6, 0.9)
+            Line(points = [self.center_x, self.center_y, self.center_x+0.7*self.r*sin(pi/30*time.second),
+                self.center_y+0.7*self.r*cos(pi/30*time.second)], width=1, cap="round")
+            Color(0.5, 0.5, 0.8)
+            Line(points = [self.center_x, self.center_y, self.center_x+0.6*self.r*sin(pi/30*time.minute),
+                self.center_y+0.6*self.r*cos(pi/30*time.minute)], width=2, cap="round")
+            Color(0.4, 0.4, 0.7)
+            th = time.hour*60 + time.minute
+            Line(points = [self.center_x, self.center_y, self.center_x+0.5*self.r*sin(pi/360*th),
+            self.center_y+0.5*self.r*cos(pi/360*th)], width=3, cap="round")
+
+
+# ##############################################################################
+
diff --git a/pjindoor.py b/pjindoor.py
index 2289a56..d2f9938 100644
--- a/pjindoor.py
+++ b/pjindoor.py
@@ -14,34 +14,29 @@
 from kivy.config import Config
 from kivy.config import ConfigParser
 from kivy.core.window import Window
-from kivy.graphics import Color, Line, Rectangle, Ellipse
 #from kivy.lang import Builder
 from kivy.network.urlrequest import UrlRequest
 from kivy.uix.floatlayout import FloatLayout
 from kivy.uix.button import Button
-from kivy.uix.checkbox import CheckBox
-from kivy.uix.gridlayout import GridLayout
 from kivy.uix.label import Label
 from kivy.uix.popup import Popup
 from kivy.uix.settings import SettingsWithSidebar
 from kivy.uix.scatter import Scatter
 from kivy.uix.screenmanager import ScreenManager, Screen
-from kivy.uix.textinput import TextInput
 from kivy.uix.widget import Widget
 
-from math import cos, sin, pi
+#from math import cos, sin, pi
 
 import atexit
 import datetime
 from datetime import timedelta
-#import inspect
 import json
 
-import os
+#import os
 import signal
 import socket
 import subprocess
-import sys
+#import sys
 import time
 
 import pjsua as pj
@@ -150,95 +145,6 @@ def kill_subprocesses():
 #
 # ###############################################################
 
-class DigiClockWidget(FloatLayout):
-    "Clock class - digital"
-    pass
-
-
-# ##############################################################################
-
-class DigiClock(Label):
-    "Label with date & time"
-    def __init__(self, **kwargs):
-        super(DigiClock, self).__init__(**kwargs)
-        Clock.schedule_interval(self.update, 1)
-
-    def update(self, *args):
-	t = datetime.datetime.now()
-        self.text = t.strftime("%H:%M:%S")
-#	if int(t.strftime('%S')) % 2:
-#            self.text = t.strftime("%H:%M:%S")
-#	else:
-#            self.text = t.strftime("%H:%M.%S")
-
-
-# ##############################################################################
-
-class MyClockWidget(FloatLayout):
-    "Clock class - analog"
-    pass
-
-
-# ##############################################################################
-
-class SetScreen(Screen):
-    "Settings screen"
-    pass
-
-
-# ##############################################################################
-
-class Ticks(Widget):
-    "Analog watches"
-    galleryIndex = 0
-    gallery = []
-    ln = Label()
-
-    def __init__(self, **kwargs):
-        super(Ticks, self).__init__(**kwargs)
-        self.bind(pos = self.update_clock)
-        self.bind(size = self.update_clock)
-
-        self.ln.pos = self.pos
-        self.ln.size = self.size
-        self.ln.font_size = '32sp'
-        self.ln.text_size = self.size
-        self.ln.halign = 'right'
-        self.ln.valign = 'bottom'
-        self.ln.markup = True
-
-        Clock.schedule_interval(self.update_clock, 1)
-
-
-    def update_clock(self, *args):
-        time = datetime.datetime.now()
-        self.canvas.clear()
-
-        self.remove_widget(self.ln)
-        self.ln.pos = self.pos
-        self.ln.size = self.size
-        self.ln.text = '[color=0000f0] ' + APP_NAME + ' [/color]'
-        self.ln.text_size = self.size
-        self.add_widget(self.ln)
-
-        with self.canvas:
-            Color(.1, .1, .6, .15)
-            Ellipse(pos={self.y + 19,self.width / 4}, size={self.width / 2, self.height - 38})
-
-            Color(0.6, 0.6, 0.9)
-            Line(points = [self.center_x, self.center_y, self.center_x+0.7*self.r*sin(pi/30*time.second),
-                self.center_y+0.7*self.r*cos(pi/30*time.second)], width=1, cap="round")
-            Color(0.5, 0.5, 0.8)
-            Line(points = [self.center_x, self.center_y, self.center_x+0.6*self.r*sin(pi/30*time.minute),
-                self.center_y+0.6*self.r*cos(pi/30*time.minute)], width=2, cap="round")
-            Color(0.4, 0.4, 0.7)
-            th = time.hour*60 + time.minute
-            Line(points = [self.center_x, self.center_y, self.center_x+0.5*self.r*sin(pi/360*th),
-            self.center_y+0.5*self.r*cos(pi/360*th)], width=3, cap="round")
-
-
-# ##############################################################################
-
 class MyAccountCallback(pj.AccountCallback):
     "Callback to receive events from account"
     def __init__(self, account=None):
@@ -328,9 +234,9 @@ def on_media_state(self):
             call_slot = self.call.info().conf_slot
             pj.Lib.instance().conf_connect(call_slot, 0)
             pj.Lib.instance().conf_connect(0, call_slot)
-            print "Media is now active"
-        else:
-            print "Media is inactive"
+#            print "Media is now active"
+#        else:
+#            print "Media is inactive"
 
 
 def make_call(uri):
@@ -781,6 +687,16 @@ def callback_set_voice(self, value):
 	    send_command(SETVOLUME_SCRIPT + ' ' + str(AUDIO_VOLUME))
 
 
+    def restart_player_window(self, idx):
+	"process is bad - restart"
+	self.dbg(whoami()+': '+str(idx))
+
+	self.displays[idx].hidePlayer()
+	send_command("ps aux | grep omxplayer"+str(idx)+" | grep -v grep | awk '{print $2}' | xargs kill -9")
+	procs[idx].kill()
+	send_command(CMD_KILL + str(procs[idx].pid))
+
+
     def on_touch_up(self, touch):
 	"process touch up event"
 	global active_display_index
@@ -793,12 +709,13 @@ def on_touch_up(self, touch):
 	if len(procs) == 0: return
 
 	if touch.is_double_tap:
-	    print 'double touch: ', touch.x, touch.y, touch.is_double_tap
-            send_dbus(DBUS_PLAYERNAME + str(active_display_index), TRANSPARENCY_VIDEO_CMD + [str(0)])
-	    self.displays[active_display_index].hidePlayer()
-	    send_command("ps aux | grep omxplayer"+str(active_display_index)+" | grep -v grep | awk '{print $2}' | xargs kill -9")
-	    procs[active_display_index].kill()
-	    send_command(CMD_KILL + str(procs[active_display_index].pid))
+##	    print 'double touch: ', touch.x, touch.y, touch.is_double_tap
+##            send_dbus(DBUS_PLAYERNAME + str(active_display_index), TRANSPARENCY_VIDEO_CMD + [str(0)])
+#	    self.displays[active_display_index].hidePlayer()
+#	    send_command("ps aux | grep omxplayer"+str(active_display_index)+" | grep -v grep | awk '{print $2}' | xargs kill -9")
+#	    procs[active_display_index].kill()
+#	    send_command(CMD_KILL + str(procs[active_display_index].pid))
+	    self.restart_player_window(active_display_index)
 	    return
 
 	self.startScreenTiming()
@@ -821,8 +738,8 @@ def showPlayers(self):
 	self.dbg(whoami())
 
         for idx, proc in enumerate(procs):
-            send_dbus(DBUS_PLAYERNAME + str(idx), TRANSPARENCY_VIDEO_CMD + [str(255)])
-#	    self.displays[idx].setActive(False)
+            if not send_dbus(DBUS_PLAYERNAME + str(idx), TRANSPARENCY_VIDEO_CMD + [str(255)]):
+		self.restart_player_window(idx)
 
 	self.displays[active_display_index].setActive()
 
@@ -833,7 +750,9 @@ def hidePlayers(self):
 
         for idx, proc in enumerate(procs):
 	    self.displays[idx].hidePlayer()
-            send_dbus(DBUS_PLAYERNAME + str(idx), TRANSPARENCY_VIDEO_CMD + [str(0)])
+            if not send_dbus(DBUS_PLAYERNAME + str(idx), TRANSPARENCY_VIDEO_CMD + [str(0)]):
+		self.restart_player_window(idx)
+
 
     def setButtons(self, visible):
 	"set buttons (ScrSaver, Options, Voice+-) to accurate state"
@@ -987,7 +906,7 @@ def get_volume_value(self):
 	elif vol > 20: vol = 40
 	else: vol = 20
 	AUDIO_VOLUME = vol
-	print s, vol
+#	print s, vol
 
 	return vol
 
diff --git a/share/indoor.sh b/share/indoor.sh
index fe778bd..5db01a3 100755
--- a/share/indoor.sh
+++ b/share/indoor.sh
@@ -17,6 +17,7 @@ pustaj() {
 sleep 1
 
 ## working dir
-#cd /home/pi/is-kivy-test
+cd /root/test_stream/indoor
+./hid_init.sh
 
 pustaj >& /dev/null &