Skip to content

Commit 32034fd

Browse files
author
RootCubed
committed
Make load counting include the last frame
1 parent 61aff46 commit 32034fd

4 files changed

Lines changed: 11 additions & 3 deletions

File tree

FinalRetimeWindow.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<Label Grid.Row="2" Grid.Column="1" Content="Loads:" HorizontalAlignment="Center" Margin="0,10,0,0" VerticalAlignment="Top" FontSize="15"/>
2727
<Label x:Name="WLoads" Grid.Row="3" Content="--:--.---" HorizontalAlignment="Center" Margin="0,10,0,0" VerticalAlignment="Top" FontSize="15"/>
2828
<Label x:Name="Loads" Grid.Row="3" Grid.Column="1" Content="--:--.---" HorizontalAlignment="Center" Margin="0,10,0,0" VerticalAlignment="Top" FontSize="15"/>
29-
<Label Grid.Row="4" Grid.ColumnSpan="2" Content="Generated with LoadRetimer v1.2" HorizontalAlignment="Center" FontSize="10" />
29+
<Label Grid.Row="4" Grid.ColumnSpan="2" Content="Generated with LoadRetimer v1.3" HorizontalAlignment="Center" FontSize="10" />
3030
<Button Grid.Row="5" Grid.ColumnSpan="2" Content="Close" Click="Button_Click" />
3131
</Grid>
3232
</Window>

Info.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<Grid.ColumnDefinitions>
1818
<ColumnDefinition Width="1*" />
1919
</Grid.ColumnDefinitions>
20-
<Label Content="Load Retimer v1.2" HorizontalAlignment="Center" Margin="0,10,0,0" VerticalAlignment="Top" FontSize="25"/>
20+
<Label Content="Load Retimer v1.3" HorizontalAlignment="Center" Margin="0,10,0,0" VerticalAlignment="Top" FontSize="25"/>
2121
<TextBlock Grid.Row="1" HorizontalAlignment="Center" TextWrapping="Wrap" VerticalAlignment="Top" Padding="2,0,0,0">
2222
Controls:<LineBreak/>
2323
A/D: go back/forwards 1 frame<LineBreak/>

LoadInfo.xaml.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ public partial class LoadInfo : UserControl {
1010
public long frameStart = -1;
1111
public long frameEnd = -1;
1212

13+
private bool isInclusive = false;
14+
1315
public LoadInfo() {
1416
InitializeComponent();
1517
TryCalculate();
@@ -29,6 +31,10 @@ public void MakeUnchangable() {
2931
LoadName.IsReadOnly = true;
3032
}
3133

34+
public void MakeNonInclusive() {
35+
isInclusive = true;
36+
}
37+
3238
public void SetBegin(TimeSpan begin) {
3339
frameStart = (long) Math.Round(begin.TotalSeconds * MainWindow.frameRate);
3440
TryCalculate();
@@ -60,7 +66,8 @@ private void TryCalculate() {
6066

6167
public int FrameDuration() {
6268
if (frameStart > -1 && frameEnd > -1) {
63-
return (int)(frameEnd - frameStart);
69+
long addEnd = (isInclusive) ? 0 : 1;
70+
return (int)(frameEnd - frameStart + addEnd); // get inclusive length
6471
} else {
6572
return 0;
6673
}

MainWindow.xaml.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ public MainWindow() {
7979
InitializeComponent();
8080
Unosquare.FFME.Library.FFmpegDirectory = @"./ffmpeg";
8181
TotalRunInfo.SetName("Entire Run");
82+
TotalRunInfo.MakeNonInclusive();
8283
TotalRunInfo.MakeUnchangable();
8384

8485
Video.ScrubbingEnabled = false;

0 commit comments

Comments
 (0)