seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

* wip

This commit is contained in:
Seth Call 2015-07-27 10:24:48 -05:00
parent bf0e29952e
commit 852503ad2c
4 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ruby/lib/jam_ruby/jam_track_importer.rb
View File

@ -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]

7
web/app/assets/javascripts/react-components/SessionMediaTracks.js.jsx.coffee
View File

@ -264,9 +264,10 @@ ChannelGroupIds = context.JK.ChannelGroupIds
mediaTracks.push(`<SessionJamTrackCategory key="JamTrackCategory" jamTrackName={this.state.jamTrackName} mixers={this.state.mediaCategoryMixer} mode={MIX_MODES.PERSONAL} />`)
# this is not ready yet until VRFS-3363 is done
#if @state.metronome?
# @state.metronome.mode = MIX_MODES.PERSONAL
# mediaTracks.push(`<SessionMetronome key="JamTrackMetronome" {...this.state.metronome} />`)
if @state.metronome?
@state.metronome.mode = MIX_MODES.PERSONAL
mediaTracks.push(`<SessionMetronome key="JamTrackMetronome" location="jam-track" {...this.state.metronome} />`)
for jamTrack in @state.jamTracks
jamTrack.mode = MIX_MODES.PERSONAL

1
web/app/assets/javascripts/react-components/SessionMetronome.js.jsx.coffee
View File

@ -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
})

10
web/app/assets/stylesheets/client/react-components/SessionTrack.css.scss
View File

@ -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 {