Merge branch 'master' of gitlab.com:hugvey/hugvey

This commit is contained in:
Ruben van de Ven 2019-01-30 18:00:57 +01:00
commit da6c13ef1f
1 changed files with 14 additions and 4 deletions

View File

@ -7,10 +7,14 @@ import socket
import threading
import time
import yaml
import alsaaudio
import zmq
from zmq.asyncio import Context
try:
import alsaaudio
except ImportError:
print("No volume settings available")
from .communication import zmqReceive, zmqSend, getTopic
import subprocess
@ -246,8 +250,14 @@ class Hugvey(object):
def getId(self) -> int:
"""Get Hugvey ID from hostname"""
h = socket.gethostname()
return int(re.findall('\d+', h )[0])
try:
h = socket.gethostname()
id = int(re.findall('\d+', h )[0])
except Exception:
logger.critical("No automatic ID, fall back to 1")
id = 1
return id
def loadConfig(self, filename):
with open(filename, 'r') as fp:
@ -260,7 +270,7 @@ class Hugvey(object):
def start(self):
loop = asyncio.get_event_loop()
if self.config['voice']['play_device']:
if self.config['voice']['play_device'] and 'alsaaudio' in sys.modules:
alsaaudio.Mixer(self.config['voice']['play_device']).setvolume(self.config['voice']['play_volume'])
self.voice_server = VoiceServer(