trying to use new setphantom/line api

This commit is contained in:
Seth Call 2016-07-09 11:59:55 -05:00
parent b7d47eca4f
commit 1cf051da0c
3 changed files with 38 additions and 27 deletions

View File

@ -125,11 +125,6 @@ JamBlasterActions = @JamBlasterActions
`<div className="jamblaster-track-config"> `<div className="jamblaster-track-config">
<div className="input-1"> <div className="input-1">
<h3>Input 1</h3> <h3>Input 1</h3>
<div className="track-active-field">
<input className="track1Active input-active" name="track1Active" type="checkbox" disabled={masterDisabled || combined}
checked={track1Active} readOnly={true}></input><label>Active</label>
</div>
<div className="input-type-section"> <div className="input-type-section">
<h4>Type</h4> <h4>Type</h4>
@ -162,10 +157,6 @@ JamBlasterActions = @JamBlasterActions
</div> </div>
<div className="input-2"> <div className="input-2">
<h3>Input 2</h3> <h3>Input 2</h3>
<div className="track-active-field">
<input className="track2Active input-active" name="track2Active" type="checkbox" disabled={masterDisabled || combined}
checked={track2Active}></input><label>Active</label>
</div>
<div className="input-type-section"> <div className="input-type-section">
<h4>Type</h4> <h4>Type</h4>
@ -197,13 +188,6 @@ JamBlasterActions = @JamBlasterActions
</select> </select>
</div> </div>
</div> </div>
<div className="microphone">
<h3>Mic</h3>
<div className="track-active-field">
<input className="micActive input-active" name="micActive" type="checkbox" disabled={masterDisabled}
value={micActive}></input><label>Active</label>
</div>
</div>
<br className="clearall"/> <br className="clearall"/>
<div className="combined-option"> <div className="combined-option">

View File

@ -16,6 +16,13 @@ logger = context.JK.logger
onAppInit: (@app) -> onAppInit: (@app) ->
postSimpleChange: (result, msg) ->
if result
@lastClientTrackState = null
@getLocalClients(@userJamBlasters)
else
context.JK.Banner.showAlert('unable to update the JamBlaster', msg)
onUpdateAudio: (name, value) -> onUpdateAudio: (name, value) ->
# input1_linemode # input1_linemode
# input2_linemode # input2_linemode
@ -25,9 +32,30 @@ logger = context.JK.logger
# track1 = {left, right, inst, stereo) # track1 = {left, right, inst, stereo)
# track1 = {left, right, inst, stereo) # track1 = {left, right, inst, stereo)
if @pairedJamBlaster? && @pairedJamBlaster.tracks? if @pairedJamBlaster? && @pairedJamBlaster.tracks?
logger.debug("onUpdateAudio name=#{name} value=#{value}", @pairedJamBlaster.tracks) logger.debug("onUpdateAudio name=#{name} value=#{value}", @pairedJamBlaster.tracks)
if name == 'inputTypeTrack1'
result = context.jamClient.set48vAndLineInstState({input1_linemode: value})
@postSimpleChange(result, 'Unable to set the line mode for Track 1')
return
else if name == 'inputTypeTrack2'
result = context.jamClient.set48vAndLineInstState({input2_linemode: value})
@postSimpleChange(result, 'Unable to set the line mode for Track 2')
return
else if name == 'track1Phantom'
result = context.jamClient.set48vAndLineInstState({input1_48V: value})
@postSimpleChange(result, 'Unable to set the phantom power for Track 1')
return
else if name == 'track2Phantom'
result = context.jamClient.set48vAndLineInstState({input2_48V: value})
@postSimpleChange(result, 'Unable to set the phantom power for Track 2')
return
audio = $.extend({}, @pairedJamBlaster.tracks) audio = $.extend({}, @pairedJamBlaster.tracks)
if name == 'inputTypeTrack1' if name == 'inputTypeTrack1'
audio.input1_linemode = value audio.input1_linemode = value
@ -40,13 +68,16 @@ logger = context.JK.logger
else if name == 'micActive' else if name == 'micActive'
audio.has_chat = value audio.has_chat = value
track1Active = @pairedJamBlaster.tracks.track1Active #track1Active = @pairedJamBlaster.tracks.track1Active
if name == 'track1Active' #if name == 'track1Active'
track1Active = value # track1Active = value
track2Active = @pairedJamBlaster.tracks.track2Active #track2Active = @pairedJamBlaster.tracks.track2Active
if name == 'track2Active' #if name == 'track2Active'
track2Active = value # track2Active = value
track1Active = true
track2Active = true
combined = @pairedJamBlaster.tracks.combined combined = @pairedJamBlaster.tracks.combined
if name == 'combined' if name == 'combined'
@ -59,9 +90,6 @@ logger = context.JK.logger
if name == 'track2Instrument' if name == 'track2Instrument'
track2Instrument = @convertToClientInstrument(value) track2Instrument = @convertToClientInstrument(value)
if combined if combined
# user has chosen to combine both inputs into one track. stereo=true is the key flag her # user has chosen to combine both inputs into one track. stereo=true is the key flag her

View File

@ -66,7 +66,6 @@ module SessionsHelper
end end
def current_user def current_user
puts "COOKIES! #{cookies.inspect}"
@current_user ||= User.find_by_remember_token(cookies[:remember_token]) @current_user ||= User.find_by_remember_token(cookies[:remember_token])
end end