sound: play any pending sounds on restart.

abort a little  more quickly if something goes wrong,
and check for sounds on restart.

diff --git a/sound/sound.c b/sound/sound.c
index b83dbe25dad17c0e67f076123c0a18e415ea9662..664510e6906603fdbfe3766a6845a11841fb614b 100644 (file)
--- a/sound/sound.c
+++ b/sound/sound.c
@@ -724,7 +724,7 @@ void play_buf(struct dev *dev)
        if (dev->present == dev->period_bytes) {
                if (dev->attenuate)
                        scale_buf(dev);
-               alarm(30);
+               alarm(8);
                snd_pcm_writei(dev->handle,
                               dev->period_buf,
                               dev->period_bytes / dev->sample_bytes);
@@ -854,12 +854,12 @@ int main(int argc, char *argv[])
        suspend_watch(suspend, NULL, &soundqueue);
        signal_set(&ev, SIGIO, do_scan, &soundqueue);
        signal_add(&ev, NULL);
-       fcntl(dfd, F_NOTIFY, DN_CREATE|DN_DELETE|DN_RENAME);
 
        event_set(&work_ev, -1, 0, do_work, &soundqueue);
 
        memset(&dev, 0, sizeof(dev));
 
+       do_scan(-1, 0, (void*)&soundqueue);
        suspend_allow(suspend_handle);
        event_loop(0);
        exit(0);