--- a/trunk/synth/riffdisp.srp
+++ b/trunk/synth/riffdisp.srp
@@ -62,12 +62,6 @@
 all_riffs = [[riff0v1, riff0v2], [riff1v1, riff1v2]]
 
 
-# For testing:
-def solo_next_handler(rest ignore)
-    riffdisp.state = 'solo_next' if riffdisp.state != 'solo_next' else nil
-def solo_now_handler(rest ignore)
-    riffdisp.state = 'solo' if riffdisp.state != 'solo' else nil
-
 class Riffdisp
     var state // nil, 'preroll', 'solo_next', 'solo', 'riff'
     var solo_request_checkbox
@@ -103,10 +97,6 @@
         actual_beat_of_next_riff_index = 32
         selected_riff_index = 0 // set this one
         drumming_id = 0
-        solo_next_button = Button(0, "next", 470, 135, 40, 20)
-        solo_next_button.method = 'solo_next_handler'
-        solo_now_button = Button(0, "solo", 510, 135, 40, 20)
-        solo_now_button.method = 'solo_now_handler'
 
         state = nil
         exactbeat = -100.0
@@ -404,7 +394,9 @@
         var old = curbeat
         curbeat = (int(b + EPSILON) if b >= 0 else int(b + EPSILON - 1))
 
-        if old != curbeat: // a new beat
+        // play clicks for the drummer (index = 1) or for user in stand_alone
+        if old != curbeat and (synth_my_real_index == 1 or
+                               stand_alone): // a new beat
             # display "beat calls synth_set_some_state"
             synth_set_some_state(2, 61, 100)
             // turn the drum off in 1/2 beat
@@ -416,11 +408,22 @@
                 state = 'solo'
             elif state == 'solo'
                 state = 'riff'
+            if stand_alone: // practice mode
+                if curbeat % 32 == 0: // every 2 cycles, change riff
+                    selected_riff_index = 1 - selected_riff_index
         if drumming_id != id
             return // we're done, maybe set some state here?
         pianoroll.refresh(t)
         // 20 frames/sec = 1200 fpm. Tempo = 100 bpm, so 12 frames/beat
         vtsched.cause(DRUM_BEAT_PERIOD / 12, this, 'beat', b + 1/12, id)
 
+    def start_practice(flag):
+        display "start_practice", flag
+        if flag:
+            start(get_server_time() + 1)
+        else:
+            stop(get_server_time())
+
+
 riffdisp = Riffdisp()