Skip to content

Multiple file select on sound selection #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ioerrorle wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Multiple file select on sound selection #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion UI/Components/SoundComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ public class SoundComponent : LogicComponent, IDeactivatableComponent
private SoundSettings Settings { get; set; }
private WaveOut Player { get; set; }

private Random rnd;

public SoundComponent(LiveSplitState state)
{
Activated = true;
Expand All @@ -35,6 +37,8 @@ public SoundComponent(LiveSplitState state)
State.OnPause += State_OnPause;
State.OnResume += State_OnResume;
State.OnReset += State_OnReset;

rnd = new Random();
}

public override void Dispose()
Expand Down Expand Up @@ -160,10 +164,19 @@ private void State_OnReset(object sender, TimerPhase e)
PlaySound(Settings.Reset, Settings.ResetVolume);
}

private void PlaySound(string location, int volume)
private void PlaySound(string locations, int volume)
{
Player.Stop();

int index = 0;
string[] locationsArray = locations.Split(';');
if (locationsArray.Length > 1)
{
index = rnd.Next(0, locations.Length);
}

string location = locationsArray[index];

Comment on lines +171 to +179
Copy link
Author

@ioerrorle ioerrorle Jun 9, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is kinda questionable, should make some kind of regex-parser for paths so they could contain semicolon symbol

if (Activated && File.Exists(location))
{
Task.Factory.StartNew(() =>
Expand Down
5 changes: 3 additions & 2 deletions UI/Components/SoundSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,14 +204,15 @@ protected string BrowseForPath(TextBox textBox, Action<string> callback)
var path = textBox.Text;
var fileDialog = new OpenFileDialog()
{
FileName = path,
Multiselect = true,
FileName = path.Split(';')[0],
Filter = "Audio Files|*.mp3;*.wav;*.aiff;*.wma|All Files|*.*"
};

var result = fileDialog.ShowDialog();

if (result == DialogResult.OK)
path = fileDialog.FileName;
path = String.Join(";", fileDialog.FileNames);

textBox.Text = path;
callback(path);
Expand Down