Skip to content

Commit

Permalink
Add option to auto-save splits on reset (#29)
Browse files Browse the repository at this point in the history
  • Loading branch information
@junglerobba
junglerobba authored Jul 5, 2023
1 parent 6bcce7d commit d3489d8
Show file tree
Hide file tree
Showing 3 changed files with 69 additions and 10 deletions.
23 changes: 23 additions & 0 deletions obs/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,20 @@ pub extern "C" fn blog(_log_level: c_int, _format: *const c_char) {
panic!()
}

#[no_mangle]
pub extern "C" fn obs_properties_add_bool(
_props: *mut obs_properties_t,
_name: *const c_char,
_description: *const c_char,
) -> *mut obs_property_t {
panic!()
}

#[no_mangle]
pub extern "C" fn obs_data_get_bool(_data: *mut obs_data_t, _name: *const c_char) -> bool {
panic!()
}

#[no_mangle]
pub extern "C" fn obs_properties_add_int(
_props: *mut obs_properties_t,
Expand Down Expand Up @@ -160,6 +174,15 @@ pub extern "C" fn obs_get_base_effect(_effect: obs_base_effect) -> *mut gs_effec
panic!()
}

#[no_mangle]
pub extern "C" fn obs_data_set_default_bool(
_data: *mut obs_data_t,
_name: *const c_char,
_val: bool,
) {
panic!()
}

#[no_mangle]
pub extern "C" fn obs_data_set_default_int(
_data: *mut obs_data_t,
Expand Down
7 changes: 7 additions & 0 deletions src/ffi.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,12 @@ extern "C" {
) -> *mut obs_property_t;
pub fn obs_data_get_string(data: *mut obs_data_t, name: *const c_char) -> *const c_char;
pub fn blog(log_level: c_int, format: *const c_char, ...);
pub fn obs_properties_add_bool(
props: *mut obs_properties_t,
name: *const c_char,
description: *const c_char,
) -> *mut obs_property_t;
pub fn obs_data_get_bool(data: *mut obs_data_t, name: *const c_char) -> bool;
pub fn obs_properties_add_int(
props: *mut obs_properties_t,
name: *const c_char,
Expand All @@ -77,6 +83,7 @@ extern "C" {
pub fn gs_technique_end(technique: *mut gs_technique_t);
pub fn gs_technique_end_pass(technique: *mut gs_technique_t);
pub fn obs_get_base_effect(effect: obs_base_effect) -> *mut gs_effect_t;
pub fn obs_data_set_default_bool(data: *mut obs_data_t, name: *const c_char, val: bool);
pub fn obs_data_set_default_int(data: *mut obs_data_t, name: *const c_char, val: c_longlong);
pub fn obs_properties_add_button(
props: *mut obs_properties_t,
Expand Down
49 changes: 39 additions & 10 deletions src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@ use ffi::{
blog, gs_draw_sprite, gs_effect_get_param_by_name, gs_effect_get_technique,
gs_effect_set_texture, gs_effect_t, gs_technique_begin, gs_technique_begin_pass,
gs_technique_end, gs_technique_end_pass, gs_texture_create, gs_texture_destroy,
gs_texture_set_image, gs_texture_t, obs_data_get_int, obs_data_get_string,
obs_data_set_default_int, obs_data_t, obs_enter_graphics, obs_get_base_effect, obs_hotkey_id,
obs_hotkey_register_source, obs_hotkey_t, obs_leave_graphics, obs_module_t, obs_mouse_event,
gs_texture_set_image, gs_texture_t, obs_data_get_bool, obs_data_get_int, obs_data_get_string,
obs_data_set_default_bool, obs_data_set_default_int, obs_data_t, obs_enter_graphics,
obs_get_base_effect, obs_hotkey_id, obs_hotkey_register_source, obs_hotkey_t,
obs_leave_graphics, obs_module_t, obs_mouse_event, obs_properties_add_bool,
obs_properties_add_button, obs_properties_add_int, obs_properties_add_path,
obs_properties_create, obs_properties_t, obs_property_t, obs_register_source_s,
obs_source_info, obs_source_t, GS_DYNAMIC, GS_RGBA, LOG_WARNING,
Expand Down Expand Up @@ -76,6 +77,7 @@ struct State {
timer: SharedTimer,
splits_path: PathBuf,
can_save_splits: bool,
auto_save: bool,
#[cfg(feature = "auto-splitting")]
auto_splitter: auto_splitting::Runtime,
layout: Layout,
Expand All @@ -90,6 +92,7 @@ struct Settings {
run: Run,
splits_path: PathBuf,
can_save_splits: bool,
auto_save: bool,
layout: Layout,
#[cfg(feature = "auto-splitting")]
auto_splitter_path: String,
Expand Down Expand Up @@ -133,10 +136,21 @@ fn parse_layout(path: &CStr) -> Option<Layout> {
layout::parser::parse(&file_data).ok()
}

fn save_splits_file(state: &mut State) -> bool {
if state.can_save_splits {
let timer = state.timer.read().unwrap();
if let Ok(file) = File::create(&state.splits_path) {
let _ = save_timer(&timer, IoWrite(BufWriter::new(file)));
}
}
false
}

unsafe fn parse_settings(settings: *mut obs_data_t) -> Settings {
let splits_path = CStr::from_ptr(obs_data_get_string(settings, SETTINGS_SPLITS_PATH).cast());
let splits_path = PathBuf::from(splits_path.to_string_lossy().into_owned());
let (run, can_save_splits) = parse_run(&splits_path).unwrap_or_else(default_run);
let auto_save = obs_data_get_bool(settings, SETTINGS_AUTO_SAVE);

let layout_path = CStr::from_ptr(obs_data_get_string(settings, SETTINGS_LAYOUT_PATH).cast());
let layout = parse_layout(layout_path).unwrap_or_else(Layout::default_layout);
Expand All @@ -157,6 +171,7 @@ unsafe fn parse_settings(settings: *mut obs_data_t) -> Settings {
run,
splits_path,
can_save_splits,
auto_save,
layout,
#[cfg(feature = "auto-splitting")]
auto_splitter_path,
Expand All @@ -171,6 +186,7 @@ impl State {
run,
splits_path,
can_save_splits,
auto_save,
layout,
#[cfg(feature = "auto-splitting")]
auto_splitter_path,
Expand Down Expand Up @@ -220,6 +236,7 @@ impl State {
timer,
splits_path,
can_save_splits,
auto_save,
layout,
#[cfg(feature = "auto-splitting")]
auto_splitter,
Expand Down Expand Up @@ -270,6 +287,10 @@ unsafe extern "C" fn reset(
if pressed {
let state: &mut State = &mut *data.cast();
state.timer.write().unwrap().reset(true);

if state.auto_save {
save_splits_file(state);
}
}
}

Expand Down Expand Up @@ -492,13 +513,7 @@ unsafe extern "C" fn save_splits(
data: *mut c_void,
) -> bool {
let state: &mut State = &mut *data.cast();
if state.can_save_splits {
let timer = state.timer.read().unwrap();
if let Ok(file) = File::create(&state.splits_path) {
let _ = save_timer(&timer, IoWrite(BufWriter::new(file)));
}
}
false
save_splits_file(state)
}

unsafe extern "C" fn media_get_state(data: *mut c_void) -> obs_media_state {
Expand Down Expand Up @@ -537,6 +552,9 @@ unsafe extern "C" fn media_play_pause(data: *mut c_void, pause: bool) {

unsafe extern "C" fn media_restart(data: *mut c_void) {
let state: &mut State = &mut *data.cast();
if state.auto_save {
save_splits_file(state);
}
let mut timer = state.timer.write().unwrap();
timer.reset(true);
timer.start();
Expand All @@ -545,6 +563,9 @@ unsafe extern "C" fn media_restart(data: *mut c_void) {
unsafe extern "C" fn media_stop(data: *mut c_void) {
let state: &mut State = &mut *data.cast();
state.timer.write().unwrap().reset(true);
if state.auto_save {
save_splits_file(state);
}
}

unsafe extern "C" fn media_next(data: *mut c_void) {
Expand Down Expand Up @@ -582,6 +603,7 @@ unsafe extern "C" fn media_get_duration(data: *mut c_void) -> i64 {
const SETTINGS_WIDTH: *const c_char = cstr!("width");
const SETTINGS_HEIGHT: *const c_char = cstr!("height");
const SETTINGS_SPLITS_PATH: *const c_char = cstr!("splits_path");
const SETTINGS_AUTO_SAVE: *const c_char = cstr!("auto_save");
const SETTINGS_LAYOUT_PATH: *const c_char = cstr!("layout_path");
#[cfg(feature = "auto-splitting")]
const SETTINGS_AUTO_SPLITTER_PATH: *const c_char = cstr!("auto_splitter_path");
Expand Down Expand Up @@ -616,6 +638,11 @@ unsafe extern "C" fn get_properties(_: *mut c_void) -> *mut obs_properties_t {
cstr!("LiveSplit One Auto Splitter (*.wasm)"),
ptr::null(),
);
obs_properties_add_bool(
props,
SETTINGS_AUTO_SAVE,
cstr!("Automatically save splits file on reset"),
);
obs_properties_add_button(
props,
SETTINGS_SAVE_SPLITS,
Expand All @@ -628,6 +655,7 @@ unsafe extern "C" fn get_properties(_: *mut c_void) -> *mut obs_properties_t {
unsafe extern "C" fn get_defaults(settings: *mut obs_data_t) {
obs_data_set_default_int(settings, SETTINGS_WIDTH, 300);
obs_data_set_default_int(settings, SETTINGS_HEIGHT, 500);
obs_data_set_default_bool(settings, SETTINGS_AUTO_SAVE, false);
}

fn default_run() -> (Run, bool) {
Expand Down Expand Up @@ -664,6 +692,7 @@ unsafe extern "C" fn update(data: *mut c_void, settings: *mut obs_data_t) {

state.splits_path = settings.splits_path;
state.can_save_splits = settings.can_save_splits;
state.auto_save = settings.auto_save;
state.timer = timer;
state.layout = settings.layout;

Expand Down

0 comments on commit d3489d8

Please sign in to comment.