]> git.dabkitsch.com - m29-web-sfp.git/commitdiff
initial commit
authorequilet <2237372+equilet@users.noreply.github.com>
Thu, 29 Feb 2024 05:52:44 +0000 (21:52 -0800)
committerequilet <2237372+equilet@users.noreply.github.com>
Thu, 29 Feb 2024 05:52:44 +0000 (21:52 -0800)
29 files changed:
.gitignore [new file with mode: 0644]
LICENSE [new file with mode: 0644]
README.md [new file with mode: 0644]
favicon.ico [new file with mode: 0644]
index.html [new file with mode: 0644]
js/.app.js.swp [new file with mode: 0644]
js/app.js [new file with mode: 0644]
m29-web-sfp.git/HEAD [new file with mode: 0644]
m29-web-sfp.git/config [new file with mode: 0644]
m29-web-sfp.git/description [new file with mode: 0644]
m29-web-sfp.git/hooks/applypatch-msg.sample [new file with mode: 0755]
m29-web-sfp.git/hooks/commit-msg.sample [new file with mode: 0755]
m29-web-sfp.git/hooks/fsmonitor-watchman.sample [new file with mode: 0755]
m29-web-sfp.git/hooks/post-update.sample [new file with mode: 0755]
m29-web-sfp.git/hooks/pre-applypatch.sample [new file with mode: 0755]
m29-web-sfp.git/hooks/pre-commit.sample [new file with mode: 0755]
m29-web-sfp.git/hooks/pre-merge-commit.sample [new file with mode: 0755]
m29-web-sfp.git/hooks/pre-push.sample [new file with mode: 0755]
m29-web-sfp.git/hooks/pre-rebase.sample [new file with mode: 0755]
m29-web-sfp.git/hooks/pre-receive.sample [new file with mode: 0755]
m29-web-sfp.git/hooks/prepare-commit-msg.sample [new file with mode: 0755]
m29-web-sfp.git/hooks/push-to-checkout.sample [new file with mode: 0755]
m29-web-sfp.git/hooks/update.sample [new file with mode: 0755]
m29-web-sfp.git/info/exclude [new file with mode: 0644]
media/basic-break.wav [new file with mode: 0644]
package-lock.json [new file with mode: 0644]
package.json [new file with mode: 0644]
style/.style.css.swp [new file with mode: 0644]
style/style.css [new file with mode: 0644]

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..ba4e1f8
--- /dev/null
@@ -0,0 +1,3 @@
+.DS_Store
+node_modules
+
diff --git a/LICENSE b/LICENSE
new file mode 100644 (file)
index 0000000..59ce217
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 Jeffrey Lubow
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/README.md b/README.md
new file mode 100644 (file)
index 0000000..b27bae4
--- /dev/null
+++ b/README.md
@@ -0,0 +1,2 @@
+# m29-web-sfp
+soundfile presenter
diff --git a/favicon.ico b/favicon.ico
new file mode 100644 (file)
index 0000000..bb5aba7
Binary files /dev/null and b/favicon.ico differ
diff --git a/index.html b/index.html
new file mode 100644 (file)
index 0000000..93067c7
--- /dev/null
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta name="theme-color" content="#000000">
+    
+    <title>M29 Soundfile Presenter</title>
+
+    <link rel="stylesheet" href="style/style.css">
+    <link rel="preconnect" href="https://fonts.googleapis.com">
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+    <link href="https://fonts.googleapis.com/css2?family=Roboto+Condensed&display=swap" rel="stylesheet">
+</head>
+
+<body>
+    <noscript>You need to enable JavaScript to run this app.</noscript>
+    <svg id="background" width="100%" height="100%"></svg>
+    <div id="sp-root">
+
+               <div>
+                       <h1 id="app-title">Soundfile Presenter</h1>
+               </div>
+
+        <div id="waveform">
+        </div>
+
+        <div class="slidecontain">
+             <div id="params">
+                <h2>Parameters</h2>
+            </div>
+        </div>
+
+        <div id="buttoncontain">
+        </div>
+
+    </div>
+
+    <script src="https://unpkg.com/wavesurfer.js@7"></script>
+    <!--
+    <script type="text/javascript" src="js/app.js"></script>
+    -->
+
+</body>
+</html>
diff --git a/js/.app.js.swp b/js/.app.js.swp
new file mode 100644 (file)
index 0000000..880131b
Binary files /dev/null and b/js/.app.js.swp differ
diff --git a/js/app.js b/js/app.js
new file mode 100644 (file)
index 0000000..375d44d
--- /dev/null
+++ b/js/app.js
@@ -0,0 +1,147 @@
+import WaveSurfer from 'wavesurfer.js';
+import express from 'express';
+
+const app = express();
+const port = 3000;
+let phase;
+
+//this is a relative filepath on a server or for local running
+let filepath = "media/basic-break.wav";
+
+const wavesurfer = WaveSurfer.create({
+    container: '#waveform',
+    waveColor: '#4F4A85',
+    progressColor: '#383351',
+    url: filepath
+});
+
+wavesurfer.on('click', (relativeX) => {
+    wavesurfer.play();
+    //wavesurfer.seekTo(relativeX);
+    buttons_reset();
+
+});
+
+const setup = async() => {
+    buttons_make();
+}
+
+//functions--------------------------------------------------------------------------
+//
+//dynamic loading 
+// wavesurfer.load('/some/path/to/wave.wav');
+
+
+function linear_map(phase, imn, imx, omn, omx){
+    return (phase - imn) * (omx - omn) / (imx - imn) + omn;
+}
+
+function file_to_server() {
+    //let dictstr = JSON.stringify(global_dict);
+    //fs = new File("media/test.json", dictstr);
+    //fs.writeFile();
+}
+
+function buttons_reset() {
+
+    buttons.forEach((button, index) => {
+
+        buttons[index].clicked = false;
+        const elem = document.getElementById(button.id);
+        
+        if (elem) {
+            elem.classList.remove("clicked");
+        }
+
+    });
+}
+
+function buttons_make() {
+
+    const container = document.getElementById("buttoncontain");
+    // const wf = document.getElementById("waveform");
+    // wf.addEventListener("click", () => {
+    //     console.log("user clicked inside of waveform");
+    // });
+
+    buttons.forEach((button) => {
+
+        const button_elem = document.createElement("div");
+
+        button_elem.id = button.id;
+        button_elem.classList.add("buttons");
+        button_elem.innerHTML = `<h2>${button.text}</h2>`;
+
+        button_elem.addEventListener("click", () => {
+
+            if (!button.clicked) {
+                buttons_reset();
+                button.clicked = true;
+                button.call_action();
+                button_elem.classList.add("clicked");
+            }
+
+        });
+
+        container.appendChild(button_elem);
+    });
+}
+
+
+//main routine-----------------------------------------------------------------
+//
+//
+setup();
+
+
+//user data -----------------------------------------------------------------
+//
+//
+const buttons = [
+    {
+        id: "button1",
+        text: "playback: play/resume",
+        clicked: false,
+        call_action: function () {
+            console.log("button1 clicked");
+            wavesurfer.play();
+        },
+    },
+    {
+        id: "button2",
+        text: "playback: stop [+ cue]",
+        clicked: false,
+        call_action: function () {
+            console.log(this.id, " clicked");
+            wavesurfer.stop();
+        },
+    },
+    {
+        id: "button3",
+        text: "playback: pause",
+        clicked: false,
+        call_action: function () {
+            console.log(this.id, " clicked");
+            wavesurfer.pause();
+        },
+    },
+    {
+        id: "button4",
+        text: "save your work...",
+        clicked: false,
+        call_action: function () {
+            console.log(this.id, " clicked");
+            // Additional action
+        },
+    }
+];
+
+let global_dict = {
+    "soundfile" : "export/media/basic-break.wav",
+    "m0" : [2.4, 3., "m1 label"], 
+    "m1" : [8.2, 3., "m2 label"], 
+    "m2" : [11.7, 3., "m3 label"], 
+    "m3" : [14.9, 3., "m4 label"]
+};
+
+
diff --git a/m29-web-sfp.git/HEAD b/m29-web-sfp.git/HEAD
new file mode 100644 (file)
index 0000000..cb089cd
--- /dev/null
@@ -0,0 +1 @@
+ref: refs/heads/master
diff --git a/m29-web-sfp.git/config b/m29-web-sfp.git/config
new file mode 100644 (file)
index 0000000..e6da231
--- /dev/null
@@ -0,0 +1,6 @@
+[core]
+       repositoryformatversion = 0
+       filemode = true
+       bare = true
+       ignorecase = true
+       precomposeunicode = true
diff --git a/m29-web-sfp.git/description b/m29-web-sfp.git/description
new file mode 100644 (file)
index 0000000..498b267
--- /dev/null
@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.
diff --git a/m29-web-sfp.git/hooks/applypatch-msg.sample b/m29-web-sfp.git/hooks/applypatch-msg.sample
new file mode 100755 (executable)
index 0000000..a5d7b84
--- /dev/null
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message taken by
+# applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.  The hook is
+# allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "applypatch-msg".
+
+. git-sh-setup
+commitmsg="$(git rev-parse --git-path hooks/commit-msg)"
+test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"}
+:
diff --git a/m29-web-sfp.git/hooks/commit-msg.sample b/m29-web-sfp.git/hooks/commit-msg.sample
new file mode 100755 (executable)
index 0000000..b58d118
--- /dev/null
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message.
+# Called by "git commit" with one argument, the name of the file
+# that has the commit message.  The hook should exit with non-zero
+# status after issuing an appropriate message if it wants to stop the
+# commit.  The hook is allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "commit-msg".
+
+# Uncomment the below to add a Signed-off-by line to the message.
+# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
+# hook is more suited to it.
+#
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
+
+# This example catches duplicate Signed-off-by lines.
+
+test "" = "$(grep '^Signed-off-by: ' "$1" |
+        sort | uniq -c | sed -e '/^[   ]*1[    ]/d')" || {
+       echo >&2 Duplicate Signed-off-by lines.
+       exit 1
+}
diff --git a/m29-web-sfp.git/hooks/fsmonitor-watchman.sample b/m29-web-sfp.git/hooks/fsmonitor-watchman.sample
new file mode 100755 (executable)
index 0000000..14ed0aa
--- /dev/null
@@ -0,0 +1,173 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+use IPC::Open2;
+
+# An example hook script to integrate Watchman
+# (https://facebook.github.io/watchman/) with git to speed up detecting
+# new and modified files.
+#
+# The hook is passed a version (currently 2) and last update token
+# formatted as a string and outputs to stdout a new update token and
+# all files that have been modified since the update token. Paths must
+# be relative to the root of the working tree and separated by a single NUL.
+#
+# To enable this hook, rename this file to "query-watchman" and set
+# 'git config core.fsmonitor .git/hooks/query-watchman'
+#
+my ($version, $last_update_token) = @ARGV;
+
+# Uncomment for debugging
+# print STDERR "$0 $version $last_update_token\n";
+
+# Check the hook interface version
+if ($version ne 2) {
+       die "Unsupported query-fsmonitor hook version '$version'.\n" .
+           "Falling back to scanning...\n";
+}
+
+my $git_work_tree = get_working_dir();
+
+my $retry = 1;
+
+my $json_pkg;
+eval {
+       require JSON::XS;
+       $json_pkg = "JSON::XS";
+       1;
+} or do {
+       require JSON::PP;
+       $json_pkg = "JSON::PP";
+};
+
+launch_watchman();
+
+sub launch_watchman {
+       my $o = watchman_query();
+       if (is_work_tree_watched($o)) {
+               output_result($o->{clock}, @{$o->{files}});
+       }
+}
+
+sub output_result {
+       my ($clockid, @files) = @_;
+
+       # Uncomment for debugging watchman output
+       # open (my $fh, ">", ".git/watchman-output.out");
+       # binmode $fh, ":utf8";
+       # print $fh "$clockid\n@files\n";
+       # close $fh;
+
+       binmode STDOUT, ":utf8";
+       print $clockid;
+       print "\0";
+       local $, = "\0";
+       print @files;
+}
+
+sub watchman_clock {
+       my $response = qx/watchman clock "$git_work_tree"/;
+       die "Failed to get clock id on '$git_work_tree'.\n" .
+               "Falling back to scanning...\n" if $? != 0;
+
+       return $json_pkg->new->utf8->decode($response);
+}
+
+sub watchman_query {
+       my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty')
+       or die "open2() failed: $!\n" .
+       "Falling back to scanning...\n";
+
+       # In the query expression below we're asking for names of files that
+       # changed since $last_update_token but not from the .git folder.
+       #
+       # To accomplish this, we're using the "since" generator to use the
+       # recency index to select candidate nodes and "fields" to limit the
+       # output to file names only. Then we're using the "expression" term to
+       # further constrain the results.
+       if (substr($last_update_token, 0, 1) eq "c") {
+               $last_update_token = "\"$last_update_token\"";
+       }
+       my $query = <<" END";
+               ["query", "$git_work_tree", {
+                       "since": $last_update_token,
+                       "fields": ["name"],
+                       "expression": ["not", ["dirname", ".git"]]
+               }]
+       END
+
+       # Uncomment for debugging the watchman query
+       # open (my $fh, ">", ".git/watchman-query.json");
+       # print $fh $query;
+       # close $fh;
+
+       print CHLD_IN $query;
+       close CHLD_IN;
+       my $response = do {local $/; <CHLD_OUT>};
+
+       # Uncomment for debugging the watch response
+       # open ($fh, ">", ".git/watchman-response.json");
+       # print $fh $response;
+       # close $fh;
+
+       die "Watchman: command returned no output.\n" .
+       "Falling back to scanning...\n" if $response eq "";
+       die "Watchman: command returned invalid output: $response\n" .
+       "Falling back to scanning...\n" unless $response =~ /^\{/;
+
+       return $json_pkg->new->utf8->decode($response);
+}
+
+sub is_work_tree_watched {
+       my ($output) = @_;
+       my $error = $output->{error};
+       if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) {
+               $retry--;
+               my $response = qx/watchman watch "$git_work_tree"/;
+               die "Failed to make watchman watch '$git_work_tree'.\n" .
+                   "Falling back to scanning...\n" if $? != 0;
+               $output = $json_pkg->new->utf8->decode($response);
+               $error = $output->{error};
+               die "Watchman: $error.\n" .
+               "Falling back to scanning...\n" if $error;
+
+               # Uncomment for debugging watchman output
+               # open (my $fh, ">", ".git/watchman-output.out");
+               # close $fh;
+
+               # Watchman will always return all files on the first query so
+               # return the fast "everything is dirty" flag to git and do the
+               # Watchman query just to get it over with now so we won't pay
+               # the cost in git to look up each individual file.
+               my $o = watchman_clock();
+               $error = $output->{error};
+
+               die "Watchman: $error.\n" .
+               "Falling back to scanning...\n" if $error;
+
+               output_result($o->{clock}, ("/"));
+               $last_update_token = $o->{clock};
+
+               eval { launch_watchman() };
+               return 0;
+       }
+
+       die "Watchman: $error.\n" .
+       "Falling back to scanning...\n" if $error;
+
+       return 1;
+}
+
+sub get_working_dir {
+       my $working_dir;
+       if ($^O =~ 'msys' || $^O =~ 'cygwin') {
+               $working_dir = Win32::GetCwd();
+               $working_dir =~ tr/\\/\//;
+       } else {
+               require Cwd;
+               $working_dir = Cwd::cwd();
+       }
+
+       return $working_dir;
+}
diff --git a/m29-web-sfp.git/hooks/post-update.sample b/m29-web-sfp.git/hooks/post-update.sample
new file mode 100755 (executable)
index 0000000..ec17ec1
--- /dev/null
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# An example hook script to prepare a packed repository for use over
+# dumb transports.
+#
+# To enable this hook, rename this file to "post-update".
+
+exec git update-server-info
diff --git a/m29-web-sfp.git/hooks/pre-applypatch.sample b/m29-web-sfp.git/hooks/pre-applypatch.sample
new file mode 100755 (executable)
index 0000000..4142082
--- /dev/null
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed
+# by applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-applypatch".
+
+. git-sh-setup
+precommit="$(git rev-parse --git-path hooks/pre-commit)"
+test -x "$precommit" && exec "$precommit" ${1+"$@"}
+:
diff --git a/m29-web-sfp.git/hooks/pre-commit.sample b/m29-web-sfp.git/hooks/pre-commit.sample
new file mode 100755 (executable)
index 0000000..e144712
--- /dev/null
@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git commit" with no arguments.  The hook should
+# exit with non-zero status after issuing an appropriate message if
+# it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-commit".
+
+if git rev-parse --verify HEAD >/dev/null 2>&1
+then
+       against=HEAD
+else
+       # Initial commit: diff against an empty tree object
+       against=$(git hash-object -t tree /dev/null)
+fi
+
+# If you want to allow non-ASCII filenames set this variable to true.
+allownonascii=$(git config --type=bool hooks.allownonascii)
+
+# Redirect output to stderr.
+exec 1>&2
+
+# Cross platform projects tend to avoid non-ASCII filenames; prevent
+# them from being added to the repository. We exploit the fact that the
+# printable range starts at the space character and ends with tilde.
+if [ "$allownonascii" != "true" ] &&
+       # Note that the use of brackets around a tr range is ok here, (it's
+       # even required, for portability to Solaris 10's /usr/bin/tr), since
+       # the square bracket bytes happen to fall in the designated range.
+       test $(git diff --cached --name-only --diff-filter=A -z $against |
+         LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
+then
+       cat <<\EOF
+Error: Attempt to add a non-ASCII file name.
+
+This can cause problems if you want to work with people on other platforms.
+
+To be portable it is advisable to rename the file.
+
+If you know what you are doing you can disable this check using:
+
+  git config hooks.allownonascii true
+EOF
+       exit 1
+fi
+
+# If there are whitespace errors, print the offending file names and fail.
+exec git diff-index --check --cached $against --
diff --git a/m29-web-sfp.git/hooks/pre-merge-commit.sample b/m29-web-sfp.git/hooks/pre-merge-commit.sample
new file mode 100755 (executable)
index 0000000..399eab1
--- /dev/null
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git merge" with no arguments.  The hook should
+# exit with non-zero status after issuing an appropriate message to
+# stderr if it wants to stop the merge commit.
+#
+# To enable this hook, rename this file to "pre-merge-commit".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/pre-commit" &&
+        exec "$GIT_DIR/hooks/pre-commit"
+:
diff --git a/m29-web-sfp.git/hooks/pre-push.sample b/m29-web-sfp.git/hooks/pre-push.sample
new file mode 100755 (executable)
index 0000000..4ce688d
--- /dev/null
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# An example hook script to verify what is about to be pushed.  Called by "git
+# push" after it has checked the remote status, but before anything has been
+# pushed.  If this script exits with a non-zero status nothing will be pushed.
+#
+# This hook is called with the following parameters:
+#
+# $1 -- Name of the remote to which the push is being done
+# $2 -- URL to which the push is being done
+#
+# If pushing without using a named remote those arguments will be equal.
+#
+# Information about the commits which are being pushed is supplied as lines to
+# the standard input in the form:
+#
+#   <local ref> <local oid> <remote ref> <remote oid>
+#
+# This sample shows how to prevent push of commits where the log message starts
+# with "WIP" (work in progress).
+
+remote="$1"
+url="$2"
+
+zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
+
+while read local_ref local_oid remote_ref remote_oid
+do
+       if test "$local_oid" = "$zero"
+       then
+               # Handle delete
+               :
+       else
+               if test "$remote_oid" = "$zero"
+               then
+                       # New branch, examine all commits
+                       range="$local_oid"
+               else
+                       # Update to existing branch, examine new commits
+                       range="$remote_oid..$local_oid"
+               fi
+
+               # Check for WIP commit
+               commit=$(git rev-list -n 1 --grep '^WIP' "$range")
+               if test -n "$commit"
+               then
+                       echo >&2 "Found WIP commit in $local_ref, not pushing"
+                       exit 1
+               fi
+       fi
+done
+
+exit 0
diff --git a/m29-web-sfp.git/hooks/pre-rebase.sample b/m29-web-sfp.git/hooks/pre-rebase.sample
new file mode 100755 (executable)
index 0000000..6cbef5c
--- /dev/null
@@ -0,0 +1,169 @@
+#!/bin/sh
+#
+# Copyright (c) 2006, 2008 Junio C Hamano
+#
+# The "pre-rebase" hook is run just before "git rebase" starts doing
+# its job, and can prevent the command from running by exiting with
+# non-zero status.
+#
+# The hook is called with the following parameters:
+#
+# $1 -- the upstream the series was forked from.
+# $2 -- the branch being rebased (or empty when rebasing the current branch).
+#
+# This sample shows how to prevent topic branches that are already
+# merged to 'next' branch from getting rebased, because allowing it
+# would result in rebasing already published history.
+
+publish=next
+basebranch="$1"
+if test "$#" = 2
+then
+       topic="refs/heads/$2"
+else
+       topic=`git symbolic-ref HEAD` ||
+       exit 0 ;# we do not interrupt rebasing detached HEAD
+fi
+
+case "$topic" in
+refs/heads/??/*)
+       ;;
+*)
+       exit 0 ;# we do not interrupt others.
+       ;;
+esac
+
+# Now we are dealing with a topic branch being rebased
+# on top of master.  Is it OK to rebase it?
+
+# Does the topic really exist?
+git show-ref -q "$topic" || {
+       echo >&2 "No such branch $topic"
+       exit 1
+}
+
+# Is topic fully merged to master?
+not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
+if test -z "$not_in_master"
+then
+       echo >&2 "$topic is fully merged to master; better remove it."
+       exit 1 ;# we could allow it, but there is no point.
+fi
+
+# Is topic ever merged to next?  If so you should not be rebasing it.
+only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
+only_next_2=`git rev-list ^master           ${publish} | sort`
+if test "$only_next_1" = "$only_next_2"
+then
+       not_in_topic=`git rev-list "^$topic" master`
+       if test -z "$not_in_topic"
+       then
+               echo >&2 "$topic is already up to date with master"
+               exit 1 ;# we could allow it, but there is no point.
+       else
+               exit 0
+       fi
+else
+       not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
+       /usr/bin/perl -e '
+               my $topic = $ARGV[0];
+               my $msg = "* $topic has commits already merged to public branch:\n";
+               my (%not_in_next) = map {
+                       /^([0-9a-f]+) /;
+                       ($1 => 1);
+               } split(/\n/, $ARGV[1]);
+               for my $elem (map {
+                               /^([0-9a-f]+) (.*)$/;
+                               [$1 => $2];
+                       } split(/\n/, $ARGV[2])) {
+                       if (!exists $not_in_next{$elem->[0]}) {
+                               if ($msg) {
+                                       print STDERR $msg;
+                                       undef $msg;
+                               }
+                               print STDERR " $elem->[1]\n";
+                       }
+               }
+       ' "$topic" "$not_in_next" "$not_in_master"
+       exit 1
+fi
+
+<<\DOC_END
+
+This sample hook safeguards topic branches that have been
+published from being rewound.
+
+The workflow assumed here is:
+
+ * Once a topic branch forks from "master", "master" is never
+   merged into it again (either directly or indirectly).
+
+ * Once a topic branch is fully cooked and merged into "master",
+   it is deleted.  If you need to build on top of it to correct
+   earlier mistakes, a new topic branch is created by forking at
+   the tip of the "master".  This is not strictly necessary, but
+   it makes it easier to keep your history simple.
+
+ * Whenever you need to test or publish your changes to topic
+   branches, merge them into "next" branch.
+
+The script, being an example, hardcodes the publish branch name
+to be "next", but it is trivial to make it configurable via
+$GIT_DIR/config mechanism.
+
+With this workflow, you would want to know:
+
+(1) ... if a topic branch has ever been merged to "next".  Young
+    topic branches can have stupid mistakes you would rather
+    clean up before publishing, and things that have not been
+    merged into other branches can be easily rebased without
+    affecting other people.  But once it is published, you would
+    not want to rewind it.
+
+(2) ... if a topic branch has been fully merged to "master".
+    Then you can delete it.  More importantly, you should not
+    build on top of it -- other people may already want to
+    change things related to the topic as patches against your
+    "master", so if you need further changes, it is better to
+    fork the topic (perhaps with the same name) afresh from the
+    tip of "master".
+
+Let's look at this example:
+
+                  o---o---o---o---o---o---o---o---o---o "next"
+                 /       /           /           /
+                /   a---a---b A     /           /
+               /   /               /           /
+              /   /   c---c---c---c B         /
+             /   /   /             \         /
+            /   /   /   b---b C     \       /
+           /   /   /   /             \     /
+    ---o---o---o---o---o---o---o---o---o---o---o "master"
+
+
+A, B and C are topic branches.
+
+ * A has one fix since it was merged up to "next".
+
+ * B has finished.  It has been fully merged up to "master" and "next",
+   and is ready to be deleted.
+
+ * C has not merged to "next" at all.
+
+We would want to allow C to be rebased, refuse A, and encourage
+B to be deleted.
+
+To compute (1):
+
+       git rev-list ^master ^topic next
+       git rev-list ^master        next
+
+       if these match, topic has not merged in next at all.
+
+To compute (2):
+
+       git rev-list master..topic
+
+       if this is empty, it is fully merged to "master".
+
+DOC_END
diff --git a/m29-web-sfp.git/hooks/pre-receive.sample b/m29-web-sfp.git/hooks/pre-receive.sample
new file mode 100755 (executable)
index 0000000..a1fd29e
--- /dev/null
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# An example hook script to make use of push options.
+# The example simply echoes all push options that start with 'echoback='
+# and rejects all pushes when the "reject" push option is used.
+#
+# To enable this hook, rename this file to "pre-receive".
+
+if test -n "$GIT_PUSH_OPTION_COUNT"
+then
+       i=0
+       while test "$i" -lt "$GIT_PUSH_OPTION_COUNT"
+       do
+               eval "value=\$GIT_PUSH_OPTION_$i"
+               case "$value" in
+               echoback=*)
+                       echo "echo from the pre-receive-hook: ${value#*=}" >&2
+                       ;;
+               reject)
+                       exit 1
+               esac
+               i=$((i + 1))
+       done
+fi
diff --git a/m29-web-sfp.git/hooks/prepare-commit-msg.sample b/m29-web-sfp.git/hooks/prepare-commit-msg.sample
new file mode 100755 (executable)
index 0000000..10fa14c
--- /dev/null
@@ -0,0 +1,42 @@
+#!/bin/sh
+#
+# An example hook script to prepare the commit log message.
+# Called by "git commit" with the name of the file that has the
+# commit message, followed by the description of the commit
+# message's source.  The hook's purpose is to edit the commit
+# message file.  If the hook fails with a non-zero status,
+# the commit is aborted.
+#
+# To enable this hook, rename this file to "prepare-commit-msg".
+
+# This hook includes three examples. The first one removes the
+# "# Please enter the commit message..." help message.
+#
+# The second includes the output of "git diff --name-status -r"
+# into the message, just before the "git status" output.  It is
+# commented because it doesn't cope with --amend or with squashed
+# commits.
+#
+# The third example adds a Signed-off-by line to the message, that can
+# still be edited.  This is rarely a good idea.
+
+COMMIT_MSG_FILE=$1
+COMMIT_SOURCE=$2
+SHA1=$3
+
+/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE"
+
+# case "$COMMIT_SOURCE,$SHA1" in
+#  ,|template,)
+#    /usr/bin/perl -i.bak -pe '
+#       print "\n" . `git diff --cached --name-status -r`
+#       if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;;
+#  *) ;;
+# esac
+
+# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE"
+# if test -z "$COMMIT_SOURCE"
+# then
+#   /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE"
+# fi
diff --git a/m29-web-sfp.git/hooks/push-to-checkout.sample b/m29-web-sfp.git/hooks/push-to-checkout.sample
new file mode 100755 (executable)
index 0000000..af5a0c0
--- /dev/null
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+# An example hook script to update a checked-out tree on a git push.
+#
+# This hook is invoked by git-receive-pack(1) when it reacts to git
+# push and updates reference(s) in its repository, and when the push
+# tries to update the branch that is currently checked out and the
+# receive.denyCurrentBranch configuration variable is set to
+# updateInstead.
+#
+# By default, such a push is refused if the working tree and the index
+# of the remote repository has any difference from the currently
+# checked out commit; when both the working tree and the index match
+# the current commit, they are updated to match the newly pushed tip
+# of the branch. This hook is to be used to override the default
+# behaviour; however the code below reimplements the default behaviour
+# as a starting point for convenient modification.
+#
+# The hook receives the commit with which the tip of the current
+# branch is going to be updated:
+commit=$1
+
+# It can exit with a non-zero status to refuse the push (when it does
+# so, it must not modify the index or the working tree).
+die () {
+       echo >&2 "$*"
+       exit 1
+}
+
+# Or it can make any necessary changes to the working tree and to the
+# index to bring them to the desired state when the tip of the current
+# branch is updated to the new commit, and exit with a zero status.
+#
+# For example, the hook can simply run git read-tree -u -m HEAD "$1"
+# in order to emulate git fetch that is run in the reverse direction
+# with git push, as the two-tree form of git read-tree -u -m is
+# essentially the same as git switch or git checkout that switches
+# branches while keeping the local changes in the working tree that do
+# not interfere with the difference between the branches.
+
+# The below is a more-or-less exact translation to shell of the C code
+# for the default behaviour for git's push-to-checkout hook defined in
+# the push_to_deploy() function in builtin/receive-pack.c.
+#
+# Note that the hook will be executed from the repository directory,
+# not from the working tree, so if you want to perform operations on
+# the working tree, you will have to adapt your code accordingly, e.g.
+# by adding "cd .." or using relative paths.
+
+if ! git update-index -q --ignore-submodules --refresh
+then
+       die "Up-to-date check failed"
+fi
+
+if ! git diff-files --quiet --ignore-submodules --
+then
+       die "Working directory has unstaged changes"
+fi
+
+# This is a rough translation of:
+#
+#   head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX
+if git cat-file -e HEAD 2>/dev/null
+then
+       head=HEAD
+else
+       head=$(git hash-object -t tree --stdin </dev/null)
+fi
+
+if ! git diff-index --quiet --cached --ignore-submodules $head --
+then
+       die "Working directory has staged changes"
+fi
+
+if ! git read-tree -u -m "$commit"
+then
+       die "Could not update working tree to new HEAD"
+fi
diff --git a/m29-web-sfp.git/hooks/update.sample b/m29-web-sfp.git/hooks/update.sample
new file mode 100755 (executable)
index 0000000..c4d426b
--- /dev/null
@@ -0,0 +1,128 @@
+#!/bin/sh
+#
+# An example hook script to block unannotated tags from entering.
+# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
+#
+# To enable this hook, rename this file to "update".
+#
+# Config
+# ------
+# hooks.allowunannotated
+#   This boolean sets whether unannotated tags will be allowed into the
+#   repository.  By default they won't be.
+# hooks.allowdeletetag
+#   This boolean sets whether deleting tags will be allowed in the
+#   repository.  By default they won't be.
+# hooks.allowmodifytag
+#   This boolean sets whether a tag may be modified after creation. By default
+#   it won't be.
+# hooks.allowdeletebranch
+#   This boolean sets whether deleting branches will be allowed in the
+#   repository.  By default they won't be.
+# hooks.denycreatebranch
+#   This boolean sets whether remotely creating branches will be denied
+#   in the repository.  By default this is allowed.
+#
+
+# --- Command line
+refname="$1"
+oldrev="$2"
+newrev="$3"
+
+# --- Safety check
+if [ -z "$GIT_DIR" ]; then
+       echo "Don't run this script from the command line." >&2
+       echo " (if you want, you could supply GIT_DIR then run" >&2
+       echo "  $0 <ref> <oldrev> <newrev>)" >&2
+       exit 1
+fi
+
+if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
+       echo "usage: $0 <ref> <oldrev> <newrev>" >&2
+       exit 1
+fi
+
+# --- Config
+allowunannotated=$(git config --type=bool hooks.allowunannotated)
+allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch)
+denycreatebranch=$(git config --type=bool hooks.denycreatebranch)
+allowdeletetag=$(git config --type=bool hooks.allowdeletetag)
+allowmodifytag=$(git config --type=bool hooks.allowmodifytag)
+
+# check for no description
+projectdesc=$(sed -e '1q' "$GIT_DIR/description")
+case "$projectdesc" in
+"Unnamed repository"* | "")
+       echo "*** Project description file hasn't been set" >&2
+       exit 1
+       ;;
+esac
+
+# --- Check types
+# if $newrev is 0000...0000, it's a commit to delete a ref.
+zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
+if [ "$newrev" = "$zero" ]; then
+       newrev_type=delete
+else
+       newrev_type=$(git cat-file -t $newrev)
+fi
+
+case "$refname","$newrev_type" in
+       refs/tags/*,commit)
+               # un-annotated tag
+               short_refname=${refname##refs/tags/}
+               if [ "$allowunannotated" != "true" ]; then
+                       echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
+                       echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
+                       exit 1
+               fi
+               ;;
+       refs/tags/*,delete)
+               # delete tag
+               if [ "$allowdeletetag" != "true" ]; then
+                       echo "*** Deleting a tag is not allowed in this repository" >&2
+                       exit 1
+               fi
+               ;;
+       refs/tags/*,tag)
+               # annotated tag
+               if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
+               then
+                       echo "*** Tag '$refname' already exists." >&2
+                       echo "*** Modifying a tag is not allowed in this repository." >&2
+                       exit 1
+               fi
+               ;;
+       refs/heads/*,commit)
+               # branch
+               if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
+                       echo "*** Creating a branch is not allowed in this repository" >&2
+                       exit 1
+               fi
+               ;;
+       refs/heads/*,delete)
+               # delete branch
+               if [ "$allowdeletebranch" != "true" ]; then
+                       echo "*** Deleting a branch is not allowed in this repository" >&2
+                       exit 1
+               fi
+               ;;
+       refs/remotes/*,commit)
+               # tracking branch
+               ;;
+       refs/remotes/*,delete)
+               # delete tracking branch
+               if [ "$allowdeletebranch" != "true" ]; then
+                       echo "*** Deleting a tracking branch is not allowed in this repository" >&2
+                       exit 1
+               fi
+               ;;
+       *)
+               # Anything else (is there anything else?)
+               echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
+               exit 1
+               ;;
+esac
+
+# --- Finished
+exit 0
diff --git a/m29-web-sfp.git/info/exclude b/m29-web-sfp.git/info/exclude
new file mode 100644 (file)
index 0000000..a5196d1
--- /dev/null
@@ -0,0 +1,6 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
diff --git a/media/basic-break.wav b/media/basic-break.wav
new file mode 100644 (file)
index 0000000..3c8df10
Binary files /dev/null and b/media/basic-break.wav differ
diff --git a/package-lock.json b/package-lock.json
new file mode 100644 (file)
index 0000000..d83c5f1
--- /dev/null
@@ -0,0 +1,102 @@
+{
+    "name": "m29",
+    "version": "0.0.1",
+    "lockfileVersion": 3,
+    "requires": true,
+    "packages": {
+        "": {
+            "name": "m29",
+            "version": "0.0.1",
+            "license": "MIT",
+            "dependencies": {
+                "require": "^2.4.20",
+                "wavesurfer.js": "^7.7.3"
+            }
+        },
+        "node_modules/amdefine": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+            "integrity": "sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg==",
+            "engines": {
+                "node": ">=0.4.2"
+            }
+        },
+        "node_modules/async": {
+            "version": "0.2.10",
+            "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
+            "integrity": "sha512-eAkdoKxU6/LkKDBzLpT+t6Ff5EtfSF4wx1WfJiPEEV7WNLnDaRXk0oVysiEPm262roaachGexwUv94WhSgN5TQ=="
+        },
+        "node_modules/optimist": {
+            "version": "0.3.7",
+            "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
+            "integrity": "sha512-TCx0dXQzVtSCg2OgY/bO9hjM9cV4XYx09TVK+s3+FhkjT6LovsLe+pPMzpWf+6yXK/hUizs2gUoTw3jHM0VaTQ==",
+            "dependencies": {
+                "wordwrap": "~0.0.2"
+            }
+        },
+        "node_modules/require": {
+            "version": "2.4.20",
+            "resolved": "https://registry.npmjs.org/require/-/require-2.4.20.tgz",
+            "integrity": "sha512-7eop5rvh38qhQQQOoUyf68meVIcxT2yFySNywTbxoEECgkX4KDqqDRaEszfvFnuB3fuZVjDdJZ1TI/Esr16RRA==",
+            "dependencies": {
+                "std": "0.1.40",
+                "uglify-js": "2.3.0"
+            },
+            "bin": {
+                "require": "bin/require-command.js"
+            },
+            "engines": {
+                "browsers": "*",
+                "node": "*"
+            }
+        },
+        "node_modules/source-map": {
+            "version": "0.1.43",
+            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+            "integrity": "sha512-VtCvB9SIQhk3aF6h+N85EaqIaBFIAfZ9Cu+NJHHVvc8BbEcnvDcFw6sqQ2dQrT6SlOrZq3tIvyD9+EGq/lJryQ==",
+            "dependencies": {
+                "amdefine": ">=0.0.4"
+            },
+            "engines": {
+                "node": ">=0.8.0"
+            }
+        },
+        "node_modules/std": {
+            "version": "0.1.40",
+            "resolved": "https://registry.npmjs.org/std/-/std-0.1.40.tgz",
+            "integrity": "sha512-wUf57hkDGCoVShrhPA8Q7lAg2Qosk+FaMlECmAsr1A4/rL2NRXFHQGBcgMUFKVkPEemJFW9gzjCQisRty14ohg==",
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/uglify-js": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.3.0.tgz",
+            "integrity": "sha512-AQvbxRKdaQeYADywQaao0k8Tj+7NGEVTne6xwgX1yQpv/G8b0CKdIw70HkCptwfvNGDsVe+0Bng3U9hfWbxxfg==",
+            "dependencies": {
+                "async": "~0.2.6",
+                "optimist": "~0.3.5",
+                "source-map": "~0.1.7"
+            },
+            "bin": {
+                "uglifyjs": "bin/uglifyjs"
+            },
+            "engines": {
+                "node": ">=0.4.0"
+            }
+        },
+        "node_modules/wavesurfer.js": {
+            "version": "7.7.3",
+            "resolved": "https://registry.npmjs.org/wavesurfer.js/-/wavesurfer.js-7.7.3.tgz",
+            "integrity": "sha512-TC7cQb0RVggtNC+Dl05gcnhSFL5U+fww3ZYJUuqgfR+r9oY+bh/hChCipDFDjs5cWtuek3GEtsPXWa93a9XYxw=="
+        },
+        "node_modules/wordwrap": {
+            "version": "0.0.3",
+            "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+            "integrity": "sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==",
+            "engines": {
+                "node": ">=0.4.0"
+            }
+        }
+    }
+}
diff --git a/package.json b/package.json
new file mode 100644 (file)
index 0000000..e457666
--- /dev/null
@@ -0,0 +1,16 @@
+{
+    "name": "m29",
+    "version": "0.0.1",
+    "description": "UCB Music Department pedagogical tools ported from Max/MSP",
+    "main": "app.js",
+    "scripts": {
+        "test": "echo \"Error: no test specified\" && exit 1"
+    },
+    "author": "Jeffrey Lubow",
+    "license": "MIT",
+    "dependencies": {
+        "require": "^2.4.20",
+        "wavesurfer.js": "^7.7.3"
+    },
+    "type": "module"
+}
diff --git a/style/.style.css.swp b/style/.style.css.swp
new file mode 100644 (file)
index 0000000..c33a7ca
Binary files /dev/null and b/style/.style.css.swp differ
diff --git a/style/style.css b/style/style.css
new file mode 100644 (file)
index 0000000..198ec40
--- /dev/null
@@ -0,0 +1,64 @@
+html, body {
+    margin: 0;
+    padding: 0;
+}
+
+
+#sp-root {
+    height: 100vh;
+    width: 100vw;
+    margin: auto;
+    /* max-width: 940px; */
+}
+
+#background {
+    position: absolute;
+    z-index: -1;
+}
+
+h1, h2, p {
+    font-family: "Roboto Condensed", sans-serif;
+    font-weight: 400;
+    font-style: normal;
+}
+
+h1 {
+    font-size: 24px;
+}
+
+h2, em {
+    width: 100%;
+    font-size: 15px;
+}
+
+.slidecontain {
+    width: 100%;
+}
+
+#params {
+
+}
+
+#params > div { 
+    display: flex;
+    flex-direction: row;
+    flex-basis: auto;
+    justify-content: space-between;
+}
+
+.buttons {
+    display: flex;
+    flex-wrap: wrap;
+    border: 5px solid black;
+    justify-content: center;
+    background: #b7bbd3;
+    color: #000000;
+    padding: 10px;
+    margin: 5px;
+
+}
+
+.buttons.clicked {
+    background: #222222;
+    color: #dddddd;
+}