From f07699e5cd786b06ff40aa044a659c9ada91a978 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 25 Jul 2013 15:51:42 +0200 Subject: [PATCH] decrease stop bouncetime --- piplayer.py => piplayer | 14 +++++++------- audio_player_osc.py => tools/audio_player_osc.py | 0 osc_play.py => tools/osc_play.py | 0 osc_stop.py => tools/osc_stop.py | 0 4 files changed, 7 insertions(+), 7 deletions(-) rename piplayer.py => piplayer (96%) mode change 100644 => 100755 rename audio_player_osc.py => tools/audio_player_osc.py (100%) rename osc_play.py => tools/osc_play.py (100%) rename osc_stop.py => tools/osc_stop.py (100%) diff --git a/piplayer.py b/piplayer old mode 100644 new mode 100755 similarity index 96% rename from piplayer.py rename to piplayer index df714cd..5ec1037 --- a/piplayer.py +++ b/piplayer @@ -68,9 +68,9 @@ class GPIOController(Thread): self.server.setmode(self.server.BCM) self.method = self.server.PUD_DOWN - def add_channel_callback(self, channel, callback): + def add_channel_callback(self, channel, callback, bouncetime): self.server.setup(channel, self.server.IN, pull_up_down=self.method) - self.server.add_event_detect(channel, self.method, callback=callback, bouncetime=3000) + self.server.add_event_detect(channel, self.method, callback=callback, bouncetime=bouncetime) def run(self): pass @@ -84,10 +84,10 @@ class PiPlayer(object): playing = False looping = False auto_next = False - alsa_device = 'hw:1' + alsa_device = 'hw:0' - - def __init__(self, play_dir): + def __init__(self, play_dir): + # Playlist self.play_dir = play_dir self. playlist = [] self.set_playlist() @@ -100,8 +100,8 @@ class PiPlayer(object): # GPIO controller self.gpio_controller = GPIOController() - self.gpio_controller.add_channel_callback(self.gpio_channel_play, self.gpio_play) - self.gpio_controller.add_channel_callback(self.gpio_channel_stop, self.gpio_stop) + self.gpio_controller.add_channel_callback(self.gpio_channel_play, self.gpio_play, 3000) + self.gpio_controller.add_channel_callback(self.gpio_channel_stop, self.gpio_stop, 1000) self.gpio_controller.start() # The pipeline diff --git a/audio_player_osc.py b/tools/audio_player_osc.py similarity index 100% rename from audio_player_osc.py rename to tools/audio_player_osc.py diff --git a/osc_play.py b/tools/osc_play.py similarity index 100% rename from osc_play.py rename to tools/osc_play.py diff --git a/osc_stop.py b/tools/osc_stop.py similarity index 100% rename from osc_stop.py rename to tools/osc_stop.py -- 2.39.5