Spider - remove scsynth settings as this is now handled by the daemon

Author: samaaron

app/server/ruby/lib/sonicpi/config/scsynth_settings.rb

@@ -86,7 +86,7 @@ def self.included(base)
             @job_mixers_mutex = Mutex.new
             @job_busses = {}
             @job_busses_mutex = Mutex.new
-            @mod_sound_studio = Studio.new(ports, msg_queue, @scsynth_opts, @scsynth_clobber_args, @system_state, @register_cue_event_lambda)
+            @mod_sound_studio = Studio.new(ports, msg_queue, @system_state, @register_cue_event_lambda)
 
             buf_lookup = lambda do |name, duration=nil|
               # scale duration to the current BPM

app/server/ruby/lib/sonicpi/lang/sound.rb

@@ -25,7 +25,6 @@
 require_relative "sthread"
 require_relative "version"
 require_relative "config/settings"
-require_relative "config/scsynth_settings"
 require_relative "preparser"
 require_relative "event_history"
 require_relative "thread_id"
@@ -1326,15 +1325,8 @@ def initialize(ports, msg_queue, user_methods)
       @git_hash = __extract_git_hash
       gh_short = @git_hash ? "-#{@git_hash[0, 5]}" : ""
       @settings = Config::Settings.new(system_cache_store_path)
-      begin
-        @audio_settings = SonicPi::Config::ScsynthSettings.new(user_audio_settings_path)
-      rescue
-        # log error
-        log "Unable to load user audio settings at #{user_audio_settings_path}... reverting to defaults"
-        @audio_settings = SonicPi::Config::ScsynthSettings.new("", dummy: true)
-      end
-      @scsynth_clobber_args = @audio_settings.scsynth_opts_override
-      @scsynth_opts = @audio_settings.scsynth_opts
+      # @scsynth_clobber_args = @audio_settings.scsynth_opts_override
+      # @scsynth_opts = @audio_settings.scsynth_opts
       @version = Version.new(3, 4, 0, "dev#{gh_short}")
       @server_version = __server_version
       @life_hooks = LifeCycleHooks.new

app/server/ruby/lib/sonicpi/runtime.rb

@@ -22,15 +22,14 @@ class StudioCurrentlyRebootingError < StandardError ; end
 
     attr_accessor :cent_tuning
 
-    def initialize(ports, msg_queue, scsynth_opts, scsynth_clobber, state, register_cue_event_lambda)
+    def initialize(ports, msg_queue, state, register_cue_event_lambda)
 
       STDOUT.puts "studio init"
       STDOUT.flush
 
       @state = state
       @scsynth_port = ports[:scsynth_port]
       @scsynth_send_port = ports[:scsynth_send_port]
-      @osc_cues_port = ports[:osc_cues_port]
       @msg_queue = msg_queue
       @error_occured_mutex = Mutex.new
       @error_occurred_since_last_check = false
@@ -41,8 +40,6 @@ def initialize(ports, msg_queue, scsynth_opts, scsynth_clobber, state, register_
       @sample_format = "int16"
       @paused = false
       @register_cue_event_lambda = register_cue_event_lambda
-      @scsynth_opts = scsynth_opts
-      @scsynth_clobber = scsynth_clobber
       init_scsynth
       reset_server
       init_studio