modified: mycroft/configuration/mycroft.conf

modified:   mycroft/util/__init__.py
pull/520/head
Karl Fezer 2017-02-14 16:50:53 -08:00 committed by Arron Atchison
parent fb2f8e11ef
commit a691003071
2 changed files with 19 additions and 3 deletions

View File

@ -8,6 +8,8 @@
"start_listening": "snd/start_listening.wav",
"end_listening": "snd/end_listening.wav"
},
"play_wav_cmdline": "aplay %1",
"play_mp3_cmdline": "mpg123 %1",
"location": {
"city": {
"code": "Lawrence",
@ -33,7 +35,7 @@
}
},
"skills": {
"directory": "~/.mycroft/skills",
"directory": "/opt/mycroft/skills/",
"stop_threshold": 2.0
},
"server": {

View File

@ -24,9 +24,13 @@ import os
import os.path
import psutil
from os.path import dirname
from mycroft.util.log import getLogger
import mycroft.configuration
__author__ = 'jdorleans'
LOGGER = getLogger(__name__)
def resolve_resource_file(res_name):
"""Convert a resource into an absolute filename.
@ -75,11 +79,21 @@ def resolve_resource_file(res_name):
def play_wav(uri):
return subprocess.Popen(["aplay", get_http(uri)])
play_cmd = mycroft.configuration.ConfigurationManager.get().get("play_wav_cmdline")
play_wav_cmd = str(play_cmd).split(" ")
for index, cmd in enumerate(play_wav_cmd):
if cmd == "%1":
play_wav_cmd[index] = (get_http(uri))
return subprocess.Popen(play_wav_cmd)
def play_mp3(uri):
return subprocess.Popen(["mpg123", get_http(uri)])
play_cmd = mycroft.configuration.ConfigurationManager.get().get("play_mp3_cmdline")
play_mp3_cmd = str(play_cmd).split(" ")
for index, cmd in enumerate(play_mp3_cmd):
if cmd == "%1":
play_mp3_cmd[index] = (get_http(uri))
return subprocess.Popen(play_mp3_cmd)
def record(file_path, duration, rate, channels):