Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 6 additions & 4 deletions Audibly.App/Audibly.App.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="AutoMapper" Version="14.0.0"/>
<PackageReference Include="CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock" Version="0.1.250206-build.2040" />
<PackageReference Include="CommunityToolkit.Labs.WinUI.MarqueeText" Version="0.1.250206-build.2040" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
<PackageReference Include="AutoMapper" Version="14.0.0" />
<PackageReference Include="LibVLCSharp" Version="3.9.4" />
<PackageReference Include="CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock" Version="0.1.250206-build.2040" />
<PackageReference Include="CommunityToolkit.Labs.WinUI.MarqueeText" Version="0.1.250206-build.2040" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
<PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.2.250402" />
<PackageReference Include="CommunityToolkit.WinUI.Controls.TokenizingTextBox" Version="8.2.250402" />
<PackageReference Include="CommunityToolkit.WinUI.DeveloperTools" Version="8.2.250402" />
Expand All @@ -134,6 +135,7 @@
<PackageReference Include="Sentry" Version="5.13.0" />
<PackageReference Include="Sharpener" Version="0.2.4" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.11" />
<PackageReference Include="VideoLAN.LibVLC.Windows.GPL" Version="3.0.23" />
<PackageReference Include="z440.atl.core" Version="7.2.0" />
</ItemGroup>

Expand Down
22 changes: 9 additions & 13 deletions Audibly.App/UserControls/PlaySkipButtonsStack.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ public double PlayButtonSize
private void PlayPauseButton_OnClick(object sender, RoutedEventArgs e)
{
if (PlayerViewModel.PlayPauseIcon == Symbol.Play)
PlayerViewModel.MediaPlayer.Play();
PlayerViewModel.Play();
else
PlayerViewModel.MediaPlayer.Pause();
PlayerViewModel.Pause();
}

private async void PreviousChapterButton_Click(object sender, RoutedEventArgs e)
Expand All @@ -62,10 +62,8 @@ private async void PreviousChapterButton_Click(object sender, RoutedEventArgs e)
.ParentSourceFileIndex != PlayerViewModel.NowPlaying?.CurrentSourceFileIndex)
{
var newChapterIdx = (int)PlayerViewModel.NowPlaying.CurrentChapterIndex - 1;
PlayerViewModel.OpenSourceFile(PlayerViewModel.NowPlaying.CurrentSourceFileIndex - 1, newChapterIdx);
PlayerViewModel.CurrentPosition =
TimeSpan.FromMilliseconds(PlayerViewModel.NowPlaying.Chapters[newChapterIdx].StartTime);
await PlayerViewModel.NowPlaying.SaveAsync();
await PlayerViewModel.OpenSourceFile(PlayerViewModel.NowPlaying.CurrentSourceFileIndex - 1, newChapterIdx,
PlayerViewModel.NowPlaying.Chapters[newChapterIdx].StartTime);

return;
}
Expand Down Expand Up @@ -98,10 +96,8 @@ private async void NextChapterButton_Click(object sender, RoutedEventArgs e)
.ParentSourceFileIndex != PlayerViewModel.NowPlaying?.CurrentSourceFileIndex)
{
var newChapterIdx = (int)PlayerViewModel.NowPlaying.CurrentChapterIndex + 1;
PlayerViewModel.OpenSourceFile(PlayerViewModel.NowPlaying.CurrentSourceFileIndex + 1, newChapterIdx);
PlayerViewModel.CurrentPosition =
TimeSpan.FromMilliseconds(PlayerViewModel.NowPlaying.Chapters[newChapterIdx].StartTime);
await PlayerViewModel.NowPlaying.SaveAsync();
await PlayerViewModel.OpenSourceFile(PlayerViewModel.NowPlaying.CurrentSourceFileIndex + 1, newChapterIdx,
PlayerViewModel.NowPlaying.Chapters[newChapterIdx].StartTime);

return;
}
Expand Down Expand Up @@ -140,10 +136,10 @@ private async void SkipForwardButton_OnClick(object sender, RoutedEventArgs e)
{
// todo: might need to switch this to using the duration from the audiobook record
PlayerViewModel.CurrentPosition = PlayerViewModel.CurrentPosition + _skipForwardButtonAmount <=
PlayerViewModel.MediaPlayer.PlaybackSession.NaturalDuration
PlayerViewModel.NaturalDuration
? PlayerViewModel.CurrentPosition + _skipForwardButtonAmount
: PlayerViewModel.MediaPlayer.PlaybackSession.NaturalDuration;
: PlayerViewModel.NaturalDuration;

await PlayerViewModel.NowPlaying.SaveAsync();
}
}
}
5 changes: 0 additions & 5 deletions Audibly.App/UserControls/PlayerControlGrid.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,6 @@
</ResourceDictionary>
</Grid.Resources>

<MediaPlayerElement
AreTransportControlsEnabled="False"
Visibility="Collapsed"
x:Name="AudioPlayer" />

<developerTools:AlignmentGrid
Grid.ColumnSpan="2"
Grid.RowSpan="3"
Expand Down
7 changes: 3 additions & 4 deletions Audibly.App/UserControls/PlayerControlGrid.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ public sealed partial class PlayerControlGrid : UserControl
public PlayerControlGrid()
{
InitializeComponent();
AudioPlayer.SetMediaPlayer(PlayerViewModel.MediaPlayer);
}

/// <summary>
Expand Down Expand Up @@ -61,8 +60,8 @@ private async void ChapterCombo_SelectionChanged(object sender, SelectionChanged
PlayerViewModel.NowPlaying.CurrentSourceFile.Index != newChapter.ParentSourceFileIndex)
{
// set the current source file index to the new source file index
PlayerViewModel.OpenSourceFile(newChapter.ParentSourceFileIndex, newChapter.Index);
PlayerViewModel.CurrentPosition = TimeSpan.FromMilliseconds(newChapter.StartTime);
await PlayerViewModel.OpenSourceFile(newChapter.ParentSourceFileIndex, newChapter.Index,
newChapter.StartTime);
}
else if (ChapterCombo.SelectedIndex != ChapterCombo.Items.IndexOf(PlayerViewModel.NowPlaying?.CurrentChapter))
{
Expand Down Expand Up @@ -166,4 +165,4 @@ private void EndOfChapterTimerMenuItem_Click(object sender, RoutedEventArgs e)

if (timerDuration > 0) PlayerViewModel.SetTimer(timerDuration);
}
}
}
4 changes: 2 additions & 2 deletions Audibly.App/ViewModels/MainViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ public async Task DeleteAudiobookAsync()
if (SelectedAudiobook == App.PlayerViewModel.NowPlaying)
_dispatcherQueue.TryEnqueue(() =>
{
App.PlayerViewModel.MediaPlayer.Pause();
App.PlayerViewModel.Pause();
App.PlayerViewModel.NowPlaying.IsNowPlaying = false;
App.PlayerViewModel.NowPlaying = null;
});
Expand Down Expand Up @@ -366,7 +366,7 @@ public async void DeleteAudiobooksAsync()
{
await _dispatcherQueue.EnqueueAsync(() =>
{
App.PlayerViewModel.MediaPlayer.Pause();
App.PlayerViewModel.Pause();
App.PlayerViewModel.NowPlaying = null;
SelectedAudiobook = null;
IsLoading = true;
Expand Down
Loading