curioustorvald/tsvm
1
0
Fork 0
mirror of https://github.com/curioustorvald/tsvm.git synced 2026-06-06 05:28:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

taut control and font changes

Browse Source
This commit is contained in:
minjaesong
2026-04-25 11:33:43 +09:00
parent d4ea9b2d29
commit 3f98d25828
7 changed files with 137 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
assets/disk0/tvdos/bin/taut.js
View File

@@ -7,6 +7,7 @@
const win = require("wintex")
const font = require("font")
const taud = require("taud")
const keys = require("keysym")
font.setLowRom("A:/tvdos/bin/tautfont_low.chr")
font.setHighRom("A:/tvdos/bin/tautfont_high.chr")
@@ -472,7 +473,7 @@ function drawStatusBar() {
fillLine(1, colStatus, 255)
const maxCue = song.lastActiveCue < 0 ? 0 : song.lastActiveCue
const vHi = Math.min(voiceOff + VOCSIZE, song.numVoices)
const txt = `${song.filePath} Cue ${cueIdx.hex03()}/${maxCue.hex03()} Row ${cursorRow.dec02()} V${(voiceOff+1).dec02()}-${vHi.dec02()}/${song.numVoices.dec02()} BPM ${song.bpm} Spd ${song.tickRate} `
const txt = `${song.filePath} Cue ${cueIdx.hex03()}/${maxCue.hex03()} Row ${cursorRow.dec02()} V${(voiceOff+1).dec02()}-${vHi.dec02()}/${song.numVoices.dec02()} BPM ${audio.getBPM(PLAYHEAD)} Spd ${audio.getTickRate(PLAYHEAD)} `
con.move(1, 1)
con.color_pair(colStatus, 255)
print(txt)
@@ -574,10 +575,10 @@ function drawControlHint() {
[`\u008428u\u008429u`,'Ptn'],
[`Pg\u008418u`,'Cue'],
['sep'],
['F5','Song'],
['F6','Cue'],
['F7','Row'],
['F8/Sp','Stop'],
['Y','Song'],
['U','Cue'],
['I','Row'],
['O/Sp','Stop'],
['sep'],
['m','Mute'],
['s','Solo'],
@@ -796,6 +797,12 @@ const song = loadTaud(fullPathObj.full, 0)
const voiceMutes = new Array(NUM_VOICES).fill(false)
function resetAudioDevice() {
audio.resetParams(PLAYHEAD)
audio.purgeQueue(PLAYHEAD)
audio.stop(PLAYHEAD)
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
// PLAYBACK STATE
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -951,9 +958,7 @@ function clampCue() {
clampCursor(); clampVoice(); clampCue()
drawAll()
audio.resetParams(PLAYHEAD)
audio.purgeQueue(PLAYHEAD)
audio.stop(PLAYHEAD)
resetAudioDevice()
taud.uploadTaudFile(fullPathObj.full, 0, PLAYHEAD)
audio.setMasterVolume(PLAYHEAD, 255)
audio.setMasterPan(PLAYHEAD, 128)
@@ -963,7 +968,9 @@ while (!exitFlag) {
input.withEvent(event => {
if (event[0] !== "key_down") return
const keysym = event[1]
const shiftDown = (event.indexOf(59) > 0 || event.indexOf(60) > 0)
const keyJustHit = (1 == event[2])
const shiftDown = (event.includes(59) || event.includes(60))
const moveDelta = shiftDown ? 4 : 1
if (keysym === "<ESC>" || keysym === "q" || keysym === "Q") {
@@ -972,7 +979,7 @@ while (!exitFlag) {
}
if (playbackMode !== PLAYMODE_NONE) {
if (keysym === "<F8>" || keysym === " ") { stopPlayback(); drawAll() }
if (keyJustHit && shiftDown && event.includes(keys.Y) || keysym === " ") { stopPlayback(); drawAll() }
else if (keysym === "<LEFT>" || keysym === "<RIGHT>") {
const oldVoiceOff = voiceOff
cursorVox += (keysym === "<LEFT>") ? -moveDelta : moveDelta
@@ -987,15 +994,15 @@ while (!exitFlag) {
drawStatusBar()
drawVoiceDetail()
}
else if (keysym === "m" || keysym === "M") { toggleMute(cursorVox) }
else if (keysym === "s" || keysym === "S") { toggleSolo(cursorVox) }
else if (keyJustHit && !shiftDown && event.includes(keys.M)) { toggleMute(cursorVox) }
else if (keyJustHit && !shiftDown && event.includes(keys.S)) { toggleSolo(cursorVox) }
return
}
if (keysym === "<F5>") { startPlaySong(); drawAll(); return }
if (keysym === "<F6>") { startPlayCue(); drawAll(); return }
if (keysym === "<F7>") { startPlayRow(); drawPatternRowAt(cursorRow - scrollRow); return }
if (keysym === "<F8>" || keysym === " ") { stopPlayback(); return }
if (keyJustHit && shiftDown && event.includes(keys.Y)) { startPlaySong(); drawAll(); return }
if (keyJustHit && shiftDown && event.includes(keys.U)) { startPlayCue(); drawAll(); return }
if ( shiftDown && event.includes(keys.I)) { startPlayRow(); drawPatternRowAt(cursorRow - scrollRow); return } // allow multiple plays by holding the keys down
if (keyJustHit && shiftDown && event.includes(keys.O) || keysym === " ") { stopPlayback(); return }
const oldCursor = cursorRow
const oldScroll = scrollRow
@@ -1018,8 +1025,8 @@ while (!exitFlag) {
return
}
if (keysym === "m" || keysym === "M") { toggleMute(cursorVox); return }
if (keysym === "s" || keysym === "S") { toggleSolo(cursorVox); return }
if (keyJustHit && !shiftDown && event.includes(keys.M)) { toggleMute(cursorVox); return }
if (keyJustHit && !shiftDown && event.includes(keys.S)) { toggleSolo(cursorVox); return }
if (keysym === "<UP>") { cursorRow -= moveDelta; rowMove = true }
else if (keysym === "<DOWN>") { cursorRow += moveDelta; rowMove = true }

BIN
assets/disk0/tvdos/bin/tautfont.kra LFS
View File

Binary file not shown.

BIN
assets/disk0/tvdos/bin/tautfont_low.chr
View File

Binary file not shown.

4
assets/disk0/tvdos/bin/zfm.js
View File

@@ -1,4 +1,6 @@
const win = require("wintex")
const keys = require("keysym")
const COL_TEXT = 253
const COL_BACK = 255
const COL_BACK_SEL = 81
@@ -673,7 +675,7 @@ while (!exit) {
let keysym = event[1]
let keyJustHit = (1 == event[2])
if (keyJustHit && event[3] != 66) { // release the latch right away if the key is not Return
if (keyJustHit && event[3] != keys.ENTER) { // release the latch right away if the key is not Return
firstRunLatch = false
}