watsonb8/aurora
1
1
Fork 0
Code Issues 1 Pull Requests Projects 1 Releases Wiki Activity

And now it builds and runs

Browse Source
This commit is contained in:
watsonb8 2019-05-19 20:25:31 -04:00
parent 4b7c146041
commit 65d56a838c
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Aurora/Backend/Services/LibraryService.cs
View File

@ -13,14 +13,14 @@ namespace Aurora.Backend.Services
#region Fields
private string _pathName = "/Users/brandonwatson/Music/iTunes/iTunes Media/Music";
private string _extensions = ".wav,.mp3,.aiff,.flac,.m4a,.m4b,.wma";
private Dictionary<string, Song> _library;
private Dictionary<string, BaseSong> _library;
#endregion Fields
public LibraryService()
{
_library = new Dictionary<string, Song>();
_library = new Dictionary<string, BaseSong>();
LoadLibrary();
}
@ -28,10 +28,10 @@ namespace Aurora.Backend.Services
/// Gets the songs.
/// </summary>
/// <returns>The songs.</returns>
public ObservableCollection<Song> GetLibrary()
public ObservableCollection<BaseSong> GetLibrary()
{
ObservableCollection<Song> collection = new ObservableCollection<Song>();
foreach (KeyValuePair<string, Song> pair in _library)
ObservableCollection<BaseSong> collection = new ObservableCollection<BaseSong>();
foreach (KeyValuePair<string, BaseSong> pair in _library)
{
collection.Add(pair.Value);
}
@ -51,7 +51,7 @@ namespace Aurora.Backend.Services
{
TagLib.File tagFile = TagLib.File.Create(file.FullName);
Song song = new Song(file)
BaseSong song = new LocalSong(file)
{
Title = tagFile.Tag.Title,
Album = tagFile.Tag.Album,

10
Aurora/Frontend/Views/Songs/SongsViewModel.cs
View File

@ -7,22 +7,22 @@ namespace Aurora.Frontend.Views.Songs
public class SongsViewModel : BaseViewModel
{
#region Fields
private ObservableCollection<Song> _songsList;
private Song _selectedSong;
private ObservableCollection<BaseSong> _songsList;
private BaseSong _selectedSong;
#endregion Fields
#region Constructor
public SongsViewModel()
{
_songsList = new ObservableCollection<Song>();
_songsList = new ObservableCollection<BaseSong>();
Initialize();
}
#endregion Constructor
#region Properties
public ObservableCollection<Song> SongsList
public ObservableCollection<BaseSong> SongsList
{
get { return _songsList; }
set
@ -35,7 +35,7 @@ namespace Aurora.Frontend.Views.Songs
}
}
public Song SelectedSong
public BaseSong SelectedSong
{
get { return _selectedSong; }
set