[banshee: 23/57] Renamed UPnPSource to UPnPMusicSource
- From: Bertrand Lorentz <blorentz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee: 23/57] Renamed UPnPSource to UPnPMusicSource
- Date: Mon, 13 Feb 2012 20:29:45 +0000 (UTC)
commit 050b6a2c54e2859eb2fa3c6685fce49ddd9b0001
Author: Tobias Arrskog <topfs2 xbmc org>
Date: Tue Jul 5 21:28:55 2011 +0200
Renamed UPnPSource to UPnPMusicSource
.../Banshee.UPnPClient/Banshee.UPnPClient.csproj | 2 +-
.../{UPnPSource.cs => UPnPMusicSource.cs} | 6 +++---
.../Banshee.UPnPClient/UPnPService.cs | 8 ++++----
.../Banshee.UPnPClient/UPnPTrackInfo.cs | 4 ++--
src/Extensions/Banshee.UPnPClient/Makefile.am | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient.csproj b/src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient.csproj
index 7b0d87a..776ae30 100644
--- a/src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient.csproj
+++ b/src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient.csproj
@@ -83,7 +83,7 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
- <Compile Include="Banshee.UPnPClient\UPnPSource.cs" />
+ <Compile Include="Banshee.UPnPClient\UPnPMusicSource.cs" />
<Compile Include="Banshee.UPnPClient\UPnPService.cs" />
<Compile Include="Banshee.UPnPClient\UPnPContainerSource.cs" />
<Compile Include="Banshee.UPnPClient\UPnPTrackInfo.cs" />
diff --git a/src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPSource.cs b/src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPMusicSource.cs
similarity index 94%
rename from src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPSource.cs
rename to src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPMusicSource.cs
index 4bc5785..1955597 100644
--- a/src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPSource.cs
+++ b/src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPMusicSource.cs
@@ -49,12 +49,12 @@ using Banshee.PlaybackController;
namespace Banshee.UPnPClient
{
- public class UPnPSource : PrimarySource
+ public class UPnPMusicSource : PrimarySource
{
const int sort_order = 190;
private Dictionary<string, UPnPTrackInfo> music_tracks;
- public UPnPSource (Device device) : base (Catalog.GetString ("Music Share"), device.FriendlyName, device.Udn, sort_order)
+ public UPnPMusicSource (Device device) : base (Catalog.GetString ("Music Share"), device.FriendlyName, device.Udn, sort_order)
{
Hyena.Log.Information ("UPnPSource.Added(\"" + this.Name + "\", \"" + this.UniqueId + "\")");
@@ -68,7 +68,7 @@ namespace Banshee.UPnPClient
OnTracksRemoved ();
}
- ~UPnPSource ()
+ ~UPnPMusicSource ()
{
Dispose ();
}
diff --git a/src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPService.cs b/src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPService.cs
index 90a1802..7eb2337 100644
--- a/src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPService.cs
+++ b/src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPService.cs
@@ -64,7 +64,7 @@ namespace Banshee.UPnPClient
{
if (container != null)
{
- foreach (UPnPSource source in container.Children)
+ foreach (UPnPMusicSource source in container.Children)
source.Disconnect();
ServiceManager.SourceManager.RemoveSource(container);
@@ -87,14 +87,14 @@ namespace Banshee.UPnPClient
if (contentDirectory != null)
{
- UPnPSource source = new UPnPSource(device);
+ UPnPMusicSource source = new UPnPMusicSource(device);
container.AddChildSource (source);
Parse(source, contentDirectory);
}
}
- static void Parse (UPnPSource source, ContentDirectoryController contentDirectory)
+ static void Parse (UPnPMusicSource source, ContentDirectoryController contentDirectory)
{
RemoteContentDirectory remoteContentDirectory = new RemoteContentDirectory (contentDirectory);
List<MusicTrack> musicTracks = new List<MusicTrack>();
@@ -141,7 +141,7 @@ namespace Banshee.UPnPClient
Hyena.Log.Debug ("Found all items on the service, took " + (DateTime.Now - begin).ToString());
}
- static void ParseContainer (UPnPSource source, RemoteContentDirectory remoteContentDirectory, Container container, int depth, List<MusicTrack> musicTracks)
+ static void ParseContainer (UPnPMusicSource source, RemoteContentDirectory remoteContentDirectory, Container container, int depth, List<MusicTrack> musicTracks)
{
if (depth > 10 || (container.ChildCount != null && container.ChildCount == 0))
return;
diff --git a/src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPTrackInfo.cs b/src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPTrackInfo.cs
index 49c0d9c..c71510f 100644
--- a/src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPTrackInfo.cs
+++ b/src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPTrackInfo.cs
@@ -42,7 +42,7 @@ namespace Banshee.UPnPClient
{
static long id = 0;
- public UPnPTrackInfo (MusicTrack track, UPnPSource source) : this (track as AudioItem, source)
+ public UPnPTrackInfo (MusicTrack track, UPnPMusicSource source) : this (track as AudioItem, source)
{
ArtistName = track.Artists.Count > 0 ? track.Artists[0].Name : "";
AlbumTitle = track.Albums.Count > 0 ? track.Albums[0] : "";
@@ -52,7 +52,7 @@ namespace Banshee.UPnPClient
Genre = track.Genres.Count > 0 ? track.Genres[0] : "";
}
- public UPnPTrackInfo (AudioItem track, UPnPSource source) : base ()
+ public UPnPTrackInfo (AudioItem track, UPnPMusicSource source) : base ()
{
if (track == null)
throw new ArgumentNullException("track");
diff --git a/src/Extensions/Banshee.UPnPClient/Makefile.am b/src/Extensions/Banshee.UPnPClient/Makefile.am
index f031d75..98700b0 100644
--- a/src/Extensions/Banshee.UPnPClient/Makefile.am
+++ b/src/Extensions/Banshee.UPnPClient/Makefile.am
@@ -6,7 +6,7 @@ INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
SOURCES = \
Banshee.UPnPClient/UPnPContainerSource.cs \
Banshee.UPnPClient/UPnPService.cs \
- Banshee.UPnPClient/UPnPSource.cs \
+ Banshee.UPnPClient/UPnPMusicSource.cs \
Banshee.UPnPClient/UPnPTrackInfo.cs
RESOURCES = Banshee.UPnPClient.addin.xml
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]