Skip to content

Commit c729022

Browse files
Merge branch 'main' into vpotluri/issue87
resolved conflicts in: src/sonification/Sonifier.ts
2 parents 138b579 + 6997b4c commit c729022

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# sonification
22

3-
Repository for sonification
3+
Repository for sonification. ATtempting to release 1.1.
44

55
## build instructions
66

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "sonification",
3-
"version": "1.0.0",
3+
"version": "1.1.0",
44
"description": "library that provides sonification primitives to make data accessible.",
55
"source": "src/sonifier.ts",
66
"exports": {

src/sonification/DataSource.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,14 +147,13 @@ export class DataSource {
147147

148148
/**
149149
* Assign display objects and/or filter or transform the new arrival
150-
* @todo this doesn't exit if handleDatum false
150+
* @todo this doesn't exit if handleDatum false
151151
* @param datum The datum to display
152152
*/
153153
protected updateDisplays(datum: Datum) {
154154
this._templates.map((template) => {
155-
let result= template.handleDatum(datum, this)
156-
if (!result)
157-
return;
155+
let result = template.handleDatum(datum, this)
156+
if (!result) return
158157
console.log(`calculatied note ${template} for ${datum}`)
159158
})
160159
}

src/sonification/Sonifier.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ export class Sonifier {
188188
}
189189
}
190190

191+
191192
// /**
192193
// * Triggers all existing audio nodes to play.
193194
// *
@@ -205,6 +206,7 @@ export class Sonifier {
205206
// Sonifier.gainNode.connect(Sonifier._audioCtx.destination)
206207
// }
207208

209+
208210
//needs extensive testing.
209211
public onPause() {
210212
if (DEBUG) console.log('Pausing. Playback state is paused')

src/views/demos/DemoSimple.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ export class DemoSimple<DemoSimpleProps, DemoSimpleState>
111111
setTimeout(() => {
112112
console.log(`streaming ${dummyData[i]}`)
113113
if (this.isStreamInProgress) {
114-
115114
// SONIFICATION
116115
this.sonifierInstance.pushPoint(dummyData[i], this.getSource().id)
117116
}

0 commit comments

Comments
 (0)