trying to use new setphantom/line api
This commit is contained in:
parent
b7d47eca4f
commit
1cf051da0c
|
|
@ -125,11 +125,6 @@ JamBlasterActions = @JamBlasterActions
|
|||
`<div className="jamblaster-track-config">
|
||||
<div className="input-1">
|
||||
<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">
|
||||
<h4>Type</h4>
|
||||
|
||||
|
|
@ -162,10 +157,6 @@ JamBlasterActions = @JamBlasterActions
|
|||
</div>
|
||||
<div className="input-2">
|
||||
<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">
|
||||
<h4>Type</h4>
|
||||
|
|
@ -197,13 +188,6 @@ JamBlasterActions = @JamBlasterActions
|
|||
</select>
|
||||
</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"/>
|
||||
|
||||
<div className="combined-option">
|
||||
|
|
|
|||
|
|
@ -16,6 +16,13 @@ logger = context.JK.logger
|
|||
|
||||
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) ->
|
||||
# input1_linemode
|
||||
# input2_linemode
|
||||
|
|
@ -25,9 +32,30 @@ logger = context.JK.logger
|
|||
# track1 = {left, right, inst, stereo)
|
||||
# track1 = {left, right, inst, stereo)
|
||||
|
||||
|
||||
if @pairedJamBlaster? && @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)
|
||||
if name == 'inputTypeTrack1'
|
||||
audio.input1_linemode = value
|
||||
|
|
@ -40,13 +68,16 @@ logger = context.JK.logger
|
|||
else if name == 'micActive'
|
||||
audio.has_chat = value
|
||||
|
||||
track1Active = @pairedJamBlaster.tracks.track1Active
|
||||
if name == 'track1Active'
|
||||
track1Active = value
|
||||
#track1Active = @pairedJamBlaster.tracks.track1Active
|
||||
#if name == 'track1Active'
|
||||
# track1Active = value
|
||||
|
||||
track2Active = @pairedJamBlaster.tracks.track2Active
|
||||
if name == 'track2Active'
|
||||
track2Active = value
|
||||
#track2Active = @pairedJamBlaster.tracks.track2Active
|
||||
#if name == 'track2Active'
|
||||
# track2Active = value
|
||||
|
||||
track1Active = true
|
||||
track2Active = true
|
||||
|
||||
combined = @pairedJamBlaster.tracks.combined
|
||||
if name == 'combined'
|
||||
|
|
@ -59,9 +90,6 @@ logger = context.JK.logger
|
|||
if name == 'track2Instrument'
|
||||
track2Instrument = @convertToClientInstrument(value)
|
||||
|
||||
|
||||
|
||||
|
||||
if combined
|
||||
# user has chosen to combine both inputs into one track. stereo=true is the key flag her
|
||||
|
||||
|
|
|
|||
|
|
@ -66,7 +66,6 @@ module SessionsHelper
|
|||
end
|
||||
|
||||
def current_user
|
||||
puts "COOKIES! #{cookies.inspect}"
|
||||
@current_user ||= User.find_by_remember_token(cookies[:remember_token])
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue