Hello
This commit is contained in:
parent
48635fe669
commit
116597cd67
|
|
@ -4,7 +4,7 @@ module JamRuby
|
|||
DEFAULT_ENVIRONMENT = 'public'
|
||||
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'
|
||||
attr_accessible :version, :uri, :sha1, :environment, :product, as: :admin
|
||||
|
|
|
|||
|
|
@ -82,14 +82,16 @@ logger = context.JK.logger
|
|||
|
||||
audio.track2 = {stereo: false, right: true, inst: track2Instrument}
|
||||
|
||||
|
||||
|
||||
|
||||
logger.debug("updating JamBlaster track state", audio)
|
||||
context.jamClient.setJbTrackState(audio);
|
||||
@lastClientTrackState = null
|
||||
#@waitOnTracksDone()
|
||||
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.')
|
||||
|
||||
waitOnTracksDone: () ->
|
||||
@waitingOnTracksDone = true
|
||||
@waitingOnTracksInterval = setInterval()
|
||||
convertToClientInstrument: (instrumentId) ->
|
||||
clientInstrumentId = null
|
||||
if instrumentId != null && instrumentId != ''
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@
|
|||
<% if current_user && current_user.affiliate_partner.present? %>
|
||||
<li class="affiliate account-menu-group"><%= link_to "Affiliate Report", '/client#/account/affiliate' %></li>
|
||||
<% end %>
|
||||
<% if @nativeClient %>
|
||||
<% if @nativeClient && Rails.application.config.jamblaster_menu %>
|
||||
<li class="jamblaster-config"><%= link_to "JamBlaster", '/client#/jamblaster' %></li>
|
||||
<% end %>
|
||||
<% if current_user && current_user.musician? %>
|
||||
|
|
|
|||
|
|
@ -442,5 +442,6 @@ if defined?(Bundler)
|
|||
config.olark_enabled = true
|
||||
config.jamclass_enabled = false
|
||||
config.musician_count = '40,000+'
|
||||
config.jamblaster_menu = false
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -108,4 +108,5 @@ SampleApp::Application.configure do
|
|||
config.vst_enabled = true
|
||||
config.verify_email_enabled = true
|
||||
config.jamclass_enabled = true
|
||||
config.jamblaster_menu = true
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in New Issue