Core - work with current_bpm_mode where necessary

Previously we we just using current_bpm which worked fine prior to the new :link mode. To maintain compatibility, within :link mode current_bpm returns Link's current bpm as a number. However, this function was also being used in places where the mode was important rather than the current value.

This fixes issues when syncing within :link bpm mode observed on the forums: https://in-thread.sonic-pi.net/t/demo-of-experimental-ableton-link-with-sonic-pi/5869/5?u=samaaron

Author: samaaron

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

@@ -30,7 +30,7 @@ def initialize(time, priority, thread_id, delta, beat, bpm, path, val, meta={})
       @thread_id = thread_id
       @delta = delta.to_i
       @beat = beat.to_f
-      @bpm = bpm.to_f
+      @bpm = bpm
 
       if path.is_a?(Symbol)
         @path = @@path_cache[path] || @@path_cache[path] = "/cue/#{path}".strip.freeze

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

@@ -108,7 +108,7 @@ def __cueset(k, val, prefix)
         d = __system_thread_locals.get(:sonic_pi_spider_thread_delta)
         __system_thread_locals.set_local(:sonic_pi_spider_thread_delta, d + 1)
         p = __system_thread_locals.get(:sonic_pi_spider_thread_priority, 0)
-        m = current_bpm
+        m = current_bpm_mode
 
         ce = CueEvent.new(t, p, i, d, b, m, cue_path, val)
 
@@ -316,7 +316,7 @@ def get_event(*args)
           i = __current_thread_id
           d = __system_thread_locals.get(:sonic_pi_spider_thread_delta)
           p = __system_thread_locals.get(:sonic_pi_spider_thread_priority, 1001)
-          m = current_bpm
+          m = current_bpm_mode
 
           @event_history.get(t, p, i, d, b, m, k)
         end
@@ -2153,6 +2153,9 @@ def live_loop(name=nil, *args, &block)
 
         sync_sym = args_h[:sync]
         sync_bpm_sym = args_h[:sync_bpm]
+
+        #handle case where user passes both :sync and :sync_bpm opts.
+        # --> sync_bpm overrides sync
         sync_sym = nil if sync_bpm_sym
 
         raise LiveLockError, "livelock detection - live_loop cannot sync with itself - please choose another sync name for live_loop #{name.inspect}" if name == sync_sym || name == sync_bpm_sym
@@ -3649,7 +3652,7 @@ def use_bpm(bpm, &block)
       def with_bpm(bpm, &block)
         raise ArgumentError, "with_bpm must be called with a do/end block. Perhaps you meant use_bpm" unless block
         raise ArgumentError, "with_bpm's BPM should be a positive value. You tried to use: #{bpm}" unless bpm > 0
-        current_bpm = __get_spider_bpm
+        current_bpm = __get_spider_bpm_mode
         use_bpm bpm
         res = block.call
         use_bpm current_bpm
@@ -4035,7 +4038,7 @@ def set_sched_ahead_time!(sat)
         t = __get_spider_time
         b = __get_spider_beat_
         i = __current_thread_id
-        m = current_bpm
+        m = current_bpm_mode
         @system_state.set(t, 0, i, 0, b, m, :sched_ahead_time, sat)
         __info "Schedule ahead time set to #{sat}"
       end
@@ -4299,7 +4302,7 @@ def __live_loop_cue(id)
         d = __system_thread_locals.get(:sonic_pi_spider_thread_delta)
         __system_thread_locals.set_local(:sonic_pi_spider_thread_delta, d + 1)
         cue_path = "/live_loop/#{id}"
-        @register_cue_event_lambda.call(t, p, __current_thread_id, d, current_beat, current_bpm, cue_path, [], __current_sched_ahead_time)
+        @register_cue_event_lambda.call(t, p, __current_thread_id, d, current_beat, current_bpm_mode, cue_path, [], __current_sched_ahead_time)
       end
 
 
@@ -4368,7 +4371,7 @@ def sync_event(*args)
           raise StandardError, "Incorrect bpm value. Expecting either :link or a number such as 120" unless ((se.bpm == :link) || se.bpm.is_a?(Numeric))
           __change_spider_bpm_time_and_beat!(se.bpm, se.time, se.beat)
         else
-          __change_spider_bpm_time_and_beat!(current_bpm, se.time, se.beat)
+          __change_spider_bpm_time_and_beat!(current_bpm_mode, se.time, se.beat)
         end
 
         run_info = ""