converters.py
: Reorganize the metadata-adjustment steps
This commit is contained in:
parent
57edc7aecf
commit
7d9ab6f7b2
@ -140,6 +140,11 @@ def convertTJAToFumen(tja):
|
|||||||
measureFumenPrev = tjaConverted['measures'][idx_m-1] if idx_m != 0 else None
|
measureFumenPrev = tjaConverted['measures'][idx_m-1] if idx_m != 0 else None
|
||||||
measureFumen = tjaConverted['measures'][idx_m]
|
measureFumen = tjaConverted['measures'][idx_m]
|
||||||
|
|
||||||
|
# Apply basic measure properties (that don't depend on notes or commands)
|
||||||
|
measureFumen[currentBranch]['speed'] = measureTJA['scroll']
|
||||||
|
measureFumen['gogo'] = measureTJA['gogo']
|
||||||
|
measureFumen['bpm'] = measureTJA['bpm']
|
||||||
|
|
||||||
# Check to see if the measure contains a branching condition
|
# Check to see if the measure contains a branching condition
|
||||||
if measureTJA['branchStart']:
|
if measureTJA['branchStart']:
|
||||||
if measureTJA['branchStart'][0] == 'p':
|
if measureTJA['branchStart'][0] == 'p':
|
||||||
@ -248,10 +253,6 @@ def convertTJAToFumen(tja):
|
|||||||
note_counter_branch += 1.5
|
note_counter_branch += 1.5
|
||||||
measureFumen[currentBranch][note_counter] = note
|
measureFumen[currentBranch][note_counter] = note
|
||||||
note_counter += 1
|
note_counter += 1
|
||||||
measureFumen[currentBranch]['length'] = note_counter
|
|
||||||
measureFumen[currentBranch]['speed'] = measureTJA['scroll']
|
|
||||||
measureFumen['gogo'] = measureTJA['gogo']
|
|
||||||
measureFumen['bpm'] = measureTJA['bpm']
|
|
||||||
|
|
||||||
# If drumroll hasn't ended by the end of this measure, increase duration by measure timing
|
# If drumroll hasn't ended by the end of this measure, increase duration by measure timing
|
||||||
if currentDrumroll:
|
if currentDrumroll:
|
||||||
@ -261,6 +262,7 @@ def convertTJAToFumen(tja):
|
|||||||
else:
|
else:
|
||||||
currentDrumroll['duration'] += measureDuration
|
currentDrumroll['duration'] += measureDuration
|
||||||
|
|
||||||
|
measureFumen[currentBranch]['length'] = note_counter
|
||||||
total_notes += note_counter
|
total_notes += note_counter
|
||||||
|
|
||||||
# Take a stock header metadata sample and add song-specific metadata
|
# Take a stock header metadata sample and add song-specific metadata
|
||||||
|
Loading…
x
Reference in New Issue
Block a user