Skip to content

Commit 469d486

Browse files
Simber1Simber1
committed
Cleaned up some code
1 parent 82541d4 commit 469d486

File tree

2 files changed

+24
-43
lines changed

2 files changed

+24
-43
lines changed

‎CSediaPlayer/MainWindow.xaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@
77
mc:Ignorable="d"
88
Title="MainWindow" Height="450" Width="800" Closing="Close">
99
<Grid>
10-
<TextBlock x:Name="Current_Playing_Text" HorizontalAlignment="Left" Height="22.029" Margin="82.331,173.403,0,0" TextWrapping="Wrap" Text="Currently Playing:" VerticalAlignment="Top" Width="93.324"/>
11-
<Button x:Name="play" Content="Play" HorizontalAlignment="Left" Height="50.719" Margin="375.173,53.403,0,0" VerticalAlignment="Top" Width="142.446" Click="Play"/>
12-
<Button x:Name="pause" Content="Pause" HorizontalAlignment="Left" Height="50.719" Margin="522.619,53.403,0,0" VerticalAlignment="Top" Width="146.762" Click="Pause"/>
13-
<Button x:Name="stop" Content="Stop" HorizontalAlignment="Left" Height="50.719" Margin="82.331,53.403,0,0" VerticalAlignment="Top" Width="136.08" Click="Stop"/>
14-
<Button x:Name="select" Content="Song Select" HorizontalAlignment="Left" Height="50.719" Margin="223.411,53.403,0,0" VerticalAlignment="Top" Width="146.762" Click="Select"/>
15-
<Slider x:Name="Progress_Slider" HorizontalAlignment="Left" Height="30" Margin="82,275,0,0" VerticalAlignment="Top" Width="587" Value="0.1"/>
16-
<TextBlock x:Name="Current_Playing" HorizontalAlignment="Left" Height="56" Margin="181,173,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="601"><Run Text="Now Playing"/><LineBreak/><Run/></TextBlock>
17-
<TextBlock x:Name="Current_Time" HorizontalAlignment="Left" Margin="55.321,275,0,0" TextWrapping="Wrap" Text="0:00" VerticalAlignment="Top"/>
18-
<TextBlock x:Name="Max_Time" HorizontalAlignment="Left" Margin="674.381,275,0,0" TextWrapping="Wrap" Text="0:00" VerticalAlignment="Top"/>
19-
<Slider x:Name="Volume_Slider" HorizontalAlignment="Left" Height="26" Margin="115,331,0,0" VerticalAlignment="Top" Width="103.411" ValueChanged="VolumeSlider" Maximum="100"/>
20-
<TextBlock x:Name="Volume_Text" HorizontalAlignment="Left" Height="21" Margin="145,310,0,0" TextWrapping="Wrap" Text="Volume" VerticalAlignment="Top" Width="46"/>
21-
<ToggleButton x:Name="Mute_Toggle" Content="Mute" HorizontalAlignment="Left" Height="21" Margin="223,331,0,0" VerticalAlignment="Top" Width="56" Checked="Mute" Unchecked="Mute"/>
10+
<TextBlock x:Name="Current_Playing_Text" HorizontalAlignment="Right" Height="22" Margin="0,173,616,0" TextWrapping="Wrap" Text="Currently Playing:" VerticalAlignment="Top" Width="94"/>
11+
<Button x:Name="play" Content="Play" HorizontalAlignment="Left" Height="51" Margin="375,0,0,315" VerticalAlignment="Bottom" Width="143" Click="Play"/>
12+
<Button x:Name="pause" Content="Pause" HorizontalAlignment="Left" Height="51" Margin="523,0,0,315" VerticalAlignment="Bottom" Width="146" Click="Pause"/>
13+
<Button x:Name="stop" Content="Stop" HorizontalAlignment="Right" Height="51" Margin="0,0,574,315" VerticalAlignment="Bottom" Width="136" Click="Stop"/>
14+
<Button x:Name="select" Content="Song Select" HorizontalAlignment="Right" Height="51" Margin="0,0,422,315" VerticalAlignment="Bottom" Width="147" Click="Select"/>
15+
<Slider x:Name="Progress_Slider" Height="30" Margin="0,275,123,0" VerticalAlignment="Top" Value="0.1" HorizontalAlignment="Right" Width="587"/>
16+
<TextBlock x:Name="Current_Playing" HorizontalAlignment="Right" Height="56" Margin="0,173,10,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="601"><Run Text="Now Playing"/><LineBreak/><Run/></TextBlock>
17+
<TextBlock x:Name="Current_Time" HorizontalAlignment="Left" Margin="55,275,0,0" TextWrapping="Wrap" Text="0:00" VerticalAlignment="Top"/>
18+
<TextBlock x:Name="Max_Time" HorizontalAlignment="Right" Margin="0,275,96,0" TextWrapping="Wrap" Text="0:00" VerticalAlignment="Top"/>
19+
<Slider x:Name="Volume_Slider" HorizontalAlignment="Right" Height="26" Margin="0,331,574,0" VerticalAlignment="Top" Width="103" ValueChanged="VolumeSlider" Maximum="100"/>
20+
<TextBlock x:Name="Volume_Text" HorizontalAlignment="Right" Margin="0,310,601,0" TextWrapping="Wrap" Text="Volume" Width="46" Height="21" VerticalAlignment="Top"/>
21+
<ToggleButton x:Name="Mute_Toggle" Content="Mute" HorizontalAlignment="Right" Height="21" Margin="0,331,513,0" VerticalAlignment="Top" Width="56" Checked="Mute" Unchecked="Mute"/>
2222
<Button x:Name="tempUpdate" Content="Update song pos" HorizontalAlignment="Left" Height="25" Margin="548,232,0,0" VerticalAlignment="Top" Width="121" Click="temp"/>
2323

