Skip to content

Return success from string queries #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
askeksa wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Return success from string queries #42

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions src/interfaces.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ pub fn get_parameter(effect: *mut AEffect, index: i32) -> f32 {
/// Copy a string into a destination buffer.
///
/// String will be cut at `max` characters.
fn copy_string(dst: *mut c_void, src: &str, max: usize) {
fn copy_string(dst: *mut c_void, src: &str, max: usize) -> isize {
unsafe {
use std::cmp::min;
use libc::{c_void, memset, memcpy};
Expand All @@ -71,6 +71,8 @@ fn copy_string(dst: *mut c_void, src: &str, max: usize) {
memset(dst, 0, max);
memcpy(dst, src.as_ptr() as *const c_void, min(max, src.len()));
}

1 // Success
}

/// VST2.4 dispatch function. This function handles dispatching all opcodes to the vst plugin.
Expand All @@ -94,12 +96,12 @@ pub fn dispatch(effect: *mut AEffect, opcode: i32, index: i32, value: isize, ptr
OpCode::SetCurrentPresetName => plugin.set_preset_name(read_string(ptr)),
OpCode::GetCurrentPresetName => {
let num = plugin.get_preset_num();
copy_string(ptr, &plugin.get_preset_name(num), MAX_PRESET_NAME_LEN);
return copy_string(ptr, &plugin.get_preset_name(num), MAX_PRESET_NAME_LEN);
}

OpCode::GetParameterLabel => copy_string(ptr, &plugin.get_parameter_label(index), MAX_PARAM_STR_LEN),
OpCode::GetParameterDisplay => copy_string(ptr, &plugin.get_parameter_text(index), MAX_PARAM_STR_LEN),
OpCode::GetParameterName => copy_string(ptr, &plugin.get_parameter_name(index), MAX_PARAM_STR_LEN),
OpCode::GetParameterLabel => return copy_string(ptr, &plugin.get_parameter_label(index), MAX_PARAM_STR_LEN),
OpCode::GetParameterDisplay => return copy_string(ptr, &plugin.get_parameter_text(index), MAX_PARAM_STR_LEN),
OpCode::GetParameterName => return copy_string(ptr, &plugin.get_parameter_name(index), MAX_PARAM_STR_LEN),

OpCode::SetSampleRate => plugin.set_sample_rate(opt),
OpCode::SetBlockSize => plugin.set_block_size(value as i64),
Expand Down Expand Up @@ -188,7 +190,7 @@ pub fn dispatch(effect: *mut AEffect, opcode: i32, index: i32, value: isize, ptr
OpCode::CanBeAutomated => return plugin.can_be_automated(index) as isize,
OpCode::StringToParameter => return plugin.string_to_parameter(index, read_string(ptr)) as isize,

OpCode::GetPresetName => copy_string(ptr, &plugin.get_preset_name(index), MAX_PRESET_NAME_LEN),
OpCode::GetPresetName => return copy_string(ptr, &plugin.get_preset_name(index), MAX_PRESET_NAME_LEN),

OpCode::GetInputInfo => {
if index >= 0 && index < plugin.get_info().inputs {
Expand All @@ -210,8 +212,8 @@ pub fn dispatch(effect: *mut AEffect, opcode: i32, index: i32, value: isize, ptr
return plugin.get_info().category.into();
}

OpCode::GetVendorName => copy_string(ptr, &plugin.get_info().vendor, MAX_VENDOR_STR_LEN),
OpCode::GetProductName => copy_string(ptr, &plugin.get_info().name, MAX_PRODUCT_STR_LEN),
OpCode::GetVendorName => return copy_string(ptr, &plugin.get_info().vendor, MAX_VENDOR_STR_LEN),
OpCode::GetProductName => return copy_string(ptr, &plugin.get_info().name, MAX_PRODUCT_STR_LEN),
OpCode::GetVendorVersion => return plugin.get_info().version as isize,
OpCode::VendorSpecific => return plugin.vendor_specific(index, value, ptr, opt),
OpCode::CanDo => {
Expand Down Expand Up @@ -282,8 +284,8 @@ pub fn host_dispatch(host: &mut Host,
}

OpCode::GetVendorVersion => return host.get_info().0,
OpCode::GetVendorString => copy_string(ptr, &host.get_info().1, MAX_VENDOR_STR_LEN),
OpCode::GetProductString => copy_string(ptr, &host.get_info().2, MAX_PRODUCT_STR_LEN),
OpCode::GetVendorString => return copy_string(ptr, &host.get_info().1, MAX_VENDOR_STR_LEN),
OpCode::GetProductString => return copy_string(ptr, &host.get_info().2, MAX_PRODUCT_STR_LEN),
OpCode::ProcessEvents => {
let events: *const api::Events = ptr as *const api::Events;

Expand Down