Merge pull request #62 from tonistiigi/develop

Release 0.7.0 (develop => master)

Author: SargoDarya

.gitattributes

@@ -0,0 +1 @@
+cli.js eol=lf

.travis.yml

@@ -1,10 +1,10 @@
 language: node_js
 node_js:
-  - "0.10"
-  - "0.12"
-  - "iojs"
+  - "7"
+  - "node"
 
 before_script:
   - wget http://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz
   - tar xvf ffmpeg-release-64bit-static.tar.xz
-  - export PATH=$PATH:$PWD/ffmpeg-2.6.1-64bit-static
+  - mv ffmpeg-*.*.*-64bit-static ffmpeg
+  - export PATH=$PATH:$PWD/ffmpeg

README.md

@@ -6,14 +6,21 @@ This is a `ffmpeg` wrapper that will take in **multiple audio files** and combin
 
 ### Why?
 
-iOS, Windows Phone and some Android phones have very limited HTML5 audio support. They only support playing single file at a time and loading in new files requires user interaction and has a big latency. To overcome this there is a technique to combine all audio into single file and only play/loop certain parts of that file. [zynga/jukebox](https://github.com/zynga/jukebox) is a audio framework that uses this technique.  [digitalfruit/limejs](https://github.com/digitalfruit/limejs) is a HTML5 game framework that includes Jukebox and lets you add audio to your games using audio sprites.
+iOS, Windows Phone and some Android phones have very limited HTML5 audio support. They only support playing a single file at a time and loading in new files requires user interaction and has a big latency. To overcome this there is a technique to combine all audio into single file and only play/loop certain parts of that file. [zynga/jukebox](https://github.com/zynga/jukebox) is a audio framework that uses this technique.  [digitalfruit/limejs](https://github.com/digitalfruit/limejs) is a HTML5 game framework that includes Jukebox and lets you add audio to your games using audio sprites.
 
-###Installation
+### Installation
 
+#### via npm package
 ```
 npm install -g audiosprite
 ```
 
+### via github (latest)
+```
+npm install -g git+https://github.com/tonistiigi/audiosprite.git
+```
+
+#### Dependencies
 You can install `FFmpeg` and the `ogg` codecs on OSX using `brew`:
 
 ```
@@ -90,7 +97,7 @@ info: All done
 }
 ```
 
-###API Usage
+### API Usage
 ```js
 var audiosprite = require('audiosprite')
 
@@ -104,28 +111,15 @@ audiosprite(files, opts, function(err, obj) {
 })
 ```
 
-####Setting autoplay track
+#### Setting autoplay track
 
 You can use `--autoplay` option to set a track that will start playing automatically. This track is then marked as autoplay and looping in the JSON. This syntax is Jukebox framework specific.
 
-####Custom silent track
+#### Custom silent track
 
 On some cases starting and pausing a file has bigger latency than just setting playhead position. You may get better results if your file is always playing. `--silence <duration>` option will generate extra track named *silence* that you can play instead of pausing the file.
 
-####Usage with [zynga/jukebox](https://github.com/zynga/jukebox) framework.
-
-Generated JSON file can be passed straight into `jukebox.Player` constructor. Check out Jukebox documentation/demos for more info.
-
-```javascript
-var settings = {/* JSON generated by audiosprite*/};
-...
-// This part needs to be in user event callback.
-var myPlayer = new jukebox.Player(settings);
-...
-myPlayer.play('click');
-```
-
-####Usage with [digitalfruit/limejs](https://github.com/digitalfruit/limejs) framework.
+#### Usage with [digitalfruit/limejs](https://github.com/digitalfruit/limejs) framework.
 
 First generate LimeJS asset from the JSON file that you can require inside your code.
 
@@ -145,3 +139,18 @@ audio.play('click');
 ```
 
 *Don't forget to use the `--rawparts=mp3` option to benefit from the LimeJS feature to automatically switch to Web Audio API when it's supported by the client.*
+
+#### Usage with [zynga/jukebox](https://github.com/zynga/jukebox) framework. (DISCONTINUED)
+
+*NOTE: The jukebox project from Zynga has been abandoned. This section remains for reference.*
+
+Generated JSON file can be passed straight into `jukebox.Player` constructor. Check out Jukebox documentation/demos for more info.
+
+```javascript
+var settings = {/* JSON generated by audiosprite*/};
+...
+// This part needs to be in user event callback.
+var myPlayer = new jukebox.Player(settings);
+...
+myPlayer.play('click');
+```