Skip to content

Commit 69f29dc

Browse files
committed
AudioSourcePlayer: backward compatibility
1 parent a936e30 commit 69f29dc

File tree

3 files changed

+23
-2
lines changed

3 files changed

+23
-2
lines changed

Assets/DevLocker/Audio/AudioSourceInterrupter.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,12 @@ public class AudioSourceInterrupter : MonoBehaviour
1717
public AudioSource[] AudioSources;
1818

1919
[Tooltip("AudioSourcePlayers that are playing these AudioResources will be stopped")]
20+
21+
#if UNITY_2023_2_OR_NEWER
2022
public AudioResource[] Resources;
23+
#else
24+
public AudioClip[] Resources;
25+
#endif
2126

2227
[Tooltip("AudioSourcePlayers that are playing AudioResources with names containing this string (case-insensitive) will be stopped")]
2328
public string ResourceNameContains = "";

Assets/DevLocker/Audio/AudioSourcePlayer.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,13 @@ private IEnumerator FadeVolumeCrt(float fadeSeconds, bool fadeIn, System.Action
402402

403403
protected virtual void Update()
404404
{
405-
if (m_ShouldPlayRepeating && m_RepeatPattern == RepeatPatternType.RepeatInterval && m_AudioSource && m_AudioSource.resource) {
405+
if (m_ShouldPlayRepeating && m_RepeatPattern == RepeatPatternType.RepeatInterval && m_AudioSource
406+
#if UNITY_2023_2_OR_NEWER
407+
&& m_AudioSource.resource
408+
#else
409+
&& m_AudioSource.clip
410+
#endif
411+
) {
406412
if (IsPlaying != m_LastIsPlaying) {
407413
if (!IsPlaying) {
408414
m_NextPlayTime = Time.time + UnityEngine.Random.Range(m_RepeatIntervalRange.MinSeconds, m_RepeatIntervalRange.MaxSeconds);

Assets/DevLocker/Audio/Editor/AudioSourcePlayerMonitorWindow.cs

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@ private struct ActionEntry
2828
public float Time;
2929

3030
public AudioSourcePlayer Player;
31+
#if UNITY_2023_2_OR_NEWER
3132
public AudioResource Resource;
33+
#else
34+
public AudioClip Resource;
35+
#endif
3236
public AudioMixerGroup MixerGroup;
3337
public AudioSource Template;
3438

@@ -192,6 +196,12 @@ void OnGUI()
192196

193197
m_ScrollView = GUILayout.BeginScrollView(m_ScrollView);
194198

199+
#if UNITY_2023_2_OR_NEWER
200+
var audioType = typeof(AudioResource);
201+
#else
202+
var audioType = typeof(AudioClip);
203+
#endif
204+
195205
// Table Content
196206
for (int i = m_Actions.Count - 1; i >= 0; i--) {
197207
var action = m_Actions[i];
@@ -203,7 +213,7 @@ void OnGUI()
203213

204214
float objectMarginFix = 5;
205215
EditorGUILayout.ObjectField(action.Player, typeof(AudioSourcePlayer), true, GUILayout.Width(objectFlexibleWidth - objectMarginFix));
206-
EditorGUILayout.ObjectField(action.Resource, typeof(AudioResource), true, GUILayout.Width(objectFlexibleWidth - objectMarginFix));
216+
EditorGUILayout.ObjectField(action.Resource, audioType, true, GUILayout.Width(objectFlexibleWidth - objectMarginFix));
207217
EditorGUILayout.ObjectField(action.MixerGroup, typeof(AudioMixerGroup), true, GUILayout.Width(objectFlexibleWidth - objectMarginFix));
208218
EditorGUILayout.ObjectField(action.Template, typeof(AudioSource), true, GUILayout.Width(objectFlexibleWidth - objectMarginFix));
209219

0 commit comments

Comments
 (0)