Skip to content

Commit

Permalink
Some more cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
CryZe committed Aug 15, 2023
1 parent a225a8a commit 60bbe75
Show file tree
Hide file tree
Showing 8 changed files with 715 additions and 713 deletions.
86 changes: 63 additions & 23 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 22 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,35 @@ crate-type = ["cdylib"]

[dependencies]
obs = { path = "obs" }
livesplit-core = { git = "https://github.com/LiveSplit/livesplit-core", features = ["software-rendering", "font-loading"] }
livesplit-core = { git = "https://github.com/LiveSplit/livesplit-core", features = [
"software-rendering",
"font-loading",
] }
log = { version = "0.4.6", features = ["serde"] }
lazy_static = "1.4.0"

# crates needed for the auto splitter management code to work as expected
reqwest = { version = "0.11.18", features = ["blocking", "rustls-tls"], default-features = false, optional = true }
# crates needed for the auto splitter management code to work as expected
hyperx = { version = "1.4.0", optional = true }
quick-xml = { version = "0.29.0", features = ["serialize", "overlapped-lists"], optional = true }
serde = { version = "1.0.166", features = ["serde_derive"], optional = true }
open = { version = "5.0.0", optional = true }
quick-xml = { version = "0.30.0", features = [
"serialize",
"overlapped-lists",
], optional = true }
reqwest = { version = "0.11.18", features = [
"blocking",
"rustls-tls-native-roots",
], default-features = false, optional = true }
serde = { version = "1.0.166", features = ["derive"], optional = true }

[features]
default = ["auto-splitting"]
auto-splitting = ["livesplit-core/auto-splitting", "dep:reqwest", "dep:hyperx", "dep:quick-xml", "dep:serde", "dep:open"]
auto-splitting = [
"livesplit-core/auto-splitting",
"dep:hyperx",
"dep:open",
"dep:quick-xml",
"dep:reqwest",
"dep:serde",
]

[profile.max-opt]
inherits = "release"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,5 @@ name, where you can set hotkeys for the various actions.

If you add multiple sources that each use the same splits, but different
layouts, they all share the same state. This allows for a lot more complex
layouts than what is traditionally possible where could for example show the
layouts than what is traditionally possible where you could for example show the
splits on a completely different part of your stream than the timer itself.
16 changes: 8 additions & 8 deletions obs/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -208,14 +208,14 @@ pub extern "C" fn obs_properties_add_text(
_name: *const c_char,
_description: *const c_char,
_text_type: obs_text_type,
) -> *mut obs_property_t {
panic!()
) -> *mut obs_property_t {
panic!()
}
#[no_mangle]
pub extern "C" fn obs_property_set_modified_callback2(
_prop: *mut obs_property_t,
_modified2_callback: obs_property_modified2_t,
_private: *mut c_void
_private: *mut c_void,
) {
panic!()
}
Expand All @@ -227,10 +227,7 @@ pub extern "C" fn obs_property_set_description(
panic!()
}
#[no_mangle]
pub extern "C" fn obs_property_set_enabled(
_prop: *mut obs_property_t,
_enabled: bool
) {
pub extern "C" fn obs_property_set_enabled(_prop: *mut obs_property_t, _enabled: bool) {
panic!()
}
#[no_mangle]
Expand All @@ -241,6 +238,9 @@ pub extern "C" fn obs_properties_get(
panic!()
}
#[no_mangle]
pub extern "C" fn obs_module_get_config_path(_module: *mut obs_module_t, _file: *const c_char) -> *const c_char {
pub extern "C" fn obs_module_get_config_path(
_module: *mut obs_module_t,
_file: *const c_char,
) -> *const c_char {
panic!()
}
Loading

0 comments on commit 60bbe75

Please sign in to comment.