Skip to content
This repository was archived by the owner on Jun 8, 2021. It is now read-only.
Open
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
2 changes: 1 addition & 1 deletion Hurricane/Hurricane.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>true</Optimize>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
Expand Down
2 changes: 2 additions & 0 deletions Hurricane/Music/Playlist/NormalPlaylist.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ public override string Name
}
}

public DateTime TimeShuffeld { get; set; }

public async Task AddFiles(IEnumerable<PlayableBase> tracks)
{
foreach (var track in tracks)
Expand Down
10 changes: 9 additions & 1 deletion Hurricane/Music/Playlist/PlaylistBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,12 @@ public virtual void LoadList()
};
ViewSource = CollectionViewSource.GetDefaultView(Tracks);
ViewSource.Filter = item => string.IsNullOrWhiteSpace(SearchText) || item.ToString().ToUpper().Contains(SearchText.ToUpper());
ShuffleList = new List<PlayableBase>(Tracks);
if (this is NormalPlaylist) {
var timeShuffeld = ((NormalPlaylist)this).TimeShuffeld;
ShuffleList = new List<PlayableBase>(Tracks.Where(track => track.LastTimePlayed<timeShuffeld));
} else {
ShuffleList = new List<PlayableBase>(Tracks);
}
}
}

Expand All @@ -89,6 +94,9 @@ public virtual void LoadList()
private bool _addedFavoriteTracksTwoTimes;
protected void CreateShuffleList()
{
if (this is NormalPlaylist) {
((NormalPlaylist)this).TimeShuffeld = DateTime.Now;
}
ShuffleList = new List<PlayableBase>(Tracks);
if (HurricaneSettings.Instance.Config.ShufflePreferFavoriteTracks)
{
Expand Down