soundstage tweaks+kevwatcher added

diff --git a/sound_stage/sound_stage b/sound_stage/sound_stage
index 8f76552f1ccf45874b3f3e130a8e40b264d0dc71..b1f4356d493f2b3c5eb623d052968d1e51d7b301 100755 (executable)
--- a/sound_stage/sound_stage
+++ b/sound_stage/sound_stage
@@ -27,10 +27,12 @@ class gs:
                'alsa_out_2'    :21,
                'alsa_out_3'    :21,
                'alsa_out_4'    :21,
+        'alsa_in_2'    :21,
                'pulseaudio'    :21,
                'qjackctl'              :0,
                'kmix'                  :0,
                'conky'                 :0,
+               'kwatch'                :0,
                }
 
 class daemon:
@@ -78,7 +80,6 @@ class daemon:
                                        break
                                if gs.debug > 2: print ('%s not yet running for %s...'%(requirement,self.__class__.__name__))
 
-
        def monitor_depends(self):
                status=True
                for requirement in self.depends:
@@ -158,7 +159,7 @@ class jackd(daemon):
        def __init__(self):
                super().__init__()
                self.hardclean=True
-               self.arguments=['/usr/bin/jackd','-R','-P41','-dalsa','-Chw:1,0','-Phw:1,0','-r48000','-p1024','-n2']
+               self.arguments=['/usr/bin/jackd','-R','-P41','-dalsa','-Phw:1,0','-r48000','-p1024','-n2']
 #              self.arguments=['/usr/bin/chrt','55','/usr/bin/jackd','-ddummy','-C0','-P0','-r48000','-p1024']
                self.postrun=['volumes_3','tv_on','chrt']
 
@@ -247,6 +248,13 @@ class alsa_in_1(daemon):
                self.depends=['jackd']
                self.postrun=['chrt']
 
+class alsa_in_2(daemon):
+       def __init__(self):
+               super().__init__()
+               self.arguments=['/usr/bin/alsa_in','-j','ALSA Capture 2','-d','hw:1,2','-c','2']
+               self.depends=['jackd']
+               self.postrun=['chrt']
+
 class kmix(daemon):
        def __init__(self):
                super().__init__()
@@ -262,6 +270,13 @@ class conky(daemon):
                self.arguments=['/usr/bin/conky']
                self.depends=['jalv_2']
 
+class kwatch(daemon):
+       def __init__(self):
+               super().__init__()
+               self.hardclean=True
+               self.arguments=['/home/%s/bin/kevwatcher'%getuser()]
+               self.depends=['pulseaudio']
+
 daemons={
                'jackd'                                 :jackd,
                'qjackctl'                              :qjackctl,
@@ -273,11 +288,13 @@ daemons={
                'jalv_5'                                :jalv_5,
 #              'alsa_out_1'                    :alsa_out_1,
                'alsa_out_2'                    :alsa_out_2,
-               'alsa_out_3'                    :alsa_out_3,
-               'alsa_out_4'                    :alsa_out_4,
-#              'alsa_in_1'                             :alsa_in_1,
+#              'alsa_out_3'                    :alsa_out_3,
+#              'alsa_out_4'                    :alsa_out_4,
+               'alsa_in_1'                             :alsa_in_1,
+#              'alsa_in_2'                             :alsa_in_2,
                'kmix'                                  :kmix,
                'conky'                                 :conky,
+               'kwatch'                                :kwatch,
                }
 
 class assist:
@@ -301,23 +318,23 @@ class assist:
 
 class xdotool_1(assist):
        def __init__(self,*arg):
-               self.args=['xdotool','search','--name','EQ4Q Stereo','set_window','--name','Front Speakers','windowmove','1920','0']
+               self.args=['xdotool','search','--name','EQ10Q Stereo','set_window','--name','Front Speakers','windowmove','2375','0']
 
 class xdotool_2(assist):
        def __init__(self,*arg):
-               self.args=['xdotool','search','--name','EQ4Q Stereo','set_window','--name','Aux Speakers','windowmove','2110','0']
+               self.args=['xdotool','search','--name','EQ10Q Stereo','set_window','--name','Aux Speakers','windowmove','2485','0']
 
 class xdotool_3(assist):
        def __init__(self,*arg):
-               self.args=['xdotool','search','--name','EQ4Q Stereo','set_window','--name','Rear Speakers','windowmove','2300','0']
+               self.args=['xdotool','search','--name','EQ10Q Stereo','set_window','--name','Rear Speakers','windowmove','2595','0']
 
 class xdotool_4(assist):
        def __init__(self,*arg):
-               self.args=['xdotool','search','--name','EQ10Q Stereo','set_window','--name','Headphones','windowmove','2324','0']
+               self.args=['xdotool','search','--name','EQ10Q Stereo','set_window','--name','Headphones','windowmove','2705','0']
 
 class xdotool_5(assist):
        def __init__(self,*arg):
-               self.args=['xdotool','search','--name','EQ10Q Stereo','set_window','--name','Microphone','windowmove','2514','0']
+               self.args=['xdotool','search','--name','EQ10Q Stereo','set_window','--name','Microphone','windowmove','2815','0']
 
 class xdotool_6(assist):
        def run(self):
@@ -430,7 +447,7 @@ def init():
        for init_me in daemons:
                current=daemons[init_me]()
                if not os.path.exists(current.basepath):
-                       os.mkdirs(current.basepath)
+                       os.mkdir(current.basepath)
                if os.path.exists(current.pidfile):
                        file=open(current.pidfile,'r')
                        pid=file.read()