Skip to content

Commit 721f587

Browse files
NokskiyNokskiy
committed
last version
1 parent 5ce0da1 commit 721f587

File tree

18 files changed

+82
-80
lines changed

18 files changed

+82
-80
lines changed

‎.github/screenshots/avalonix_screenshot.jpg‎

33.9 KB
Loading

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,6 @@ obj
55
publish
66
Avalonix.sln
77
nohup.out
8-
Output
8+
Output
9+
*.xz
10+
*.gz

‎Avalonix.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<ItemGroup>
4545
<AdditionalFiles Include="Styles\Default.axaml"/>
4646
<AdditionalFiles Include="View\SecondaryWindows\PlaylistCreateWindow\PlaylistCreateWindow.axaml"/>
47-
<AdditionalFiles Include="View\SecondaryWindows\SettingsWindow\SettingsWindow.axaml" />
47+
<AdditionalFiles Include="View\SecondaryWindows\SettingsWindow\SettingsWindow.axaml"/>
4848
</ItemGroup>
4949

5050

@@ -57,7 +57,7 @@
5757
<SubType>Code</SubType>
5858
</Compile>
5959
<Compile Update="View\SecondaryWindows\EditMetadataWindow\EditMetadataWindow.cs">
60-
<DependentUpon>EditMetadataWindow.axaml</DependentUpon>
60+
<DependentUpon>EditMetadataWindow.axaml</DependentUpon>
6161
</Compile>
6262
</ItemGroup>
6363

‎Model/Media/Artist/Artist.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ namespace Avalonix.Model.Media.Artist;
88

99
public record Artist : IPlayable
1010
{
11-
public string Name { get; }
12-
public PlayQueue PlayQueue { get; }
13-
1411
public Artist(List<Track.Track> tracks, IMediaPlayer player, ILogger logger, PlaySettings settings)
1512
{
1613
PlayQueue = new PlayQueue(player, logger, settings);
1714
Name = tracks[0].Metadata.Artist ?? string.Empty;
1815
PlayQueue.FillQueue(tracks);
1916
}
2017

18+
public string Name { get; }
19+
public PlayQueue PlayQueue { get; }
20+
2121
public async Task Play()
2222
{
2323
await PlayQueue.Play();

‎Release‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
AvalonixTAG_Version 2.3.1 AvalonixTAG_Close
1+
AvalonixTAG_Version 2.4.0 AvalonixTAG_Close

‎Services/PlayableManager/ArtistManager/ArtistManager.cs‎

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ public class ArtistManager(
3030
public CancellationTokenSource? GlobalCancellationTokenSource { get; private set; }
3131
public IMediaPlayer MediaPlayer { get; } = mediaPlayer;
3232
public IPlayable? PlayingPlayable { get; set; }
33+
3334
public async Task<List<IPlayable>> GetPlayables()
3435
{
3536
var result = await Task.Run(GetArtists);
@@ -72,6 +73,32 @@ public void StartPlayable(IPlayable artist)
7273
});
7374
}
7475

76+
public event Action<bool> PlaybackStateChanged
77+
{
78+
add => player.PlaybackStateChanged += value;
79+
remove => player.PlaybackStateChanged -= value;
80+
}
81+
82+
public event Action TrackChanged
83+
{
84+
add => player.TrackChanged += value;
85+
remove => player.TrackChanged -= value;
86+
}
87+
88+
public event Action<bool> ShuffleChanged
89+
{
90+
add => _settings.Avalonix.ShuffleChanged += value;
91+
remove => _settings.Avalonix.ShuffleChanged -= value;
92+
}
93+
94+
public event Action<bool> LoopChanged
95+
{
96+
add => _settings.Avalonix.LoopChanged += value;
97+
remove => _settings.Avalonix.LoopChanged -= value;
98+
}
99+
100+
public event Action? PlayableChanged;
101+
75102
private async Task<List<Artist>> GetArtists()
76103
{
77104
await Task.Run(LoadTracks);
@@ -85,12 +112,12 @@ private async Task<List<Artist>> GetArtists()
85112
var allValidTracks = _tracks.Where(track =>
86113
!string.IsNullOrEmpty(track.Metadata.Artist));
87114

88-
var albumGroups = allValidTracks.GroupBy(track => new { track.Metadata.Artist});
115+
var albumGroups = allValidTracks.GroupBy(track => new { track.Metadata.Artist });
89116

90117
return albumGroups.Select(group =>
91118
new Artist(group.ToList(), player, logger, settingsManager.Settings.Avalonix.PlaySettings)).ToList();
92119
}
93-
120+
94121
private async Task LoadTracks()
95122
{
96123
var paths = diskManager.GetMusicFiles();
@@ -111,30 +138,4 @@ private async Task LoadTracks()
111138
_tracks.AddRange(tracks);
112139
_tracksLoaded = true;
113140
}
114-
115-
public event Action<bool> PlaybackStateChanged
116-
{
117-
add => player.PlaybackStateChanged += value;
118-
remove => player.PlaybackStateChanged -= value;
119-
}
120-
121-
public event Action TrackChanged
122-
{
123-
add => player.TrackChanged += value;
124-
remove => player.TrackChanged -= value;
125-
}
126-
127-
public event Action<bool> ShuffleChanged
128-
{
129-
add => _settings.Avalonix.ShuffleChanged += value;
130-
remove => _settings.Avalonix.ShuffleChanged -= value;
131-
}
132-
133-
public event Action<bool> LoopChanged
134-
{
135-
add => _settings.Avalonix.LoopChanged += value;
136-
remove => _settings.Avalonix.LoopChanged -= value;
137-
}
138-
139-
public event Action? PlayableChanged;
140141
}

