diff --git a/ruby/lib/jam_ruby/jam_track_importer.rb b/ruby/lib/jam_ruby/jam_track_importer.rb
index 70ef72e6a..dcf12fa17 100644
--- a/ruby/lib/jam_ruby/jam_track_importer.rb
+++ b/ruby/lib/jam_ruby/jam_track_importer.rb
@@ -108,6 +108,8 @@ module JamRuby
jam_track.plan_code = metadata["plan_code"] || gen_plan_code(jam_track.original_artist, jam_track.name)
jam_track.price = 1.99
jam_track.reproduction_royalty_amount = 0
+ jam_track.reproduction_royalty = true
+ jam_track.public_performance_royalty = true
jam_track.licensor_royalty_amount = 0
jam_track.sales_region = 'Worldwide'
jam_track.recording_type = 'Cover'
@@ -425,7 +427,8 @@ module JamRuby
if parsed_wav[:master]
track.track_type = 'Master'
- track.part = 'Master'
+ track.part = 'Master Mix'
+ track.instrument_id = 'computer'
@@log.debug("#{self.name} master! filename: #{parsed_wav[:filename]}")
else
if !parsed_wav[:instrument] || !parsed_wav[:part]
diff --git a/web/app/assets/javascripts/react-components/SessionMediaTracks.js.jsx.coffee b/web/app/assets/javascripts/react-components/SessionMediaTracks.js.jsx.coffee
index f72068f29..d6e240093 100644
--- a/web/app/assets/javascripts/react-components/SessionMediaTracks.js.jsx.coffee
+++ b/web/app/assets/javascripts/react-components/SessionMediaTracks.js.jsx.coffee
@@ -264,9 +264,10 @@ ChannelGroupIds = context.JK.ChannelGroupIds
mediaTracks.push(``)
# this is not ready yet until VRFS-3363 is done
- #if @state.metronome?
- # @state.metronome.mode = MIX_MODES.PERSONAL
- # mediaTracks.push(``)
+ if @state.metronome?
+ @state.metronome.mode = MIX_MODES.PERSONAL
+
+ mediaTracks.push(``)
for jamTrack in @state.jamTracks
jamTrack.mode = MIX_MODES.PERSONAL
diff --git a/web/app/assets/javascripts/react-components/SessionMetronome.js.jsx.coffee b/web/app/assets/javascripts/react-components/SessionMetronome.js.jsx.coffee
index d1231642d..465d53570 100644
--- a/web/app/assets/javascripts/react-components/SessionMetronome.js.jsx.coffee
+++ b/web/app/assets/javascripts/react-components/SessionMetronome.js.jsx.coffee
@@ -32,6 +32,7 @@ MIX_MODES = context.JK.MIX_MODES
componentClasses = classNames({
"session-track" : true
"metronome" : true
+ "in-jam-track" : @props.location == 'jam-track'
"no-mixer" : @props.mode == MIX_MODES.MASTER # show it as disabled if in master mode
})
diff --git a/web/app/assets/stylesheets/client/react-components/SessionTrack.css.scss b/web/app/assets/stylesheets/client/react-components/SessionTrack.css.scss
index 49529aed6..e6163f87e 100644
--- a/web/app/assets/stylesheets/client/react-components/SessionTrack.css.scss
+++ b/web/app/assets/stylesheets/client/react-components/SessionTrack.css.scss
@@ -175,6 +175,16 @@
.track-controls {
margin-left:0;
}
+
+ &.in-jam-track {
+ min-height:56px;
+ .track-buttons {
+ margin-top:2px;
+ }
+ table.vu {
+ margin-top: 10px;
+ }
+ }
}
&.recorded-track, &.jam-track, &.recorded-category, &.jam-track-category {