Make everything a CommonJS module for browserify

Author: devongovett

browser.coffee

@@ -1,10 +1,7 @@
-do ->
-    global = this
+for key, val of require './src/aurora'
+  exports[key] = val
 
-    #import "src/aurora.coffee"
-    #import "src/sources/browser/http.coffee"
-    #import "src/sources/browser/file.coffee"
-    #import "src/devices/webaudio.coffee"
-    #import "src/devices/mozilla.coffee"
-    
-    global.AV = AV
+require './src/sources/browser/http'
+require './src/sources/browser/file'
+require './src/devices/webaudio'
+require './src/devices/mozilla'

node.coffee

@@ -1,29 +1,4 @@
-#import "src/aurora.coffee"
-#import "src/sources/node/http.coffee"
-#import "src/sources/node/file.coffee"
-#import "src/devices/node-speaker.coffee"
-
-AV.isNode = true
-AV.require = (modules...) ->
-    Module = require 'module'
+for key, val of require './src/aurora'
+    exports[key] = val
 
-    # create a temporary reference to the AV namespace 
-    # that we can access from within the required modules
-    key = "__AV__#{Date.now()}"
-    Module::[key] = AV
-    
-    # temporarily override the module wrapper
-    wrapper = Module.wrapper[0]
-    Module.wrapper[0] += "var AV = module['#{key}'];"
-    
-    # require the modules
-    for module in modules
-        require module
-        
-    # replace the wrapper and delete the temporary AV reference
-    Module.wrapper[0] = wrapper
-    delete Module::[key]
-    
-    return
-
-module.exports = AV
+require './src/devices/node-speaker'

src/asset.coffee

@@ -6,7 +6,14 @@
 # file to linear PCM raw audio data.
 #
 
-class AV.Asset extends AV.EventEmitter
+EventEmitter = require './core/events'
+HTTPSource   = require './sources/node/http'
+FileSource   = require './sources/node/file'
+BufferSource = require './sources/buffer'
+Demuxer      = require './demuxer'
+Decoder      = require './decoder'
+
+class Asset extends EventEmitter
     constructor: (@source) ->
         @buffered = 0
         @duration = null
@@ -25,13 +32,13 @@ class AV.Asset extends AV.EventEmitter
             @emit 'buffer', @buffered
 
     @fromURL: (url) ->
-        return new AV.Asset new AV.HTTPSource(url)
+        return new Asset new HTTPSource(url)
 
     @fromFile: (file) ->
-        return new AV.Asset new AV.FileSource(file)
+        return new Asset new FileSource(file)
 
     @fromBuffer: (buffer) ->
-        return new AV.Asset new AV.BufferSource(buffer)
+        return new Asset new BufferSource(buffer)
 
     start: (decode) ->
         return if @active
@@ -89,7 +96,7 @@ class AV.Asset extends AV.EventEmitter
     probe: (chunk) =>
         return unless @active
 
-        demuxer = AV.Demuxer.find(chunk)
+        demuxer = Demuxer.find(chunk)
         if not demuxer
             return @emit 'error', 'A demuxer for this container was not found.'
 
@@ -111,7 +118,7 @@ class AV.Asset extends AV.EventEmitter
 
         @emit 'format', @format
 
-        decoder = AV.Decoder.find(@format.formatID)
+        decoder = Decoder.find(@format.formatID)
         if not decoder
             return @emit 'error', "A decoder for #{@format.formatID} was not found."
 
@@ -141,4 +148,6 @@ class AV.Asset extends AV.EventEmitter
 
     _decode: =>
         continue while @decoder.decode() and @active
-        @decoder.once 'data', @_decode if @active
+        @decoder.once 'data', @_decode if @active
+        
+module.exports = Asset

src/aurora.coffee

@@ -1,10 +1,11 @@
-#import "aurora_base.coffee"
+for key, val of require './aurora_base'
+    exports[key] = val
 
-#import "demuxers/caf.coffee"
-#import "demuxers/m4a.coffee"
-#import "demuxers/aiff.coffee"
-#import "demuxers/wave.coffee"
-#import "demuxers/au.coffee"
+require './demuxers/caf'
+require './demuxers/m4a'
+require './demuxers/aiff'
+require './demuxers/wave'
+require './demuxers/au'
 
-#import "decoders/lpcm.coffee"
-#import "decoders/xlaw.coffee"
+require './decoders/lpcm'
+require './decoders/xlaw'

src/aurora_base.coffee

@@ -1,21 +1,18 @@
-AV = {}
+exports.Base = require './core/base'
+exports.Buffer = require './core/buffer'
+exports.BufferList = require './core/bufferlist'
+exports.Stream = require './core/stream'
+exports.Bitstream = require './core/bitstream'
+exports.EventEmitter = require './core/events'
 
-#import "core/base.coffee"
-#import "core/buffer.coffee"
-#import "core/bufferlist.coffee"
-#import "core/stream.coffee"
-#import "core/bitstream.coffee"
-#import "core/events.coffee"
+exports.BufferSource = require './sources/buffer'
 
