mirrors/Pixel-Composer
1
0
Fork 0
mirror of https://github.com/Ttanasart-pt/Pixel-Composer.git synced 2024-11-10 12:34:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Audio preview delay and gain

Browse Source
This commit is contained in:
Tanasart 2023-05-24 15:02:17 +02:00
parent ce79638733
commit 9bb0a6b601
4 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
objects/o_main/Other_2.gml
View File

@ -93,7 +93,7 @@
var cmd = ".pxcc=\"" + string(program_directory) + "PixelComposer.exe\"";
execute_shell("assoc", cmd);
print($"Setup time = {current_time - t}");
//print($"Setup time: {(current_time - t)/1000}s");
#endregion
#region parameter

2
scripts/globals/globals.gml
View File

@ -34,7 +34,7 @@
VERSION = 1144;
SAVEFILE_VERSION = 1440;
VERSION_STRING = "1.14.4";
VERSION_STRING = "1.14.4.1";
BUILD_NUMBER = 114400;
globalvar NODES, NODE_MAP, APPEND_MAP, NODE_NAME_MAP;

3
scripts/node_audio_window/node_audio_window.gml
View File

@ -20,7 +20,8 @@ function Node_Audio_Window(_x, _y, _group = noone) : Node(_x, _y, _group) constr
static update = function(frame = ANIMATOR.current_frame) {
var _arr = inputs[| 0].getValue();
if(!is_array(_arr)) return;
if(!is_array(_arr) || array_length(_arr) < 1) return;
if(!is_array(_arr[0])) return;
var sam = inputs[| 1].getValue();
var siz = inputs[| 2].getValue();

31
scripts/node_wav_file_read/node_wav_file_read.gml
View File

@ -74,6 +74,21 @@ function Node_WAV_File_Read(_x, _y, _group = noone) : Node(_x, _y, _group) const
wav_file_prg = 0;
wav_file_lim = 1;
attributes[? "preview_shift"] = 0;
attributes[? "preview_gain"] = 0.5;
array_push(attributeEditors, "Audio Preview");
array_push(attributeEditors, ["Gain", "preview_gain",
new textBox(TEXTBOX_INPUT.number, function(val) {
attributes[? "preview_gain"] = val;
})]);
array_push(attributeEditors, ["Shift", "preview_shift",
new textBox(TEXTBOX_INPUT.number, function(val) {
attributes[? "preview_shift"] = val;
})]);
on_dragdrop_file = function(path) {
if(updatePaths(path)) {
doUpdate();
@ -200,9 +215,11 @@ function Node_WAV_File_Read(_x, _y, _group = noone) : Node(_x, _y, _group) const
if(ANIMATOR.current_frame == 0)
audio_stop_sound(preview_audio);
var dur = ANIMATOR.current_frame / ANIMATOR.framerate;
var dur = ANIMATOR.current_frame / ANIMATOR.framerate - attributes[? "preview_shift"];
if(!audio_is_playing(preview_audio))
audio_play_sound(preview_audio, 1, false, 0.5, dur);
audio_play_sound(preview_audio, 1, false, attributes[? "preview_gain"], dur);
else if(ANIMATOR.frame_progress)
audio_sound_set_track_position(preview_audio, dur);
}
}
@ -217,8 +234,8 @@ function Node_WAV_File_Read(_x, _y, _group = noone) : Node(_x, _y, _group) const
var amp_ind = round(frame * content.sample / ANIMATOR.framerate);
var amp_win = content.sample / ANIMATOR.framerate;
var amp_st = max(0, amp_ind - amp_win);
var amp_ed = min(len, amp_ind + amp_win);
var amp_st = max(0, amp_ed - amp_win);
//print($"{amp_ind}: {amp_st} - {amp_ed}")
@ -226,7 +243,7 @@ function Node_WAV_File_Read(_x, _y, _group = noone) : Node(_x, _y, _group) const
for( var i = amp_st; i < amp_ed; i++ )
dec += content.sound[0][i] == 0? 0 : 20 * log10(abs(content.sound[0][i]));
dec /= amp_win;
dec /= amp_ed - amp_st;
outputs[| 5].setValue(dec);
}
@ -253,7 +270,7 @@ function Node_WAV_File_Read(_x, _y, _group = noone) : Node(_x, _y, _group) const
ss, ss,,, 0.50);
var wd = (ANIMATOR.current_frame / ANIMATOR.framerate) / content.duration * sw;
draw_surface_part_ext_safe(audio_surface, 0, 0, wd, sh,
draw_surface_part_ext_safe(audio_surface, 0, 0, min(wd, sw), sh,
bbox.xc - sw * ss / 2,
bbox.yc - sh * ss / 2,
ss, ss,, attributes[? "play"]? COLORS._main_accent : c_white);
@ -274,8 +291,8 @@ function Node_WAV_File_Read(_x, _y, _group = noone) : Node(_x, _y, _group) const
var _am = content.packet / _st;
var ox, oy, nx, ny;
for( var i = 0; i < _am; i++ ) {
var _dat = content.sound[0][i * _st];
for( var i = 0; i <= _am; i++ ) {
var _dat = content.sound[0][min(i * _st, content.packet - 1)];
nx = _shf + i * _s;
ny = _h / 2 + _dat * _h;