Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add multi play feature with PixiJS example (resolves #11) #15

Merged
merged 13 commits into from
Feb 27, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
"no-underscore-dangle": 0,
"no-unused-expressions": 0,
"no-unused-vars": [2, {"vars": "all", "args": "after-used"}],
"no-use-before-define": 2,
"no-use-before-define": 0,
"no-useless-concat": 2,
"no-var": 2,
"no-with": 2,
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ node_js:
addons:
firefox: "latest"
before_install:
- 'npm install -g karma-cli'
- 'npm i -g karma-cli && npm i -g eslint && npm i -g babel-eslint'
before_script:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# sono

[![NPM version](https://badge.fury.io/js/sono.svg)](http://badge.fury.io/js/sono) [![Build Status](https://travis-ci.org/Stinkdigital/sono.svg?branch=master)](https://travis-ci.org/Stinkdigital/sono)
[![NPM version](https://badge.fury.io/js/sono.svg)](http://badge.fury.io/js/sono) [![Build Status](https://travis-ci.org/Stinkstudios/sono.svg?branch=master)](https://travis-ci.org/Stinkstudios/sono)

A simple yet powerful JavaScript library for working with Web Audio

Expand Down
246 changes: 238 additions & 8 deletions dist/sono.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/sono.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/sono.min.js

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions examples/css/control.css
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,16 @@
width: var(--control-markWidth);
}

.Control-mark--play {
width: 0;
height: 0;
border-top: 30px solid transparent;
border-bottom: 30px solid transparent;
border-left: 40px solid var(--control-markColor);
margin-left: 10px;
margin-top: 20px;
}

.Control-canvas {
border: 1px solid #ddd;
border-radius: 8px;
Expand Down
10 changes: 10 additions & 0 deletions examples/css/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -659,6 +659,16 @@ nav a {
width: 10px;
}

.Control-mark--play {
width: 0;
height: 0;
border-top: 30px solid transparent;
border-bottom: 30px solid transparent;
border-left: 40px solid white;
margin-left: 10px;
margin-top: 20px;
}

.Control-canvas {
border: 1px solid #ddd;
border-radius: 8px;
Expand Down
4 changes: 2 additions & 2 deletions examples/js/example.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
'<li>Touch locked (mobile): ' + sono.isTouchLocked + '</li>' +
'<li>Supported extensions: ' + sono.extensions.join(', ') + '</li>';

var baseURL = 'examples/audio/';
// var baseURL = 'https://dl.dropboxusercontent.com/u/15470024/prototypes/audio/';
// var baseURL = 'examples/audio/';
var baseURL = 'https://dl.dropboxusercontent.com/u/15470024/prototypes/audio/';
// var baseURL = 'http://prototypes.stinkdigital.com/webaudio/sono/examples/audio/';

var sound,
Expand Down
2 changes: 2 additions & 0 deletions examples/js/pixi-multi-play.js

Large diffs are not rendered by default.

Loading