-#import "sources/buffer.coffee"
+exports.Demuxer = require './demuxer'
+exports.Decoder = require './decoder'
+exports.AudioDevice = require './device'
+exports.Asset = require './asset'
+exports.Player = require './player'
 
-#import "demuxer.coffee"
-#import "decoder.coffee"
-#import "queue.coffee"
-#import "device.coffee"
-#import "asset.coffee"
-#import "player.coffee"
-
-#import "filter.coffee"
-#import "filters/volume.coffee"
-#import "filters/balance.coffee"
+exports.Filter = require './filter'
+exports.VolumeFilter = require './filters/volume'
+exports.BalanceFilter = require './filters/balance'

src/core/base.coffee

@@ -4,7 +4,7 @@
 # plain JavaScript. Based on http://ejohn.org/blog/simple-javascript-inheritance/.
 #
 
-class AV.Base
+class Base
     fnTest = /\b_super\b/
 
     @extend: (prop) ->
@@ -36,4 +36,6 @@ class AV.Base
             else
                 Class::[key] = fn
 
-        return Class
+        return Class
+        
+module.exports = Base

src/core/bitstream.coffee

@@ -1,9 +1,9 @@
-class AV.Bitstream
+class Bitstream
     constructor: (@stream) ->
         @bitPosition = 0
 
     copy: ->
-        result = new AV.Bitstream @stream.copy()
+        result = new Bitstream @stream.copy()
         result.bitPosition = @bitPosition
         return result
 
@@ -179,4 +179,6 @@ class AV.Bitstream
                 if a / Math.pow(2, bits - 1) | 0
                     a = (Math.pow(2, bits) - a) * -1
 
-        return a
+        return a
+        
+module.exports = Bitstream

src/core/buffer.coffee

@@ -1,18 +1,18 @@
-class AV.Buffer
+class AVBuffer
     constructor: (input) ->
         if input instanceof Uint8Array                  # Uint8Array
             @data = input
 
         else if input instanceof ArrayBuffer or         # ArrayBuffer
           Array.isArray(input) or                       # normal JS Array
           typeof input is 'number' or                   # number (i.e. length)
-          AV.isNode and global.Buffer?.isBuffer(input)  # Node Buffer
+          global.Buffer?.isBuffer(input)                # Node Buffer
             @data = new Uint8Array(input)
 
         else if input.buffer instanceof ArrayBuffer     # typed arrays other than Uint8Array
             @data = new Uint8Array(input.buffer, input.byteOffset, input.length * input.BYTES_PER_ELEMENT)
 
-        else if input instanceof AV.Buffer              # AV.Buffer, make a shallow copy
+        else if input instanceof AVBuffer               # AVBuffer, make a shallow copy
             @data = input.data
 
         else
@@ -25,16 +25,16 @@ class AV.Buffer
         @prev = null
 
     @allocate: (size) ->
-        return new AV.Buffer(size)
+        return new AVBuffer(size)
 
     copy: ->
-        return new AV.Buffer(new Uint8Array(@data))
+        return new AVBuffer(new Uint8Array(@data))
 
     slice: (position, length = @length) ->
         if position is 0 and length >= @length
-            return new AV.Buffer(@data)
+            return new AVBuffer(@data)
         else
-            return new AV.Buffer(@data.subarray(position, position + length))
+            return new AVBuffer(@data.subarray(position, position + length))
 
     # prefix-free
     BlobBuilder = global.BlobBuilder or global.MozBlobBuilder or global.WebKitBlobBuilder
@@ -61,7 +61,9 @@ class AV.Buffer
         URL?.revokeObjectURL url
 
     toBlob: ->
-        return Buffer.makeBlob @data.buffer
+        return AVBuffer.makeBlob @data.buffer
 
     toBlobURL: ->
-        return Buffer.makeBlobURL @data.buffer
+        return AVBuffer.makeBlobURL @data.buffer
+        
+module.exports = AVBuffer

src/core/bufferlist.coffee

@@ -1,4 +1,4 @@
-class AV.BufferList
+class BufferList
     constructor: ->
         @first = null
         @last = null
@@ -7,7 +7,7 @@ class AV.BufferList
         @availableBuffers = 0        
 
     copy: ->
-        result = new AV.BufferList
+        result = new BufferList
 
         result.first = @first
         result.last = @last
@@ -48,4 +48,6 @@ class AV.BufferList
         return @first?
 
     reset: ->
-        continue while @rewind()
+        continue while @rewind()
+        
+module.exports = BufferList

src/core/events.coffee

@@ -1,4 +1,6 @@
-class AV.EventEmitter extends AV.Base
+Base = require './base'
+
+class EventEmitter extends Base
     on: (event, fn) ->
         @events ?= {}
         @events[event] ?= []
@@ -22,4 +24,6 @@ class AV.EventEmitter extends AV.Base
         for fn in @events[event].slice()
             fn.apply(this, args)
 
-        return
+        return
+        
+module.exports = EventEmitter