Skip to content
This repository was archived by the owner on Jul 10, 2019. It is now read-only.

Commit ce8d962

Browse files
committed
Merge pull request #5 from tidalcycles/0.8-dev
0.8 dev
2 parents bfae75f + f5958fe commit ce8d962

File tree

4 files changed

+25
-2
lines changed

4 files changed

+25
-2
lines changed

.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "WebDirt"]
22
path = WebDirt
33
url = https://github.com/d0kt0r0/WebDirt.git
4+
[submodule "samples"]
5+
path = samples
6+
url = https://github.com/tidalcycles/Dirt-Samples.git

_layouts/default.html

+3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
2020
<script src="https://cdnjs.cloudflare.com/ajax/libs/fitvids/1.1.0/jquery.fitvids.min.js"></script>
2121
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
22+
<script src="{{ site.baseurl }}/WebDirt/SampleBank.js"></script>
23+
<script src="{{ site.baseurl }}/WebDirt/WebDirt.js"></script>
24+
<script src="{{ site.baseurl }}/WebDirt/Graph.js"></script>
2225
<script src="{{ site.baseurl }}/js/tidal.js"></script>
2326

2427
</head>

js/tidal.js

+18-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
(function($, window) {
2-
$(document).ready(function() { $(".tidal-video").fitVids(); });
1+
var dirt;
32

3+
(function($, window) {
4+
$(document).ready(function() {
5+
$(".tidal-video").fitVids();
6+
});
47
var metas = document.getElementsByTagName('meta');
58
var i;
69
if (navigator.userAgent.match(/iPhone/i)) {
@@ -19,3 +22,16 @@
1922
}
2023
}
2124
}(jQuery, this, undefined));
25+
26+
$(document).ready(function() {
27+
dirt = new WebDirt("/WebDirt/sampleMap.json", "/samples");
28+
WebDirt.prototype.testPlaybackOfSimpleMessage = function(){
29+
var msg = { sample_name: 'cp', sample_n:0, when:this.ac.currentTime+0.5 };
30+
this.queue(msg);
31+
}
32+
33+
$(".render").each(function() {
34+
// alert($(this).text());
35+
$(this).append("<button onclick=\"dirt.testPlaybackOfSimpleMessage();\">play</button>");
36+
});
37+
});

samples

Submodule samples added at 69f0d8d

0 commit comments

Comments
 (0)