Display total tracks and indexes

This commit is contained in:
deagahelio
2021-03-26 09:57:05 -03:00
parent 17c5ed7a6f
commit 927c63d5a0
3 changed files with 47 additions and 10 deletions

View File

@@ -43,6 +43,7 @@ namespace RedBookPlayer
byte[] flagsData = Image.ReadSectorTag(Image.Tracks[CurrentTrack].TrackSequence, SectorTagType.CdTrackFlags); byte[] flagsData = Image.ReadSectorTag(Image.Tracks[CurrentTrack].TrackSequence, SectorTagType.CdTrackFlags);
HasPreEmphasis = ((CdFlags)flagsData[0]).HasFlag(CdFlags.PreEmphasis); HasPreEmphasis = ((CdFlags)flagsData[0]).HasFlag(CdFlags.PreEmphasis);
TotalIndexes = Image.Tracks[CurrentTrack].Indexes.Count;
CurrentIndex = Image.Tracks[CurrentTrack].Indexes.Keys.GetEnumerator().Current; CurrentIndex = Image.Tracks[CurrentTrack].Indexes.Keys.GetEnumerator().Current;
} }
} }
@@ -91,6 +92,8 @@ namespace RedBookPlayer
} }
} }
public bool HasPreEmphasis { get; private set; } = false; public bool HasPreEmphasis { get; private set; } = false;
public int TotalTracks { get; private set; } = 0;
public int TotalIndexes { get; private set; } = 0;
public AaruFormat Image { get; private set; } public AaruFormat Image { get; private set; }
FullTOC.CDFullTOC toc; FullTOC.CDFullTOC toc;
PlayerSource source; PlayerSource source;
@@ -151,6 +154,7 @@ namespace RedBookPlayer
LoadTrack(CurrentTrack); LoadTrack(CurrentTrack);
TotalTracks = image.Tracks.Count;
Initialized = true; Initialized = true;
source.Start(); source.Start();

View File

@@ -4,7 +4,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d" mc:Ignorable="d"
x:Class="RedBookPlayer.PlayerView" x:Class="RedBookPlayer.PlayerView"
Width="900" Height="300"> Width="900" Height="400">
<StackPanel Margin="16" VerticalAlignment="Center"> <StackPanel Margin="16" VerticalAlignment="Center">
<Button Click="LoadButton_Click" Margin="32,0,32,16">Load</Button> <Button Click="LoadButton_Click" Margin="32,0,32,16">Load</Button>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,0,0,16"> <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,0,0,16">
@@ -49,6 +49,22 @@
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,0,0,16">
<StackPanel Margin="0,0,32,0">
<TextBlock Margin="0,0,0,4">TRACKS</TextBlock>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
<Image Name="TotalTracksDigit1" Width="42" Height="51" Source="/Assets/-.png"></Image>
<Image Name="TotalTracksDigit2" Width="42" Height="51" Source="/Assets/-.png"></Image>
</StackPanel>
</StackPanel>
<StackPanel>
<TextBlock Margin="0,0,0,4">INDEXES</TextBlock>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
<Image Name="TotalIndexesDigit1" Width="42" Height="51" Source="/Assets/-.png"></Image>
<Image Name="TotalIndexesDigit2" Width="42" Height="51" Source="/Assets/-.png"></Image>
</StackPanel>
</StackPanel>
</StackPanel>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center"> <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
<Button Click="EnableDeEmphasisButton_Click" IsVisible="{Binding !PreEmphasis}" Width="200" Margin="0,0,16,0">Enable De-Emphasis</Button> <Button Click="EnableDeEmphasisButton_Click" IsVisible="{Binding !PreEmphasis}" Width="200" Margin="0,0,16,0">Enable De-Emphasis</Button>
<Button Click="DisableDeEmphasisButton_Click" IsVisible="{Binding PreEmphasis}" Width="200" Margin="0,0,16,0">Disable De-Emphasis</Button> <Button Click="DisableDeEmphasisButton_Click" IsVisible="{Binding PreEmphasis}" Width="200" Margin="0,0,16,0">Disable De-Emphasis</Button>

View File

@@ -137,18 +137,27 @@ namespace RedBookPlayer
{ {
if (player.Initialized) if (player.Initialized)
{ {
string track = (player.CurrentTrack + 1).ToString().PadLeft(2, '0'); int[] numbers = new int[]{
string index = (player.CurrentIndex).ToString().PadLeft(2, '0'); player.CurrentTrack + 1,
string frames = (player.CurrentSector % 75).ToString().PadLeft(2, '0'); player.CurrentIndex,
string seconds = ((player.CurrentSector / 75) % 60).ToString().PadLeft(2, '0'); (int)((player.CurrentSector / (75 * 60)) % 60),
string minutes = ((player.CurrentSector / (75 * 60)) % 60).ToString().PadLeft(2, '0'); (int)((player.CurrentSector / 75) % 60),
(int)(player.CurrentSector % 75),
player.TotalTracks,
player.TotalIndexes
};
string digitString = String.Join("", numbers.Select(i => i.ToString().PadLeft(2, '0').Substring(0, 2)));
Dispatcher.UIThread.InvokeAsync(() => Dispatcher.UIThread.InvokeAsync(() =>
{ {
int i = 0; for (int i = 0; i < digits.Length; i++)
foreach (char digit in track + index + minutes + seconds + frames) {
if (digits[i] != null) if (digits[i] != null)
digits[i++].Source = GetBitmap(digit); {
digits[i].Source = GetBitmap(digitString[i]);
}
}
((PlayerViewModel)DataContext).PreEmphasis = player.HasPreEmphasis; ((PlayerViewModel)DataContext).PreEmphasis = player.HasPreEmphasis;
}); });
@@ -160,7 +169,9 @@ namespace RedBookPlayer
foreach (Image digit in digits) foreach (Image digit in digits)
{ {
if (digit != null) if (digit != null)
{
digit.Source = GetBitmap('-'); digit.Source = GetBitmap('-');
}
} }
}); });
} }
@@ -187,7 +198,7 @@ namespace RedBookPlayer
public void Initialize() public void Initialize()
{ {
digits = new Image[10]; digits = new Image[14];
digits[0] = this.FindControl<Image>("TrackDigit1"); digits[0] = this.FindControl<Image>("TrackDigit1");
digits[1] = this.FindControl<Image>("TrackDigit2"); digits[1] = this.FindControl<Image>("TrackDigit2");
@@ -202,6 +213,12 @@ namespace RedBookPlayer
digits[8] = this.FindControl<Image>("TimeDigit5"); digits[8] = this.FindControl<Image>("TimeDigit5");
digits[9] = this.FindControl<Image>("TimeDigit6"); digits[9] = this.FindControl<Image>("TimeDigit6");
digits[10] = this.FindControl<Image>("TotalTracksDigit1");
digits[11] = this.FindControl<Image>("TotalTracksDigit2");
digits[12] = this.FindControl<Image>("TotalIndexesDigit1");
digits[13] = this.FindControl<Image>("TotalIndexesDigit2");
currentTrack = this.FindControl<TextBlock>("CurrentTrack"); currentTrack = this.FindControl<TextBlock>("CurrentTrack");
} }