mirrors/FRESHMusicPlayer
1
0
Fork 0
mirror of https://github.com/Royce551/FRESHMusicPlayer.git synced 2025-01-22 10:51:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixes

Browse source
This commit is contained in:
Royce551 2021-05-03 20:42:10 -05:00
parent afd51e2b55
commit c9a659248c
11 changed files with 72 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/App.axaml.cs
View file

@ -21,8 +21,9 @@ namespace FRESHMusicPlayer
{
DataContext = new MainWindowViewModel(),
};
}
Name = MainWindowViewModel.ProjectName;
base.OnFrameworkInitializationCompleted();
}
}

BIN
FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/Backends/FmpBassBackend.dll
View file

Binary file not shown.

BIN
FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/Backends/libbassflac.dylib Normal file
View file

Binary file not shown.

BIN
FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/Backends/libbassflac.so Normal file
View file

Binary file not shown.

6
FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/FRESHMusicPlayer-Avalonia.csproj
View file

@ -43,6 +43,12 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
</None>
<None Update="Backends\libbassflac.dylib">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Backends\libbassflac.so">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Backends\ManagedBass.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>

4
FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/Handlers/Configuration/ConfigurationFile.cs
View file

@ -41,5 +41,9 @@ namespace FRESHMusicPlayer.Handlers.Configuration
/// </summary>
public int CurrentTab { get; set; } = 0;
public List<string> AutoImportPaths { get; set; } = new List<string>();
/// <summary>
/// Whether the "downloaded wrong thing" warning was already shown
/// </summary>
public bool WindowsWarningWasShown { get; set; } = false;
}
}

9
FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/ViewModels/MainWindowViewModel.cs
View file

@ -68,12 +68,11 @@ namespace FRESHMusicPlayer.ViewModels
{
this.RaisePropertyChanged(nameof(CurrentTime));
this.RaisePropertyChanged(nameof(CurrentTimeSeconds));
this.RaisePropertyChanged(nameof(TotalTime));
this.RaisePropertyChanged(nameof(TotalTimeSeconds));
Player.AvoidNextQueue = false;
}
private void Player_SongChanged(object sender, EventArgs e)
private async void Player_SongChanged(object sender, EventArgs e)
{
var track = new Track(Player.FilePath);
Artist = track.Artist;
@ -84,6 +83,10 @@ namespace FRESHMusicPlayer.ViewModels
this.RaisePropertyChanged(nameof(TotalTimeSeconds));
WindowTitle = $"{track.Artist} - {track.Title} | {ProjectName}";
ProgressTimer.Start();
await Task.Delay(100); // small delay to avoid fuckery with bass backend
this.RaisePropertyChanged(nameof(TotalTime));
this.RaisePropertyChanged(nameof(TotalTimeSeconds));
Volume = Player.Volume;
}
public bool RepeatModeNone { get => Player.Queue.RepeatMode == RepeatMode.None; }

18
FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/ViewModels/QueueManagementViewModel.cs
View file

@ -19,8 +19,11 @@ namespace FRESHMusicPlayer.ViewModels
public ObservableCollection<QueueManagementEntry> Queue { get; set; } = new();
private bool isReady = false;
public void Update()
{
isReady = false;
Queue.Clear();
int number = 1;
foreach (var track in Player.Queue.Queue)
@ -30,22 +33,24 @@ namespace FRESHMusicPlayer.ViewModels
{
Title = info.Title,
Artist = info.Artist,
Position = number
Position = number,
Length = info.Length
};
entry.IsCurrentTrack = Player.Queue.Position == number;
Queue.Add(entry);
number++;
}
isReady = true;
}
public void JumpToCommand(int position)
{
Player.Queue.Position = position;
Player.Queue.Position = position - 1;
Player.PlayMusic();
}
public void RemoveCommand(int position)
{
Player.Queue.Remove(position);
Player.Queue.Remove(position - 1);
}
private TimeSpan timeRemaining = new();
@ -68,15 +73,17 @@ namespace FRESHMusicPlayer.ViewModels
{
await Dispatcher.UIThread.InvokeAsync(() =>
{
TimeSpan x = new();
int i = 1;
int i2 = 0;
foreach (var track in Player.Queue.Queue)
{
i++;
if (i <= Player.Queue.Position) continue;
var y = Library.GetFallbackTrack(track);
var y = Queue[i2];
x += TimeSpan.FromSeconds(y.Length);
i2++;
}
x -= Player.CurrentTime;
TimeRemaining = x;
@ -104,5 +111,6 @@ namespace FRESHMusicPlayer.ViewModels
public string Artist { get; init; }
public int Position { get; init; }
public bool IsCurrentTrack { get; set; }
public int Length { get; init; }
}
}

10
FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/Views/MainWindow.axaml.cs
View file

@ -12,7 +12,7 @@ namespace FRESHMusicPlayer.Views
{
public class MainWindow : Window
{
private MainWindowViewModel viewModel { get => DataContext as MainWindowViewModel; }
private MainWindowViewModel ViewModel { get => DataContext as MainWindowViewModel; }
public MainWindow()
{
InitializeComponent();
@ -43,7 +43,7 @@ namespace FRESHMusicPlayer.Views
private void OnClosing(object sender, CancelEventArgs e)
{
viewModel?.CloseThings();
ViewModel?.CloseThings();
}
private void OnPlayButtonClick(object sender, RoutedEventArgs e) // TODO: figure out why i need this stuff instead
@ -51,7 +51,7 @@ namespace FRESHMusicPlayer.Views
var cmd = (Button)sender;
if (cmd.DataContext is DatabaseTrack x)
{
viewModel?.PlayCommand(x.Path);
ViewModel?.PlayCommand(x.Path);
}
}
private void OnEnqueueButtonClick(object sender, RoutedEventArgs e)
@ -59,7 +59,7 @@ namespace FRESHMusicPlayer.Views
var cmd = (Button)sender;
if (cmd.DataContext is DatabaseTrack x)
{
viewModel?.EnqueueCommand(x.Path);
ViewModel?.EnqueueCommand(x.Path);
}
}
private void OnDeleteButtonClick(object sender, RoutedEventArgs e)
@ -67,7 +67,7 @@ namespace FRESHMusicPlayer.Views
var cmd = (Button)sender;
if (cmd.DataContext is DatabaseTrack x)
{
viewModel?.DeleteCommand(x.Path);
ViewModel?.DeleteCommand(x.Path);
}
}
}

