From 5f2881d1c8a0b05f9ae1ee3e2af5b33facb46675 Mon Sep 17 00:00:00 2001
From: Nolan Darilek <nolan@thewordnerd.info>
Date: Thu, 15 Dec 2022 14:04:57 -0600
Subject: [PATCH] Use plugin struct for settings.

---
 examples/game.rs |  3 +--
 src/lib.rs       | 34 ++++++++++++++++------------------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/examples/game.rs b/examples/game.rs
index 115e5b2..0efa719 100644
--- a/examples/game.rs
+++ b/examples/game.rs
@@ -64,12 +64,11 @@ fn rotate_listener(time: Res<Time>, mut query: Query<(&mut RotationTimer, &mut T
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .insert_resource(SynthizerConfig {
+        .add_plugin(SynthizerPlugin {
             default_panner_strategy: Some(bevy_synthizer::syz::PannerStrategy::Hrtf),
             default_distance_model: Some(bevy_synthizer::syz::DistanceModel::Inverse),
             ..default()
         })
-        .add_plugin(SynthizerPlugin)
         .add_system(bevy::window::close_on_esc)
         .init_resource::<AssetHandles>()
         .add_startup_system(setup)
diff --git a/src/lib.rs b/src/lib.rs
index 4dab14e..e826d67 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -563,19 +563,6 @@ fn remove_sound(mut last_buffer: ResMut<LastBuffer>, removed: RemovedComponents<
     }
 }
 
-#[derive(Resource, Clone, Default, Debug)]
-pub struct SynthizerConfig {
-    pub default_panner_strategy: Option<syz::PannerStrategy>,
-    pub default_distance_model: Option<syz::DistanceModel>,
-    pub default_distance_ref: Option<f64>,
-    pub default_distance_max: Option<f64>,
-    pub default_rolloff: Option<f64>,
-    pub default_closeness_boost: Option<f64>,
-    pub default_closeness_boost_distance: Option<f64>,
-    pub log_level: syz::LogLevel,
-    pub log_to_stderr: bool,
-}
-
 #[derive(Resource, Debug)]
 pub struct SynthizerDefaults {
     pub panner_strategy: syz::PannerStrategy,
@@ -589,7 +576,7 @@ pub struct SynthizerDefaults {
 
 fn sync_config(
     context: Res<Context>,
-    config: Res<SynthizerConfig>,
+    config: Res<SynthizerPlugin>,
     defaults: Res<SynthizerDefaults>,
 ) {
     if config.is_changed() {
@@ -682,14 +669,25 @@ pub enum SynthizerSystems {
 #[derive(Resource)]
 struct InitializationGuard(syz::InitializationGuard);
 
-pub struct SynthizerPlugin;
+#[derive(Resource, Clone, Default, Debug)]
+pub struct SynthizerPlugin {
+    pub default_panner_strategy: Option<syz::PannerStrategy>,
+    pub default_distance_model: Option<syz::DistanceModel>,
+    pub default_distance_ref: Option<f64>,
+    pub default_distance_max: Option<f64>,
+    pub default_rolloff: Option<f64>,
+    pub default_closeness_boost: Option<f64>,
+    pub default_closeness_boost_distance: Option<f64>,
+    pub log_level: syz::LogLevel,
+    pub log_to_stderr: bool,
+}
 
 impl Plugin for SynthizerPlugin {
     fn build(&self, app: &mut App) {
-        if !app.world.contains_resource::<SynthizerConfig>() {
-            app.insert_resource(SynthizerConfig::default());
+        if !app.world.contains_resource::<SynthizerPlugin>() {
+            app.insert_resource(self.clone());
         }
-        let config = app.world.get_resource::<SynthizerConfig>().unwrap().clone();
+        let config = app.world.get_resource::<SynthizerPlugin>().unwrap().clone();
         let mut syz_config = syz::LibraryConfig::new();
         syz_config.log_level(config.log_level);
         if config.log_to_stderr {