projectlosangeles commited on
Commit
9f9f1fb
·
verified ·
1 Parent(s): 9368837

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +10 -22
app.py CHANGED
@@ -302,17 +302,15 @@ def Generate_Accompaniment(input_midi,
302
  if len(final_song) != 0:
303
 
304
  time = 0
305
- dur = 0
306
  vel = 90
307
- pitch = 0
308
  channel = 0
309
  patch = 0
310
 
311
- channels_map = [0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 11, 9, 12, 13, 14, 15]
312
- patches_map = [40, 0, 10, 19, 24, 35, 40, 52, 56, 9, 65, 73, 0, 0, 0, 0]
313
- velocities_map = [125, 80, 100, 80, 90, 100, 100, 80, 110, 110, 110, 110, 80, 80, 80, 80]
314
 
315
- for m in final_song:
316
 
317
  if 0 <= m < 128:
318
  time += m * 32
@@ -320,15 +318,10 @@ def Generate_Accompaniment(input_midi,
320
  elif 128 < m < 256:
321
  dur = (m-128) * 32
322
 
323
- elif 256 < m < 1792:
324
- cha = (m-256) // 128
325
- pitch = (m-256) % 128
326
 
327
- channel = channels_map[cha]
328
- patch = patches_map[channel]
329
- vel = velocities_map[channel]
330
-
331
- song_f.append(['note', time, dur, channel, pitch, vel, patch])
332
 
333
  fn1 = "Godzilla-Piano-Chords-Texturing-Transformer-Composition"
334
 
@@ -354,14 +347,11 @@ def Generate_Accompaniment(input_midi,
354
 
355
  #========================================================
356
 
357
- output_title = str(inp_mel)
358
  output_midi = str(new_fn)
359
  output_audio = (16000, audio)
360
-
361
  output_plot = TMIDIX.plot_ms_SONG(song_f, plot_title=output_midi, return_plt=True)
362
 
363
  print('Output MIDI file name:', output_midi)
364
- print('Output MIDI melody title:', output_title)
365
  print('=' * 70)
366
 
367
  #========================================================
@@ -371,7 +361,7 @@ def Generate_Accompaniment(input_midi,
371
  print('-' * 70)
372
  print('Req execution time:', (reqtime.time() - start_time), 'sec')
373
 
374
- return output_title, output_audio, output_plot, output_midi
375
 
376
  #==================================================================================
377
 
@@ -431,8 +421,7 @@ with gr.Blocks() as demo:
431
  model_temperature,
432
  model_sampling_top_k
433
  ],
434
- [output_title,
435
- output_audio,
436
  output_plot,
437
  output_midi
438
  ]
@@ -447,8 +436,7 @@ with gr.Blocks() as demo:
447
  model_temperature,
448
  model_sampling_top_k
449
  ],
450
- [output_title,
451
- output_audio,
452
  output_plot,
453
  output_midi
454
  ],
 
302
  if len(final_song) != 0:
303
 
304
  time = 0
305
+ dur = 1
306
  vel = 90
307
+ pitch = 60
308
  channel = 0
309
  patch = 0
310
 
311
+ patches = [0] * 16
 
 
312
 
313
+ for m in song:
314
 
315
  if 0 <= m < 128:
316
  time += m * 32
 
318
  elif 128 < m < 256:
319
  dur = (m-128) * 32
320
 
321
+ elif 256 < m < 384:
322
+ pitch = (m-256)
 
323
 
324
+ song_f.append(['note', time, dur, 0, pitch, max(40, pitch), 0])
 
 
 
 
325
 
326
  fn1 = "Godzilla-Piano-Chords-Texturing-Transformer-Composition"
327
 
 
347
 
348
  #========================================================
349
 
 
350
  output_midi = str(new_fn)
351
  output_audio = (16000, audio)
 
352
  output_plot = TMIDIX.plot_ms_SONG(song_f, plot_title=output_midi, return_plt=True)
353
 
354
  print('Output MIDI file name:', output_midi)
 
355
  print('=' * 70)
356
 
357
  #========================================================
 
361
  print('-' * 70)
362
  print('Req execution time:', (reqtime.time() - start_time), 'sec')
363
 
364
+ return output_audio, output_plot, output_midi
365
 
366
  #==================================================================================
367
 
 
421
  model_temperature,
422
  model_sampling_top_k
423
  ],
424
+ [output_audio,
 
425
  output_plot,
426
  output_midi
427
  ]
 
436
  model_temperature,
437
  model_sampling_top_k
438
  ],
439
+ [output_audio,
 
440
  output_plot,
441
  output_midi
442
  ],