channel 12 for musicstar. fix up volume code

Author: jrcichra

internal/client/client.go

@@ -164,16 +164,17 @@ func sendNotesClient(wg *sync.WaitGroup, closedChan chan struct{}, conn net.Conn
 	var t *timer.Timer
 	if !dontControlVolume {
 		t = &timer.Timer{}
-		timeout := t.New(10) // 10 seconds
+		timeout := t.New(5)
 		t.Start()
 
 		go func() {
-			// reset the volume on the timeout
-			for range timeout {
+			for {
+				<-timeout
 				go volume.SetVolume(common.HIGH_VOLUME)
 				// make a new timer and overwrite the channel
 				t = &timer.Timer{}
-				timeout = t.New(10) // 10 seconds
+				timeout = t.New(5)
+				t.Start()
 			}
 		}()
 	}
@@ -189,11 +190,6 @@ func sendNotesClient(wg *sync.WaitGroup, closedChan chan struct{}, conn net.Conn
 			continue
 		}
 
-		if !dontControlVolume {
-			go volume.SetVolume(common.LOW_VOLUME)
-			t.Reset()
-		}
-
 		go func() {
 			if delay > 0 {
 				time.Sleep(time.Duration(delay) * time.Millisecond)
@@ -217,6 +213,11 @@ func sendNotesClient(wg *sync.WaitGroup, closedChan chan struct{}, conn net.Conn
 						notesChan <- msg
 						reconnect = true
 					}
+					if !dontControlVolume {
+						go volume.SetVolume(common.LOW_VOLUME)
+						t.Reset()
+					}
+
 				}
 			case channel.NoteOff:
 				channel := channels.CheckChannel(v.Channel(), csvRecords)

pkg/timer/timer.go

@@ -10,37 +10,45 @@ type Timer struct {
 	secondsLeft      int64
 	resetChan        chan struct{}
 	doneChan         chan struct{}
+	internalDoneChan chan struct{}
 }
 
 func (t *Timer) New(seconds int64) chan struct{} {
 	t.requestedSeconds = seconds
 	t.secondsLeft = seconds
-	t.resetChan = make(chan struct{}, 10) // don't block on a reset message if we're sleeping
+	t.resetChan = make(chan struct{})
 	t.doneChan = make(chan struct{})
 	return t.doneChan
 }
 
 func (t *Timer) Start() {
 	go func() {
 		for {
-			select {
-			// see if a reset is requested
-			case <-t.resetChan:
-				// reset the timer
-				t.secondsLeft = t.requestedSeconds
-			default:
-			}
 
 			if t.secondsLeft <= 0 {
 				t.doneChan <- struct{}{}
+				t.internalDoneChan <- struct{}{}
 				return
 			}
-
 			// Sleep and subtract a second
 			time.Sleep(1 * time.Second)
 			t.secondsLeft -= 1
 		}
 	}()
+
+	go func() {
+		for {
+			// see if a reset is requested
+			select {
+			case <-t.resetChan:
+				// reset the timer
+				t.secondsLeft = t.requestedSeconds
+			case <-t.internalDoneChan:
+				return
+			}
+		}
+	}()
+
 }
 
 func (t *Timer) Reset() {

profiles/wosp/channels.csv

@@ -10,7 +10,7 @@
 9,0,0
 10,0,0
 11,0,0
-12,0,0
+12,12,0
 13,0,0
 14,0,0
 15,3,-12