2424
</Grid>

‎CSediaPlayer/MainWindow.xaml.cs‎

Lines changed: 12 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public partial class MainWindow : Window
1717
double volume;
1818
double prevVolume;
1919
string path;
20-
bool FirstRun =true;
20+
bool FirstRun = true;
2121
Thread LoopingThread;
2222

2323

@@ -58,9 +58,9 @@ private void SongSelect()
5858
if (file.ShowDialog() == true)
5959
{
6060
path = file.FileName;
61-
Console.WriteLine(path);
62-
player.URL = path;
63-
Current_Playing.Text = player.currentMedia.name;
61+
Console.WriteLine(path);
62+
player.URL = path;
63+
Current_Playing.Text = player.currentMedia.name;
6464
}
6565

6666

@@ -70,26 +70,21 @@ private void SongSelect()
7070

7171
private void Looper()
7272
{
73-
if (FirstRun)
74-
{
75-
//Thread.Sleep(500);
76-
FirstRun = false;
77-
}
7873
while (true)
7974
{
80-
System.Threading.Thread.Sleep(100);
75+
System.Threading.Thread.Sleep(50);
8176

82-
this.Dispatcher.Invoke(() =>
83-
{
84-
if (player.currentMedia.duration > 1 && player.controls.currentPosition > 1)
85-
{
77+
this.Dispatcher.Invoke(() =>
78+
{
79+
if (player.currentMedia.duration > 1 && player.controls.currentPosition > 1)
80+
{
8681

8782
UpdateSongPosition();
8883

89-
}
90-
});
84+
}
85+
});
9186

92-
}
87+
}
9388
}
9489

9590
private void UpdateSongPosition()
@@ -150,20 +145,6 @@ private void VolumeSlider(object sender, RoutedPropertyChangedEventArgs<double>
150145
VolumeUpdate();
151146
}
152147

153-
public static void DelayAction(int millisecond, Action action)
154-
{
155-
var timer = new DispatcherTimer();
156-
timer.Tick += delegate
157-
158-
{
159-
action.Invoke();
160-
timer.Stop();
161-
};
162-
163-
timer.Interval = TimeSpan.FromMilliseconds(millisecond);
164-
timer.Start();
165-
}
166-
167148
private void temp(object sender, RoutedEventArgs e)
168149
{
169150
UpdateSongPosition();

0 commit comments

Comments
 (0)