18
FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/Views/QueueManagement.axaml
View file

@ -5,7 +5,7 @@
xmlns:vm="using:FRESHMusicPlayer.ViewModels"
mc:Ignorable="d" Width="500" Height="400"
xmlns:svg="clr-namespace:Avalonia.Svg.Skia;assembly=Avalonia.Svg.Skia"
x:Class="FRESHMusicPlayer.Views.QueueManagement"
x:Class="FRESHMusicPlayer.Views.QueueManagement" Closing="OnClosing"
Title="QueueManagement">
<Window.DataContext>
<vm:QueueManagementViewModel/>
@ -21,11 +21,11 @@
<RowDefinition Height="1*"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<StackPanel Grid.Column="0" Grid.Row="0" Orientation="Horizontal" Margin="5,5,5,0">
<CheckBox Grid.Column="0" Grid.Row="0" IsChecked="{Binding $parent[Window].Topmost}" Content="Pin to top"/>
<TextBlock Text="Time Remaining:" VerticalAlignment="Center"/>
<TextBlock Text="{Binding TimeRemaining, StringFormat=\{0:hh\\:mm\\:ss\}}" VerticalAlignment="Center"/>
</StackPanel>
<DockPanel Grid.Column="0" Grid.Row="0" Margin="5,5,5,0">
<CheckBox DockPanel.Dock="Left" IsChecked="{Binding $parent[Window].Topmost}" Content="Pin to top"/>
<TextBlock DockPanel.Dock="Right" Text="{Binding TimeRemaining, StringFormat=\{0:hh\\:mm\\:ss\}}" Margin="5,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Right"/>
<TextBlock DockPanel.Dock="Right" Text="Time Remaining:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
</DockPanel>
<ListBox Grid.Column="0" Grid.Row="1" Items="{Binding Queue}" Margin="5,0,5,5" ScrollViewer.HorizontalScrollBarVisibility="Disabled" SelectionMode="AlwaysSelected" VirtualizationMode="Simple" Focusable="False">
@ -37,7 +37,7 @@
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
@ -48,10 +48,10 @@
<TextBlock Grid.Column="1" Grid.Row="0" Text="{Binding Title}" HorizontalAlignment="Stretch" TextTrimming="CharacterEllipsis" FontSize="15" FontWeight="Bold"/>
<TextBlock Grid.Column="1" Grid.Row="1" Text="{Binding Artist}" FontSize="10"/>
<StackPanel Grid.Column="2" Grid.RowSpan="2" VerticalAlignment="Center" Height="38" Margin="0,-27,0,-30" Orientation="Horizontal">
<Button IsVisible="{Binding $parent[1].IsPointerOver}" Command="{Binding JumpToCommand}" CommandParameter="{Binding Position}" VerticalAlignment="Center">
<Button IsVisible="{Binding $parent[1].IsPointerOver}" Click="OnJumpToButtonClick" VerticalAlignment="Center">
<Image Source="{DynamicResource Play}"/>
</Button>
<Button IsVisible="{Binding $parent[1].IsPointerOver}" Command="{Binding RemoveCommand}" CommandParameter="{Binding Position}" VerticalAlignment="Center">
<Button IsVisible="{Binding $parent[1].IsPointerOver}" Click="OnRemoveButtonClick" VerticalAlignment="Center">
<Image Source="{DynamicResource Delete}"/>
</Button>
</StackPanel>

27
FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/Views/QueueManagement.axaml.cs
View file

@ -1,14 +1,18 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Interactivity;
using Avalonia.Markup.Xaml;
using FRESHMusicPlayer.Handlers;
using FRESHMusicPlayer.ViewModels;
using System.ComponentModel;
using System.Timers;
namespace FRESHMusicPlayer.Views
{
public class QueueManagement : Window
{
private QueueManagementViewModel ViewModel { get => DataContext as QueueManagementViewModel; }
public QueueManagement()
{
InitializeComponent();
@ -31,5 +35,28 @@ namespace FRESHMusicPlayer.Views
context.StartThings();
return this;
}
private void OnJumpToButtonClick(object sender, RoutedEventArgs e)
{
var cmd = (Button)sender;
if (cmd.DataContext is QueueManagementEntry x)
{
ViewModel?.JumpToCommand(x.Position);
}
}
private void OnRemoveButtonClick(object sender, RoutedEventArgs e)
{
var cmd = (Button)sender;
if (cmd.DataContext is QueueManagementEntry x)
{
ViewModel?.RemoveCommand(x.Position);
}
}
private void OnClosing(object sender, CancelEventArgs e)
{
ViewModel?.CloseThings();
}
}
}