Merge branch 'midicomponent'

koenbok · Jun 30, 2016 · adf5b33 · adf5b33
2 parents d6e849a + 5eb5d46
commit adf5b33
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/framer/Framer.coffee b/framer/Framer.coffee
@@ -16,7 +16,7 @@ Framer.Animation = (require "./Animation").Animation
 Framer.AnimationGroup = (require "./AnimationGroup").AnimationGroup
 Framer.Screen = (require "./Screen").Screen
 Framer.Align = (require "./Align").Align
-Framer.MIDIControl = (require "./MIDIControl").MIDIControl
+Framer.MIDIComponent = (require "./MIDIComponent").MIDIComponent
 Framer.print = (require "./Print").print
 
 # Components

diff --git a/framer/MIDIControl.coffee → framer/MIDIComponent.coffee b/framer/MIDIControl.coffee → framer/MIDIComponent.coffee
@@ -3,9 +3,9 @@
 {Events} = require "./Events"
 {MIDIInput} = require "./MIDIInput"
 
-Events.MIDIControlValueChange = "MIDIControlValueChange"
+Events.MIDIComponentValueChange = "MIDIComponentValueChange"
 
-class MIDIControl extends BaseClass
+class MIDIComponent extends BaseClass
 
 	@define "min", @simpleProperty("min", 0)
 	@define "max", @simpleProperty("max", 127)
@@ -45,11 +45,11 @@ class MIDIControl extends BaseClass
 				info = _.defaults info,
 					type: "note"
 
-			@emit(Events.MIDIControlValueChange, @_modulate(data2), info)
+			@emit(Events.MIDIComponentValueChange, @_modulate(data2), info)
 
 	_modulate: (value) ->
 		Utils.modulate(value, [0, 127], [@min, @max])
 
-	onValueChange: (cb) -> @on(Events.MIDIControlValueChange, cb)
+	onValueChange: (cb) -> @on(Events.MIDIComponentValueChange, cb)
 
-exports.MIDIControl = MIDIControl
+exports.MIDIComponent = MIDIComponent