diff options
| author | Jonathan Bradley <jcb@pikum.xyz> | 2025-07-17 14:50:05 -0400 |
|---|---|---|
| committer | Jonathan Bradley <jcb@pikum.xyz> | 2025-07-17 14:50:05 -0400 |
| commit | 8fbeadda53243b701957a26dba1113d84ad5c7c4 (patch) | |
| tree | d37007379260bd8e6ec2a9c24ff269a8b5875dff /src/audio-impl-pw.cpp | |
| parent | f50804900157af65da50166325163444a78aaaec (diff) | |
pke: handle pk.h breaking changes
Diffstat (limited to 'src/audio-impl-pw.cpp')
| -rw-r--r-- | src/audio-impl-pw.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/audio-impl-pw.cpp b/src/audio-impl-pw.cpp index 1bc2525..b6a11ac 100644 --- a/src/audio-impl-pw.cpp +++ b/src/audio-impl-pw.cpp @@ -63,11 +63,11 @@ void pke_audio_pw_init() { pke_audio_pw.pw_objects.bkt = pke_audio_pw.bkt; pke_audio_pw.created_objects = {}; pke_audio_pw.created_objects.bkt = pke_audio_pw.bkt; - pke_audio_pw.default_sink_name = pk_new<char>(PKE_AUDIO_PW_NAME_RESERVE_LEN, pke_audio_pw.bkt); + pke_audio_pw.default_sink_name = pk_new_arr<char>(PKE_AUDIO_PW_NAME_RESERVE_LEN, pke_audio_pw.bkt); pke_audio_pw.default_sink_id = 0; pke_audio_pw.is_needing_output_remapped = true; - pke_audio_pw.pod_buffer = pk_new<uint8_t>(pke_audio_mstr.channel_count * PKE_AUDIO_POD_BUFFER_LEN, pke_audio_pw.bkt); + pke_audio_pw.pod_buffer = pk_new_arr<uint8_t>(pke_audio_mstr.channel_count * PKE_AUDIO_POD_BUFFER_LEN, pke_audio_pw.bkt); pw_init(NULL, NULL); @@ -172,8 +172,8 @@ void pke_audio_pw_teardown() { pw_thread_loop_destroy(pke_audio_pw.loop); } pw_deinit(); - pk_delete<char>(pke_audio_pw.default_sink_name, PKE_AUDIO_PW_NAME_RESERVE_LEN, pke_audio_pw.bkt); - pk_delete<uint8_t>(pke_audio_pw.pod_buffer, pke_audio_mstr.channel_count * PKE_AUDIO_POD_BUFFER_LEN, pke_audio_pw.bkt); + pk_delete_arr<char>(pke_audio_pw.default_sink_name, PKE_AUDIO_PW_NAME_RESERVE_LEN, pke_audio_pw.bkt); + pk_delete_arr<uint8_t>(pke_audio_pw.pod_buffer, pke_audio_mstr.channel_count * PKE_AUDIO_POD_BUFFER_LEN, pke_audio_pw.bkt); pk_arr_reset(&pke_audio_pw.created_objects); pke_audio_pw.created_objects.bkt = nullptr; pk_arr_reset(&pke_audio_pw.pw_objects); @@ -193,8 +193,8 @@ void pke_audio_pw_remap_outputs() { pw_properties *props = pw_properties_new(NULL, NULL); pke_audio_pw_object *objs = (pke_audio_pw_object *)pke_audio_pw.pw_objects.data; const char *str; - uint32_t *out_ports = pk_new<uint32_t>(pke_audio_mstr.channel_count, pkeSettings.mem_bkt.game_transient); - uint32_t *in_ports = pk_new<uint32_t>(pke_audio_mstr.channel_count, pkeSettings.mem_bkt.game_transient); + uint32_t *out_ports = pk_new_arr<uint32_t>(pke_audio_mstr.channel_count, pkeSettings.mem_bkt.game_transient); + uint32_t *in_ports = pk_new_arr<uint32_t>(pke_audio_mstr.channel_count, pkeSettings.mem_bkt.game_transient); for (i = 0; i < pke_audio_mstr.channel_count; ++i) { out_ports[i] = 0; in_ports[i] = 0; @@ -313,13 +313,13 @@ void on_pipewire_process(void *user_data) { if (n_frames > 0 && n_frames < pke_audio_mstr.buffer_frames) { // TODO PERF I think if I always had two buffers allocated // I could alternate between them for better perf. - float* new_buffer = pk_new<float>(PKE_AUDIO_BUFFER_FRAMES * pke_audio_mstr.channel_count * sizeof(float), pke_audio_mstr.bkt); + float* new_buffer = pk_new_arr<float>(PKE_AUDIO_BUFFER_FRAMES * pke_audio_mstr.channel_count * sizeof(float), pke_audio_mstr.bkt); memcpy( new_buffer, pke_audio_mstr.buffer + (pke_audio_mstr.channel_count * n_frames), stride * (pke_audio_mstr.buffer_frames - n_frames) ); - pk_delete<float>(pke_audio_mstr.buffer, PKE_AUDIO_BUFFER_FRAMES * pke_audio_mstr.channel_count * sizeof(float), pke_audio_mstr.bkt); + pk_delete_arr<float>(pke_audio_mstr.buffer, PKE_AUDIO_BUFFER_FRAMES * pke_audio_mstr.channel_count * sizeof(float), pke_audio_mstr.bkt); pke_audio_mstr.buffer = new_buffer; // fprintf(stdout, "[pw] shift buffer. buffer_frames before: %li, processed_frames: %li, after: %li\n", pke_audio_mstr.buffer_frames, n_frames, pke_audio_mstr.buffer_frames - n_frames); |