Merge pull request #49 from clouds56-contrib/core

refactor PtrWrapper and add SceneRef

Cargo.toml

@@ -21,3 +21,4 @@ obs-sys = { path = "./obs-sys", version = "0.3.0" }
 paste = "0.1.7"
 log = {version = "0.4.11", features = ["std"]}
 num-traits = "0.2.14"
+thiserror = "1.0.58"

README.md

@@ -48,7 +48,7 @@ use obs_wrapper::{
 
 // The module that will handle creating the source.
 struct TestModule {
-    context: ModuleContext
+    context: ModuleRef
 }
 
 // The source that will be shown inside OBS.
@@ -62,7 +62,7 @@ impl Sourceable for TestSource {
     }
 
     fn get_type() -> SourceType {
-        SourceType::FILTER
+        SourceType::Filter
     }
 
     fn create(create: &mut CreatableSourceContext<Self>, source: SourceContext) -> Self {
@@ -80,11 +80,11 @@ impl GetNameSource for TestSource {
 // Implement the Module trait for TestModule. This will handle the creation of the source and
 // has some methods for telling OBS a bit about itself.
 impl Module for TestModule {
-    fn new(context: ModuleContext) -> Self {
+    fn new(context: ModuleRef) -> Self {
         Self { context }
     }
 
-    fn get_ctx(&self) -> &ModuleContext {
+    fn get_ctx(&self) -> &ModuleRef {
         &self.context
     }
 

plugins/rnnoise-denoiser-filter/src/lib.rs

@@ -29,17 +29,17 @@ struct RnnoiseDenoiserFilter {
 }
 
 struct TheModule {
-    context: ModuleContext,
+    context: ModuleRef,
 }
 
 impl Sourceable for RnnoiseDenoiserFilter {
     fn get_id() -> ObsString {
         obs_string!("rnnoise_noise_suppression_filter")
     }
     fn get_type() -> SourceType {
-        SourceType::FILTER
+        SourceType::Filter
     }
-    fn create(create: &mut CreatableSourceContext<Self>, _source: SourceContext) -> Self {
+    fn create(create: &mut CreatableSourceContext<Self>, _source: SourceRef) -> Self {
         let (sample_rate, channels) =
             create.with_audio(|audio| (audio.sample_rate(), audio.channels()));
 
@@ -172,10 +172,10 @@ impl FilterAudioSource for RnnoiseDenoiserFilter {
 }
 
 impl Module for TheModule {
-    fn new(context: ModuleContext) -> Self {
+    fn new(context: ModuleRef) -> Self {
         Self { context }
     }
-    fn get_ctx(&self) -> &ModuleContext {
+    fn get_ctx(&self) -> &ModuleRef {
         &self.context
     }
 

plugins/scroll-focus-filter/src/lib.rs

@@ -17,7 +17,7 @@ enum ServerMessage {
 }
 
 struct ScrollFocusFilter {
-    source: SourceContext,
+    source: SourceRef,
     effect: GraphicsEffect,
 
     base_dimension: GraphicsEffectVec2Param,
@@ -60,17 +60,17 @@ impl Drop for ScrollFocusFilter {
 }
 
 struct TheModule {
-    context: ModuleContext,
+    context: ModuleRef,
 }
 
 impl Sourceable for ScrollFocusFilter {
     fn get_id() -> ObsString {
         obs_string!("scroll_focus_filter")
     }
     fn get_type() -> SourceType {
-        SourceType::FILTER
+        SourceType::Filter
     }
-    fn create(create: &mut CreatableSourceContext<Self>, mut source: SourceContext) -> Self {
+    fn create(create: &mut CreatableSourceContext<Self>, mut source: SourceRef) -> Self {
         let mut effect = GraphicsEffect::from_effect_string(
             obs_string!(include_str!("./crop_filter.effect")),
             obs_string!("crop_filter.effect"),
@@ -382,10 +382,10 @@ impl UpdateSource for ScrollFocusFilter {
 }
 
 impl Module for TheModule {
-    fn new(context: ModuleContext) -> Self {
+    fn new(context: ModuleRef) -> Self {
         Self { context }
     }
-    fn get_ctx(&self) -> &ModuleContext {
+    fn get_ctx(&self) -> &ModuleRef {
         &self.context
     }