use random index

Author: meganrogge

src/vs/editor/standalone/browser/standaloneServices.ts

@@ -87,7 +87,7 @@ import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
 import { IStorageService, InMemoryStorageService } from 'vs/platform/storage/common/storage';
 import { DefaultConfiguration } from 'vs/platform/configuration/common/configurations';
 import { WorkspaceEdit } from 'vs/editor/common/languages';
-import { AudioCue, IAudioCueService, Sound } from 'vs/platform/audioCues/browser/audioCueService';
+import { AudioCue, AudioCueGroupId, IAudioCueService, Sound } from 'vs/platform/audioCues/browser/audioCueService';
 import { LogService } from 'vs/platform/log/common/logService';
 import { getEditorFeatures } from 'vs/editor/common/editorFeatures';
 import { onUnexpectedError } from 'vs/base/common/errors';
@@ -1058,6 +1058,8 @@ class StandaloneAudioService implements IAudioCueService {
 	playAudioCueLoop(cue: AudioCue): IDisposable {
 		return toDisposable(() => { });
 	}
+	playRandomAudioCue(groupId: AudioCueGroupId, allowManyInParallel?: boolean | undefined, loop?: boolean): void | IDisposable {
+	}
 }
 
 export interface IEditorOverrideServices {

src/vs/platform/audioCues/browser/audioCueService.ts

@@ -12,6 +12,10 @@ import { Event } from 'vs/base/common/event';
 import { localize } from 'vs/nls';
 import { observableFromEvent, derived } from 'vs/base/common/observable';
 
+export const enum AudioCueGroupId {
+	chatResponsePending = 'chatResponsePending'
+}
+
 export const IAudioCueService = createDecorator<IAudioCueService>('audioCue');
 
 export interface IAudioCueService {
@@ -23,6 +27,7 @@ export interface IAudioCueService {
 
 	playSound(cue: Sound, allowManyInParallel?: boolean): Promise<void>;
 	playAudioCueLoop(cue: AudioCue): IDisposable;
+	playRandomAudioCue(groupId: AudioCueGroupId, loop?: boolean): IDisposable | void;
 }
 
 export class AudioCueService extends Disposable implements IAudioCueService {
@@ -52,6 +57,16 @@ export class AudioCueService extends Disposable implements IAudioCueService {
 		await Promise.all(Array.from(sounds).map(sound => this.playSound(sound, true)));
 	}
 
+	public playRandomAudioCue(groupId: AudioCueGroupId, loop?: boolean): void | IDisposable {
+		const cues = AudioCue.allAudioCues.filter(cue => cue.groupId === groupId);
+		const index = Math.floor(Math.random() * cues.length);
+		if (loop) {
+			return this.playAudioCueLoop(cues[index]);
+		} else {
+			this.playAudioCue(cues[index]);
+		}
+	}
+
 	private getVolumeInPercent(): number {
 		const volume = this.configurationService.getValue<number>('audioCues.volume');
 		if (typeof volume !== 'number') {
@@ -209,21 +224,25 @@ export class Sound {
 	public static readonly diffLineDeleted = Sound.register({ fileName: 'diffLineDeleted.mp3' });
 	public static readonly diffLineModified = Sound.register({ fileName: 'diffLineModified.mp3' });
 	public static readonly chatRequestSent = Sound.register({ fileName: 'chatRequestSent.mp3' });
-	public static readonly chatResponsePending = Sound.register({ fileName: 'chatResponsePending.mp3' });
+	public static readonly chatResponsePending1 = Sound.register({ fileName: 'chatResponsePending1.mp3' });
+	public static readonly chatResponsePending2 = Sound.register({ fileName: 'chatResponsePending2.mp3' });
+	public static readonly chatResponsePending3 = Sound.register({ fileName: 'chatResponsePending3.mp3' });
+	public static readonly chatResponsePending4 = Sound.register({ fileName: 'chatResponsePending4.mp3' });
+	public static readonly chatResponsePending5 = Sound.register({ fileName: 'chatResponsePending5.mp3' });
 	public static readonly chatResponseReceived = Sound.register({ fileName: 'chatResponseReceived.mp3' });
 
 	private constructor(public readonly fileName: string) { }
 }
 
 export class AudioCue {
 	private static _audioCues = new Set<AudioCue>();
-
 	private static register(options: {
 		name: string;
 		sound: Sound;
 		settingsKey: string;
+		groupId?: AudioCueGroupId;
 	}): AudioCue {
-		const audioCue = new AudioCue(options.sound, options.name, options.settingsKey);
+		const audioCue = new AudioCue(options.sound, options.name, options.settingsKey, options.groupId);
 		AudioCue._audioCues.add(audioCue);
 		return audioCue;
 	}
@@ -336,10 +355,35 @@ export class AudioCue {
 		settingsKey: 'audioCues.chatRequestSent'
 	});
 
-	public static readonly chatResponsePending = AudioCue.register({
+	public static readonly chatResponsePending = {
 		name: localize('audioCues.chatResponsePending', 'Chat Response Pending'),
-		sound: Sound.chatResponsePending,
-		settingsKey: 'audioCues.chatResponsePending'
+		settingsKey: 'audioCues.chatResponsePending',
+		groupId: AudioCueGroupId.chatResponsePending
+	};
+
+	public static readonly chatResponsePending1 = AudioCue.register({
+		sound: Sound.chatResponsePending1,
+		...this.chatResponsePending
+	});
+
+	public static readonly chatResponsePending2 = AudioCue.register({
+		sound: Sound.chatResponsePending2,
+		...this.chatResponsePending
+	});
+
+	public static readonly chatResponsePending3 = AudioCue.register({
+		sound: Sound.chatResponsePending3,
+		...this.chatResponsePending
+	});
+
+	public static readonly chatResponsePending4 = AudioCue.register({
+		sound: Sound.chatResponsePending4,
+		...this.chatResponsePending
+	});
+
+	public static readonly chatResponsePending5 = AudioCue.register({
+		sound: Sound.chatResponsePending5,
+		...this.chatResponsePending
 	});
 
 	public static readonly chatResponseReceived = AudioCue.register({
@@ -352,5 +396,6 @@ export class AudioCue {
 		public readonly sound: Sound,
 		public readonly name: string,
 		public readonly settingsKey: string,
+		public readonly groupId?: string
 	) { }
 }

src/vs/platform/audioCues/browser/media/chatResponsePending.mp3 renamed to src/vs/platform/audioCues/browser/media/chatResponsePending1.mp3

@@ -16,7 +16,7 @@ import 'vs/css!./media/chat';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { localize } from 'vs/nls';
 import { MenuId } from 'vs/platform/actions/common/actions';
-import { AudioCue, IAudioCueService } from 'vs/platform/audioCues/browser/audioCueService';
+import { AudioCue, AudioCueGroupId, IAudioCueService } from 'vs/platform/audioCues/browser/audioCueService';
 import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -390,16 +390,15 @@ export class ChatWidget extends Disposable implements IChatWidget {
 				this.instantiationService.invokeFunction(clearChatSession, this);
 				return;
 			}
-			await this.audioCueService.playAudioCue(AudioCue.chatRequestSent, true);
+			this.audioCueService.playAudioCue(AudioCue.chatRequestSent, true);
 			const input = query ?? editorValue;
-			const cue = this.audioCueService.playAudioCueLoop(AudioCue.chatResponsePending);
+			const cue = this.audioCueService.playRandomAudioCue(AudioCueGroupId.chatResponsePending, true);
 			const result = await this.chatService.sendRequest(this.viewModel.sessionId, input);
-			const audioCueService = this.audioCueService;
 			if (result) {
 				this.inputPart.acceptInput(query);
 				result.responseCompletePromise.then(async () => {
-					cue.dispose();
-					audioCueService.playAudioCue(AudioCue.chatResponseReceived, true);
+					cue?.dispose();
+					this.audioCueService.playAudioCue(AudioCue.chatResponseReceived, true);
 					const responses = this.viewModel?.getItems().filter(isResponseVM);
 					const lastResponse = responses?.[responses.length - 1];
 					if (lastResponse) {