alice.mosphere.at / TIC-80
this repo has no description
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge pull request #2202 from borbware/master

Fix bank parameter for music export

authored by

Vadim Grigoruk and committed by
GitHub 687fb340 7ca2f44c

+14 -5
+1 -1
src/studio/screens/console.c
··· 2283 2283 bool error = true; 2284 2284 2285 2285 if(params.id >= 0 && params.id < MUSIC_TRACKS) 2286 - error = studioExportMusic(console->studio, params.id, filename) == NULL; 2286 + error = studioExportMusic(console->studio, params.id, params.bank, filename) == NULL; 2287 2287 2288 2288 onFileExported(console, filename, !error); 2289 2289 }
+12 -3
src/studio/studio.c
··· 322 322 return NULL; 323 323 } 324 324 325 - const char* studioExportMusic(Studio* studio, s32 track, const char* filename) 325 + const char* studioExportMusic(Studio* studio, s32 track, s32 bank, const char* filename) 326 326 { 327 327 tic_mem* tic = studio->tic; 328 328 ··· 333 333 #if TIC80_SAMPLE_CHANNELS == 2 334 334 wave_enable_stereo(); 335 335 #endif 336 - 336 + #if defined(TIC80_PRO) 337 + // chained = true in CLI. Set to false if want to use unchained 338 + bool chained = studio->bank.chained; 339 + if(chained) 340 + memset(studio->bank.indexes, bank, sizeof studio->bank.indexes); 341 + else 342 + for(s32 i = 0; i < COUNT_OF(BankModes); i++) 343 + if(BankModes[i] == TIC_MUSIC_MODE) 344 + studio->bank.indexes[i] = bank; 345 + #endif 337 346 const tic_sfx* sfx = getSfxSrc(studio); 338 347 const tic_music* music = getMusicSrc(studio); 339 348 ··· 341 350 music2ram(tic->ram, music); 342 351 343 352 const tic_music_state* state = &tic->ram->music_state; 344 - const Music* editor = studio->banks.music[studio->bank.index.music]; 353 + const Music* editor = studio->banks.music[bank]; 345 354 346 355 tic_api_music(tic, track, -1, -1, false, editor->sustain, -1, -1); 347 356
+1 -1
src/studio/studio.h
··· 264 264 struct Start* getStartScreen(Studio* studio); 265 265 struct Sprite* getSpriteEditor(Studio* studio); 266 266 267 - const char* studioExportMusic(Studio* studio, s32 track, const char* filename); 267 + const char* studioExportMusic(Studio* studio, s32 track, s32 bank, const char* filename); 268 268 const char* studioExportSfx(Studio* studio, s32 sfx, const char* filename); 269 269 270 270 tic_mem* getMemory(Studio* studio);