‎Services/PlayableManager/ArtistManager/IArtistManager.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@ namespace Avalonix.Services.PlayableManager.ArtistManager;
22

33
public interface IArtistManager : IPlayableManager
44
{
5-
65
}

‎Services/VersionManager/VersionManager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public class VersionManager : IVersionManager
88
{
99
private const string ReleaseUrl = "https://github.com/AvalonixPlayer/Avalonix/blob/main/Release";
1010

11-
public Release CurrentRelease => new("2.3.1");
11+
public Release CurrentRelease => new("2.4.0");
1212

1313
public async Task<Release> GetLastRelease()
1414
{

‎Services/WindowManager/WindowManager.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public PlayableSelectWindow AlbumSelectAndPlayWindow_Open()
6565
{
6666
return AlbumSelectWindow_Open(new SelectAndPlayAlbumWindowStrategy(playablesManager));
6767
}
68-
68+
6969
public PlayableSelectWindow ArtistSelectAndPlayWindow_Open()
7070
{
7171
return ArtistSelectAndPlayWindow_Open(new SelectAndPlayArtistWindowStrategy(playablesManager));
@@ -93,7 +93,7 @@ private PlayableSelectWindow AlbumSelectWindow_Open(IPlayableWindowStrategy stra
9393
var vm = new PlayableSelectViewModel(albumManager, strategy);
9494
return new PlayableSelectWindow(logger, vm);
9595
}
96-
96+
9797
private PlayableSelectWindow ArtistSelectAndPlayWindow_Open(IPlayableWindowStrategy strategy)
9898
{
9999
var vm = new PlayableSelectViewModel(artistManager, strategy);

‎View/MainWindow.axaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<Button Tag="Albums" Click="SelectAlbum_OnClick">
5656
<TextBlock Text="Albums" />
5757
</Button>
58-
58+
5959
<Button Tag="Artists" Click="SelectArtist_OnClick">
6060
<TextBlock Text="Artists" />
6161
</Button>
@@ -146,7 +146,7 @@
146146

147147
<Border Name="AlbumCoverBorder" Height="300" Width="300" IsVisible="True"
148148
Background="DimGray" Classes="Image">
149-
<Image Source="" Name="AlbumCover" Stretch="UniformToFill"/>
149+
<Image Source="" Name="AlbumCover" Stretch="UniformToFill" />
150150
</Border>
151151

152152
<Slider HorizontalAlignment="Center" ValueChanged="VolumeSlider_OnValueChanged"

0 commit comments

Comments
 (0)