This commit is contained in:
Seth Call 2016-06-24 16:40:09 -05:00
parent 48635fe669
commit 116597cd67
5 changed files with 9 additions and 5 deletions

View File

@ -4,7 +4,7 @@ module JamRuby
DEFAULT_ENVIRONMENT = 'public' DEFAULT_ENVIRONMENT = 'public'
CLIENT_PREFIX = 'JamClient' CLIENT_PREFIX = 'JamClient'
PRODUCTS = ["#{CLIENT_PREFIX}/Win32", "#{CLIENT_PREFIX}/MacOSX", "#{CLIENT_PREFIX}/JamBlaster", "#{CLIENT_PREFIX}/JamBlasterKernel"] PRODUCTS = ["#{CLIENT_PREFIX}/Win32", "#{CLIENT_PREFIX}/MacOSX", "#{CLIENT_PREFIX}/JamBlaster", "#{CLIENT_PREFIX}/JamBlasterClient"]
self.primary_key = 'id' self.primary_key = 'id'
attr_accessible :version, :uri, :sha1, :environment, :product, as: :admin attr_accessible :version, :uri, :sha1, :environment, :product, as: :admin

View File

@ -82,14 +82,16 @@ logger = context.JK.logger
audio.track2 = {stereo: false, right: true, inst: track2Instrument} audio.track2 = {stereo: false, right: true, inst: track2Instrument}
logger.debug("updating JamBlaster track state", audio) logger.debug("updating JamBlaster track state", audio)
context.jamClient.setJbTrackState(audio); context.jamClient.setJbTrackState(audio);
@lastClientTrackState = null
#@waitOnTracksDone()
else else
context.JK.Banner.showAlert('no paired JamBlaster', 'it seems your JamBlaster has become disconnected. Please ensure it is powered on and connected via an ethernet cable.') context.JK.Banner.showAlert('no paired JamBlaster', 'it seems your JamBlaster has become disconnected. Please ensure it is powered on and connected via an ethernet cable.')
waitOnTracksDone: () ->
@waitingOnTracksDone = true
@waitingOnTracksInterval = setInterval()
convertToClientInstrument: (instrumentId) -> convertToClientInstrument: (instrumentId) ->
clientInstrumentId = null clientInstrumentId = null
if instrumentId != null && instrumentId != '' if instrumentId != null && instrumentId != ''

View File

@ -47,7 +47,7 @@
<% if current_user && current_user.affiliate_partner.present? %> <% if current_user && current_user.affiliate_partner.present? %>
<li class="affiliate account-menu-group"><%= link_to "Affiliate Report", '/client#/account/affiliate' %></li> <li class="affiliate account-menu-group"><%= link_to "Affiliate Report", '/client#/account/affiliate' %></li>
<% end %> <% end %>
<% if @nativeClient %> <% if @nativeClient && Rails.application.config.jamblaster_menu %>
<li class="jamblaster-config"><%= link_to "JamBlaster", '/client#/jamblaster' %></li> <li class="jamblaster-config"><%= link_to "JamBlaster", '/client#/jamblaster' %></li>
<% end %> <% end %>
<% if current_user && current_user.musician? %> <% if current_user && current_user.musician? %>

View File

@ -442,5 +442,6 @@ if defined?(Bundler)
config.olark_enabled = true config.olark_enabled = true
config.jamclass_enabled = false config.jamclass_enabled = false
config.musician_count = '40,000+' config.musician_count = '40,000+'
config.jamblaster_menu = false
end end
end end

View File

@ -108,4 +108,5 @@ SampleApp::Application.configure do
config.vst_enabled = true config.vst_enabled = true
config.verify_email_enabled = true config.verify_email_enabled = true
config.jamclass_enabled = true config.jamclass_enabled = true
config.jamblaster_menu = true
end end