repo moved from gwillen/solstice-audio-test to jeffkaufman/bucket-bri…

…gade

README.md

@@ -1,4 +1,4 @@
-# solstice-audio-test
+# Bucket Brigade
 
 Bucket-brigade singing implementation
 
@@ -10,8 +10,8 @@ dependencies in your global Python environment. This is probably
 fine.)
 
 ```
-git clone https://github.com/gwillen/solstice-audio-test.git
-cd solstice-audio-test
+git clone https://github.com/jeffkaufman/bucket-brigade.git
+cd bucket-brigade
 virtualenv venv # optional
 . venv/bin/activate # optional
 pip install -r requirements.txt
@@ -109,13 +109,13 @@ sudo apt install python3-distutils uuid-dev libcap-dev libpcre3-dev \
                  python3-certbot-nginx sox libsox-fmt-mp3
 sudo python3 -mpip install uwsgi
 mkdir ~/src
-cd ~/src && git clone https://github.com/gwillen/solstice-audio-test.git
+cd ~/src && git clone https://github.com/jeffkaufman/bucket-brigade.git
 sudo usermod -a -G www-data ubuntu
-sudo chgrp www-data /home/ubuntu/src/solstice-audio-test
-chmod g+rwxs /home/ubuntu/src/solstice-audio-test
-cd ~/src/solstice-audio-test && sudo python3 -mpip install -r requirements.txt
-mkdir ~/src/solstice-audio-test/recordings
-# also populate ~/src/solstice-audio-test/secrets.json
+sudo chgrp www-data /home/ubuntu/src/bucket-brigade
+chmod g+rwxs /home/ubuntu/src/bucket-brigade
+cd ~/src/bucket-brigade && sudo python3 -mpip install -r requirements.txt
+mkdir ~/src/bucket-brigade/recordings
+# also populate ~/src/bucket-brigade/secrets.json
 ```
 
 If you get:
@@ -139,7 +139,7 @@ sudo python3 -mpip install -r requirements.txt
 While the singing component does not require any external integration,
 the video call component to support the default interface
 does. You will need to sign up for a Twilio account, and then fill out
-`~/src/solstice-audio-test/secrets.json` as:
+`~/src/bucket-brigade/secrets.json` as:
 
 ```
 {
@@ -155,7 +155,7 @@ does. You will need to sign up for a Twilio account, and then fill out
 ### Theming
 
 You can change the colors as you like, by creating
-`~/src/solstice-audio-test/local-style.css` with something like:
+`~/src/bucket-brigade/local-style.css` with something like:
 
 ```
 :root {
@@ -190,8 +190,8 @@ create `echo-uploader.service` as:
 Description=uWSGI echo uploader
 
 [Service]
-WorkingDirectory=/home/ubuntu/src/solstice-audio-test
-ExecStart=/usr/local/bin/uwsgi --socket :7201 --wsgi-file /home/ubuntu/src/solstice-audio-test/upload.py --logto /var/log/echo-uploader.log
+WorkingDirectory=/home/ubuntu/src/bucket-brigade
+ExecStart=/usr/local/bin/uwsgi --socket :7201 --wsgi-file /home/ubuntu/src/bucket-brigade/upload.py --logto /var/log/echo-uploader.log
 Restart=always
 KillSignal=SIGQUIT
 Type=notify
@@ -224,8 +224,8 @@ In `/etc/systemd/system/` create `uwsgi-echo-01.service` as:
 Description=uWSGI echo
 
 [Service]
-WorkingDirectory=/home/ubuntu/src/solstice-audio-test
-ExecStart=/usr/local/bin/uwsgi --socket :7101 --wsgi-file /home/ubuntu/src/solstice-audio-test/server_wrapper.py --logto /var/log/uwsgi-echo-01.log
+WorkingDirectory=/home/ubuntu/src/bucket-brigade
+ExecStart=/usr/local/bin/uwsgi --socket :7101 --wsgi-file /home/ubuntu/src/bucket-brigade/server_wrapper.py --logto /var/log/uwsgi-echo-01.log
 Restart=always
 KillSignal=SIGQUIT
 Type=notify
@@ -260,8 +260,8 @@ through `uwsgi-echo-10.service`:
 Description=uWSGI echo
 
 [Service]
-WorkingDirectory=/home/ubuntu/src/solstice-audio-test
-ExecStart=/usr/local/bin/uwsgi --socket :7101 --wsgi-file /home/ubuntu/src/solstice-audio-test/server_wrapper.py --logto /var/log/uwsgi-echo-01.log --declare-option 'segment=$1' --segment=echo01
+WorkingDirectory=/home/ubuntu/src/bucket-brigade
+ExecStart=/usr/local/bin/uwsgi --socket :7101 --wsgi-file /home/ubuntu/src/bucket-brigade/server_wrapper.py --logto /var/log/uwsgi-echo-01.log --declare-option 'segment=$1' --segment=echo01
 Restart=always
 KillSignal=SIGQUIT
 Type=notify
@@ -280,8 +280,8 @@ Description=Echo Shared Memory Server
 
 [Service]
 Type=simple
-WorkingDirectory=/home/ubuntu/src/solstice-audio-test
-ExecStart=/usr/bin/python3 /home/ubuntu/src/solstice-audio-test/shm.py echo01 echo02 echo03 echo04 echo05 echo06 echo07 echo08 echo09 echo10
+WorkingDirectory=/home/ubuntu/src/bucket-brigade
+ExecStart=/usr/bin/python3 /home/ubuntu/src/bucket-brigade/shm.py echo01 echo02 echo03 echo04 echo05 echo06 echo07 echo08 echo09 echo10
 Restart=always
 KillSignal=SIGQUIT
 NotifyAccess=all
@@ -348,10 +348,10 @@ Anytime you have a new code to run on the server, run either:
 
 ```
 # Simple
-cd ~/src/solstice-audio-test && git pull && sudo systemctl restart uwsgi-echo-01
+cd ~/src/bucket-brigade && git pull && sudo systemctl restart uwsgi-echo-01
 
 # Sharded
-cd ~/src/solstice-audio-test && git pull && sudo systemctl restart uwsgi-echo-01 uwsgi-echo-02 uwsgi-echo-03 uwsgi-echo-04 uwsgi-echo-05 uwsgi-echo-06 uwsgi-echo-07 uwsgi-echo-08 uwsgi-echo-09 uwsgi-echo-10 echo-shm
+cd ~/src/bucket-brigade && git pull && sudo systemctl restart uwsgi-echo-01 uwsgi-echo-02 uwsgi-echo-03 uwsgi-echo-04 uwsgi-echo-05 uwsgi-echo-06 uwsgi-echo-07 uwsgi-echo-08 uwsgi-echo-09 uwsgi-echo-10 echo-shm
 ```
 
 ### Logs

html/full-instructions.html

@@ -9,7 +9,7 @@
 <h1>Full Instructions</h1>
 
 This is a program (<a
-href="https://github.com/gwillen/solstice-audio-test">source code</a>)
+href="https://github.com/jeffkaufman/bucket-brigade">source code</a>)
 that allows multiple people to make music together over the
 internet. You can think of it like one person recording their voice
 onto a cassette tape, mailing it to the next person who adds their voice,

html/index.html

@@ -886,10 +886,10 @@ <h3>Debug Info</h3>
 <div id=about class=middlePane>
 <div style="max-width: 40em">
 
-Bucket Brigade is an <a target="_blank" href="https://github.com/gwillen/solstice-audio-test">open source</a> program for making music over the Internet. <a
+Bucket Brigade is an <a target="_blank" href="https://github.com/jeffkaufman/bucket-brigade">open source</a> program for making music over the Internet. <a
 target=_blank href="https://github.com/gwillen">Glenn</a>, <a
 target=_blank href="https://www.jefftk.com">Jeff</a>, and <a
-target=_blank href="https://github.com/gwillen/solstice-audio-test/graphs/contributors">others</a>
+target=_blank href="https://github.com/jeffkaufman/bucket-brigade/graphs/contributors">others</a>
 develop and maintain it on a "best effort" basis.
 
 <p>
@@ -906,7 +906,7 @@ <h3>Debug Info</h3>
 <p>
 
 The code is <a
-target=_blank href="https://github.com/gwillen/solstice-audio-test/">open
+target=_blank href="https://github.com/jeffkaufman/bucket-brigade/">open
 source</a>, and if you would be interested in running your own
 instance we'd be happy to help you get set up.  It is also possible to
 use as a library, and in that form it has handled an event with <a
@@ -916,7 +916,7 @@ <h3>Debug Info</h3>
 <p>
 
 If you have questions or run into problems, <a
-target=_blank href="https://github.com/gwillen/solstice-audio-test/issues/new">file
+target=_blank href="https://github.com/jeffkaufman/bucket-brigade/issues/new">file
 an issue</a> or write to <tt>[email protected]</tt>.
 
 </div>
@@ -989,7 +989,7 @@ <h3>Something else weird is going on</h3>
 <p>
 
 Alternatively, fill out the form <a
-target=_blank href="https://github.com/gwillen/solstice-audio-test/issues/new">on
+target=_blank href="https://github.com/jeffkaufman/bucket-brigade/issues/new">on
 github</a>.  Please give as much information as you can, so I can try
 and trigger your problem and figure out why it wasn't doing what it
 should.
@@ -1399,7 +1399,7 @@ <h3>Something else weird is going on</h3>
 <div id="crash">
   <h1 id="crashMessage">This app has crashed. We're really sorry :-(</h1>
   <div id="crashBug">
-    <h2>Please <a href="https://github.com/gwillen/solstice-audio-test/issues/new">file a bug</a> with the following information; it will help us fix it.</h2>
+    <h2>Please <a href="https://github.com/jeffkaufman/bucket-brigade/issues/new">file a bug</a> with the following information; it will help us fix it.</h2>
     <textarea id="crashTrace" rows="50" cols="160" readonly></textarea>
     <h2>Then refresh the page and try again.</h2>
   </div>

html/net.js

@@ -265,7 +265,7 @@ export async function query_server_clock(target_url) {
     server_sample_offset = metadata["server_clock"] - request_time_samples;
     // Note: In the presence of network jitter, our message can get to the server either before or after the target server moment. This means that if our target server moment is "now", our actual requested moment could end up in the future. Someone on one side or the other has to deal with this. But in general if we are requesting "now" it means we do not expect to get audio data at all, so it should be okay for us to never ask for audio data in the case (and it should be ok for the server to give us zeros for "future" data, since we should never have asked, but that's what _would_ be there.)
   */
-  // Ref: https://github.com/gwillen/solstice-audio-test/issues/38
+  // Ref: https://github.com/jeffkaufman/bucket-brigade/issues/38
   var server_latency_ms = (Date.now() - request_time_ms) / 2.0;  // Wrong, see above
   var metadata = JSON.parse(fetch_result.headers.get("X-Audio-Metadata"));
   console.debug("query_server_clock got metadata:", metadata);