Skip to content

Commit

Permalink
Updated location of play files
Browse files Browse the repository at this point in the history
  • Loading branch information
DavidWatkins committed Dec 8, 2017
1 parent de3d9eb commit ea56659
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
Empty file modified scripts/next.wav
100644 → 100755
Empty file.
20 changes: 11 additions & 9 deletions scripts/switch_controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import time
import sys
import socket
import os

import Tkinter as Tk

Expand Down Expand Up @@ -130,12 +131,12 @@ def get_rms( self, block ):
class AudioOutput(object):
def __init__(self):
pygame.init()
self.waiting_file = 'waiting.wav'
self.next_file = 'next.wav'
self.select_file = 'select.wav'
self.reset_file = 'reset.wav'
self.sent_next_file = 'sent_next.wav'
self.sent_select_file = 'sent_select.wav'
self.waiting_file = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'waiting.wav')
self.next_file = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'next.wav')
self.select_file = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'select.wav')
self.reset_file = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'reset.wav')
self.sent_next_file = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'sent_next.wav')
self.sent_select_file = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'sent_select.wav')

self.previous_file = ''
self.has_played_reset = False
Expand All @@ -156,15 +157,16 @@ def playSelect(self):

def playReset(self):
self.has_played_reset = True
self.previous_file = ""

def playWaiting(self):
pass
self.previous_file = ""

def playSentNext(self):
pass
self.previous_file = ""

def playSentSelect(self):
pass
self.previous_file = ""

class Communicator(object):
WAIT_THRESHOLD = 0.1
Expand Down

0 comments on commit ea56659

Please sign in to comment.