Examples: rename "q" to "rb"

... in oder to avoid confusion with the built-in queue.Queue and
becauase PortAudio also calls it "ring buffer" and not "queue".

Author: mgeier

examples/delay.py

@@ -10,18 +10,18 @@
 samplerate = 48000
 safety = 0.1  # Shouldn't be less than the duration of an audio block
 
-qsize = 2**math.ceil(math.log2((delay + safety) * samplerate))
+rb_size = 2**math.ceil(math.log2((delay + safety) * samplerate))
 
 stream = rtmixer.MixerAndRecorder(
     channels=channels, blocksize=blocksize, samplerate=samplerate,
     latency=latency)
 with stream:
     samplesize = 4
     assert {samplesize} == set(stream.samplesize)
-    q = rtmixer.RingBuffer(samplesize * channels, qsize)
+    rb = rtmixer.RingBuffer(samplesize * channels, rb_size)
     start = stream.time + safety
-    stream.record_ringbuffer(q, start=start, allow_belated=False)
-    stream.play_ringbuffer(q, start=start + delay, allow_belated=False)
+    stream.record_ringbuffer(rb, start=start, allow_belated=False)
+    stream.play_ringbuffer(rb, start=start + delay, allow_belated=False)
     # TODO: check if start was successful
     print('#' * 80)
     print('press Return to quit')

examples/play_file.py

@@ -11,30 +11,30 @@
 playback_blocksize = 256
 latency = 0
 reading_blocksize = 1024
-reading_qsize = 16  # Number of blocks, has to be power of two
+rb_size = 16  # Number of blocks, has to be power of two
 
 with sf.SoundFile(filename) as f:
     with rtmixer.Mixer(channels=f.channels,
                        blocksize=playback_blocksize,
                        samplerate=f.samplerate, latency=latency) as m:
         elementsize = f.channels * m.samplesize
-        q = rtmixer.RingBuffer(elementsize, reading_blocksize * reading_qsize)
+        rb = rtmixer.RingBuffer(elementsize, reading_blocksize * rb_size)
         # Pre-fill ringbuffer:
-        _, buf, _ = q.get_write_buffers(reading_blocksize * reading_qsize)
+        _, buf, _ = rb.get_write_buffers(reading_blocksize * rb_size)
         written = f.buffer_read_into(buf, dtype='float32')
-        q.advance_write_index(written)
-        action = m.play_ringbuffer(q)
+        rb.advance_write_index(written)
+        action = m.play_ringbuffer(rb)
         while True:
-            while q.write_available < reading_blocksize:
+            while rb.write_available < reading_blocksize:
                 if action not in m.actions:
                     break
                 sd.sleep(int(1000 * reading_blocksize / f.samplerate))
             if action not in m.actions:
                 break
-            size, buf1, buf2 = q.get_write_buffers(reading_blocksize)
+            size, buf1, buf2 = rb.get_write_buffers(reading_blocksize)
             assert not buf2
             written = f.buffer_read_into(buf1, dtype='float32')
-            q.advance_write_index(written)
+            rb.advance_write_index(written)
             if written < size:
                 break
         m.wait(action)