banshee r4413 - in trunk/banshee: . src/Backends/Banshee.GStreamer src/Backends/Banshee.GStreamer/Banshee.GStreamer src/Backends/Banshee.Gnome src/Backends/Banshee.Hal src/Backends/Banshee.NowPlaying.X11 src/Backends/Banshee.Unix src/Clients/Halie src/Clients/Nereid src/Core/Banshee.Core src/Core/Banshee.Services src/Core/Banshee.Services/Banshee.Equalizer src/Core/Banshee.Services/Banshee.Metadata src/Core/Banshee.Services/Banshee.Metadata.LastFM src/Core/Banshee.Services/Banshee.Metadata.MusicBrainz src/Core/Banshee.Services/Banshee.Metadata.Rhapsody src/Core/Banshee.Services/Banshee.Networking src/Core/Banshee.Services/Banshee.Preferences src/Core/Banshee.Services/Banshee.ServiceStack src/Core/Banshee.Widgets src/Extensions src/Extensions/Banshee.AudioCd src/Extensions/Banshee.BooScript src/Extensions/Banshee.Bookmarks src/Extensions/Banshee.CoverArt src/Extensions/Banshee.CoverArt/Banshee.CoverArt src/Extensions/Banshee.Daap src/Extensions/Banshee.FileSystemQueue src/Extensions/Banshee.Lastfm src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio src/Extensions/Banshee.MultimediaKeys src/Extensions/Banshee.NotificationArea src/Extensions/Banshee.PlayQueue src/Extensions/Banshee.Podcasting src/Extensions/Banshee.Podcasting/Banshee.Podcasting src/Extensions/Banshee.Sample src/Extensions/Banshee.Torrent src/Libraries/Hyena src/Libraries/Hyena.Gui src/Libraries/Lastfm.Gui src/Libraries/Migo src/Libraries/Mono.Media src/Libraries/Mtp src/Libraries/MusicBrainz
- From: abock svn gnome org
- To: svn-commits-list gnome org
- Subject: banshee r4413 - in trunk/banshee: . src/Backends/Banshee.GStreamer src/Backends/Banshee.GStreamer/Banshee.GStreamer src/Backends/Banshee.Gnome src/Backends/Banshee.Hal src/Backends/Banshee.NowPlaying.X11 src/Backends/Banshee.Unix src/Clients/Halie src/Clients/Nereid src/Core/Banshee.Core src/Core/Banshee.Services src/Core/Banshee.Services/Banshee.Equalizer src/Core/Banshee.Services/Banshee.Metadata src/Core/Banshee.Services/Banshee.Metadata.LastFM src/Core/Banshee.Services/Banshee.Metadata.MusicBrainz src/Core/Banshee.Services/Banshee.Metadata.Rhapsody src/Core/Banshee.Services/Banshee.Networking src/Core/Banshee.Services/Banshee.Preferences src/Core/Banshee.Services/Banshee.ServiceStack src/Core/Banshee.Widgets src/Extensions src/Extensions/Banshee.AudioCd src/Extensions/Banshee.BooScript src/Extensions/Banshee.Bookmarks src/Extensions/Banshee.CoverArt src/Extensions/Banshee.CoverArt/Banshee.CoverArt src/Extensions/Banshee.Daap src/Extensions/Banshee.FileSystemQueue src/Extensions/Banshee.Lastfm src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio src/Extensions/Banshee.MultimediaKeys src/Extensions/Banshee.NotificationArea src/Extensions/Banshee.PlayQueue src/Extensions/Banshee.Podcasting src/Extensions/Banshee.Podcasting/Banshee.Podcasting src/Extensions/Banshee.Sample src/Extensions/Banshee.Torrent src/Libraries/Hyena src/Libraries/Hyena.Gui src/Libraries/Lastfm.Gui src/Libraries/Migo src/Libraries/Mono.Media src/Libraries/Mtp src/Libraries/MusicBrainz
- Date: Thu, 21 Aug 2008 20:52:38 +0000 (UTC)
Author: abock
Date: Thu Aug 21 20:52:38 2008
New Revision: 4413
URL: http://svn.gnome.org/viewvc/banshee?rev=4413&view=rev
Log:
2008-08-21 Aaron Bockover <abock gnome org>
* src/Core/Banshee.Services/Banshee.Networking/Network.cs: Turned into
a real service and support overriding the connection status to support
an offline mode, configurable in preferences
* src/Core/Banshee.Services/Banshee.ServiceStack/IRegisterOnDemandService.cs
* src/Core/Banshee.Services/Banshee.ServiceStack/ServiceManager.cs:
Added support for services to be registered when they are first requested
* src/Core/Banshee.Services/Banshee.Equalizer/EqualizerSetting.cs:
Use the player_engine namespace like the rest of the engine settings
* src/Core/Banshee.Services/Banshee.Preferences/Page.cs:
* src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:
Added a misc section to the general prefs section; put replaygain there;
not happy with this but it'll have to work for now
* src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs:
* src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs:
* src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:
* src/Extensions/Banshee.Podcasting/Banshee.Podcasting/PodcastImageFetchJob.cs:
* src/Core/Banshee.Services/Banshee.Metadata/MetadataServiceJob.cs:
* src/Core/Banshee.Services/Banshee.Metadata.LastFM/LastFMQueryJob.cs:
* src/Core/Banshee.Services/Banshee.Metadata.Rhapsody/RhapsodyQueryJob.cs:
* src/Core/Banshee.Services/Banshee.Metadata.MusicBrainz/MusicBrainzQueryJob.cs:
Updated to use the slightly changed network service API
Added:
trunk/banshee/src/Core/Banshee.Services/Banshee.Networking/Network.cs
trunk/banshee/src/Core/Banshee.Services/Banshee.ServiceStack/IRegisterOnDemandService.cs
Removed:
trunk/banshee/src/Core/Banshee.Services/Banshee.Networking/NetworkDetect.cs
Modified:
trunk/banshee/ChangeLog
trunk/banshee/src/Backends/Banshee.GStreamer/Banshee.GStreamer.mdp
trunk/banshee/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs
trunk/banshee/src/Backends/Banshee.Gnome/Banshee.Gnome.mdp
trunk/banshee/src/Backends/Banshee.Hal/Banshee.Hal.mdp
trunk/banshee/src/Backends/Banshee.NowPlaying.X11/Banshee.NowPlaying.X11.mdp
trunk/banshee/src/Backends/Banshee.Unix/Banshee.Unix.mdp
trunk/banshee/src/Clients/Halie/Halie.mdp
trunk/banshee/src/Clients/Nereid/Nereid.mdp
trunk/banshee/src/Core/Banshee.Core/Banshee.Core.mdp
trunk/banshee/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerSetting.cs
trunk/banshee/src/Core/Banshee.Services/Banshee.Metadata.LastFM/LastFMQueryJob.cs
trunk/banshee/src/Core/Banshee.Services/Banshee.Metadata.MusicBrainz/MusicBrainzQueryJob.cs
trunk/banshee/src/Core/Banshee.Services/Banshee.Metadata.Rhapsody/RhapsodyQueryJob.cs
trunk/banshee/src/Core/Banshee.Services/Banshee.Metadata/MetadataServiceJob.cs
trunk/banshee/src/Core/Banshee.Services/Banshee.Preferences/Page.cs
trunk/banshee/src/Core/Banshee.Services/Banshee.ServiceStack/ServiceManager.cs
trunk/banshee/src/Core/Banshee.Services/Banshee.Services.mdp
trunk/banshee/src/Core/Banshee.Services/Makefile.am
trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets.mdp
trunk/banshee/src/Extensions/Banshee.AudioCd/Banshee.AudioCd.mdp
trunk/banshee/src/Extensions/Banshee.BooScript/Banshee.BooScript.mdp
trunk/banshee/src/Extensions/Banshee.Bookmarks/Banshee.Bookmarks.mdp
trunk/banshee/src/Extensions/Banshee.CoverArt/Banshee.CoverArt.mdp
trunk/banshee/src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs
trunk/banshee/src/Extensions/Banshee.Daap/Banshee.Daap.mdp
trunk/banshee/src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue.mdp
trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs
trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs
trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.mdp
trunk/banshee/src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys.mdp
trunk/banshee/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.mdp
trunk/banshee/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue.mdp
trunk/banshee/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.mdp
trunk/banshee/src/Extensions/Banshee.Podcasting/Banshee.Podcasting/PodcastImageFetchJob.cs
trunk/banshee/src/Extensions/Banshee.Sample/Banshee.Sample.mdp
trunk/banshee/src/Extensions/Banshee.Torrent/Banshee.Torrent.mdp
trunk/banshee/src/Extensions/Extensions.mds
trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui.mdp
trunk/banshee/src/Libraries/Hyena/Hyena.mdp
trunk/banshee/src/Libraries/Lastfm.Gui/Lastfm.Gui.mdp
trunk/banshee/src/Libraries/Migo/Migo.mdp
trunk/banshee/src/Libraries/Mono.Media/Mono.Media.mdp
trunk/banshee/src/Libraries/Mtp/Mtp.mdp
trunk/banshee/src/Libraries/MusicBrainz/MusicBrainz.mdp
Modified: trunk/banshee/src/Backends/Banshee.GStreamer/Banshee.GStreamer.mdp
==============================================================================
--- trunk/banshee/src/Backends/Banshee.GStreamer/Banshee.GStreamer.mdp (original)
+++ trunk/banshee/src/Backends/Banshee.GStreamer/Banshee.GStreamer.mdp Thu Aug 21 20:52:38 2008
@@ -1,4 +1,4 @@
-<Project name="Banshee.GStreamer" fileversion="2.0" language="C#" clr-version="Net_2_0" UseParentDirectoryAsNamespace="True" ctype="DotNetProject">
+<Project name="Banshee.GStreamer" fileversion="2.0" language="C#" UseParentDirectoryAsNamespace="True" clr-version="Net_2_0" ctype="DotNetProject">
<Configurations active="Debug">
<Configuration name="Debug" ctype="DotNetProjectConfiguration">
<Output directory="../../../bin" assemblyKeyFile="." assembly="Banshee.MediaEngine.GStreamer" />
@@ -26,6 +26,7 @@
<ProjectReference type="Project" localcopy="False" refto="Banshee.Core" />
<ProjectReference type="Project" localcopy="True" refto="Hyena" />
</References>
+ <GtkDesignInfo gtkVersion="2.12.1" />
<MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="Makefile.am">
<BuildFilesVar Sync="True" Name="SOURCES" />
<DeployFilesVar />
Modified: trunk/banshee/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs
==============================================================================
--- trunk/banshee/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs (original)
+++ trunk/banshee/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs Thu Aug 21 20:52:38 2008
@@ -503,7 +503,7 @@
return;
}
- replaygain_preference = service["general"]["playback"].Add (new SchemaPreference<bool> (ReplayGainEnabledSchema,
+ replaygain_preference = service["general"]["misc"].Add (new SchemaPreference<bool> (ReplayGainEnabledSchema,
Catalog.GetString ("_Enable ReplayGain Correction"),
Catalog.GetString ("For tracks that have ReplayGain data, automatically scale (normalize) playback volume."),
delegate { ReplayGainEnabled = ReplayGainEnabledSchema.Get (); }
@@ -517,7 +517,7 @@
return;
}
- service["general"]["playback"].Remove (replaygain_preference);
+ service["general"]["misc"].Remove (replaygain_preference);
replaygain_preference = null;
}
Modified: trunk/banshee/src/Backends/Banshee.Gnome/Banshee.Gnome.mdp
==============================================================================
--- trunk/banshee/src/Backends/Banshee.Gnome/Banshee.Gnome.mdp (original)
+++ trunk/banshee/src/Backends/Banshee.Gnome/Banshee.Gnome.mdp Thu Aug 21 20:52:38 2008
@@ -1,4 +1,4 @@
-<Project name="Banshee.Gnome" fileversion="2.0" language="C#" clr-version="Net_2_0" UseParentDirectoryAsNamespace="True" ctype="DotNetProject">
+<Project name="Banshee.Gnome" fileversion="2.0" language="C#" UseParentDirectoryAsNamespace="True" clr-version="Net_2_0" ctype="DotNetProject">
<Configurations active="Debug">
<Configuration name="Debug" ctype="DotNetProjectConfiguration">
<Output directory="../../../bin" assemblyKeyFile="." assembly="Banshee.Gnome" />
Modified: trunk/banshee/src/Backends/Banshee.Hal/Banshee.Hal.mdp
==============================================================================
--- trunk/banshee/src/Backends/Banshee.Hal/Banshee.Hal.mdp (original)
+++ trunk/banshee/src/Backends/Banshee.Hal/Banshee.Hal.mdp Thu Aug 21 20:52:38 2008
@@ -1,4 +1,4 @@
-<Project name="Banshee.Hal" fileversion="2.0" language="C#" clr-version="Net_2_0" UseParentDirectoryAsNamespace="True" ctype="DotNetProject">
+<Project name="Banshee.Hal" fileversion="2.0" language="C#" UseParentDirectoryAsNamespace="True" clr-version="Net_2_0" ctype="DotNetProject">
<Configurations active="Debug">
<Configuration name="Debug" ctype="DotNetProjectConfiguration">
<Output directory="../../../bin" assemblyKeyFile="." assembly="Banshee.Hal" />
Modified: trunk/banshee/src/Backends/Banshee.NowPlaying.X11/Banshee.NowPlaying.X11.mdp
==============================================================================
--- trunk/banshee/src/Backends/Banshee.NowPlaying.X11/Banshee.NowPlaying.X11.mdp (original)
+++ trunk/banshee/src/Backends/Banshee.NowPlaying.X11/Banshee.NowPlaying.X11.mdp Thu Aug 21 20:52:38 2008
@@ -1,4 +1,4 @@
-<Project name="Banshee.NowPlaying.X11" fileversion="2.0" language="C#" clr-version="Net_2_0" UseParentDirectoryAsNamespace="True" ctype="DotNetProject">
+<Project name="Banshee.NowPlaying.X11" fileversion="2.0" language="C#" UseParentDirectoryAsNamespace="True" clr-version="Net_2_0" ctype="DotNetProject">
<Configurations active="Debug">
<Configuration name="Debug" ctype="DotNetProjectConfiguration">
<Output directory="../../../bin" assemblyKeyFile="." assembly="Banshee.NowPlaying.X11" />
Modified: trunk/banshee/src/Backends/Banshee.Unix/Banshee.Unix.mdp
==============================================================================
--- trunk/banshee/src/Backends/Banshee.Unix/Banshee.Unix.mdp (original)
+++ trunk/banshee/src/Backends/Banshee.Unix/Banshee.Unix.mdp Thu Aug 21 20:52:38 2008
@@ -1,4 +1,4 @@
-<Project name="Banshee.Unix" fileversion="2.0" language="C#" clr-version="Net_2_0" UseParentDirectoryAsNamespace="True" ctype="DotNetProject">
+<Project name="Banshee.Unix" fileversion="2.0" language="C#" UseParentDirectoryAsNamespace="True" clr-version="Net_2_0" ctype="DotNetProject">
<Configurations active="Debug">
<Configuration name="Debug" ctype="DotNetProjectConfiguration">
<Output directory="../../../bin" assemblyKeyFile="." assembly="Banshee.Unix" />
Modified: trunk/banshee/src/Clients/Halie/Halie.mdp
==============================================================================
--- trunk/banshee/src/Clients/Halie/Halie.mdp (original)
+++ trunk/banshee/src/Clients/Halie/Halie.mdp Thu Aug 21 20:52:38 2008
@@ -1,4 +1,4 @@
-<Project name="Halie" fileversion="2.0" language="C#" clr-version="Net_2_0" UseParentDirectoryAsNamespace="True" ctype="DotNetProject">
+<Project name="Halie" fileversion="2.0" language="C#" UseParentDirectoryAsNamespace="True" clr-version="Net_2_0" ctype="DotNetProject">
<Configurations active="Debug">
<Configuration name="Debug" ctype="DotNetProjectConfiguration">
<Output directory="../../../bin" assemblyKeyFile="." assembly="Halie" />
Modified: trunk/banshee/src/Clients/Nereid/Nereid.mdp
==============================================================================
--- trunk/banshee/src/Clients/Nereid/Nereid.mdp (original)
+++ trunk/banshee/src/Clients/Nereid/Nereid.mdp Thu Aug 21 20:52:38 2008
@@ -1,4 +1,4 @@
-<Project name="Nereid" fileversion="2.0" language="C#" clr-version="Net_2_0" UseParentDirectoryAsNamespace="True" ctype="DotNetProject">
+<Project name="Nereid" fileversion="2.0" language="C#" UseParentDirectoryAsNamespace="True" clr-version="Net_2_0" ctype="DotNetProject">
<Configurations active="Debug">
<Configuration name="Debug" ctype="DotNetProjectConfiguration">
<Output directory="../../../bin" assemblyKeyFile="." assembly="Nereid" />
Modified: trunk/banshee/src/Core/Banshee.Core/Banshee.Core.mdp
==============================================================================
--- trunk/banshee/src/Core/Banshee.Core/Banshee.Core.mdp (original)
+++ trunk/banshee/src/Core/Banshee.Core/Banshee.Core.mdp Thu Aug 21 20:52:38 2008
@@ -1,4 +1,4 @@
-<Project name="Banshee.Core" fileversion="2.0" language="C#" clr-version="Net_2_0" UseParentDirectoryAsNamespace="True" ctype="DotNetProject">
+<Project name="Banshee.Core" fileversion="2.0" language="C#" UseParentDirectoryAsNamespace="True" clr-version="Net_2_0" ctype="DotNetProject">
<Configurations active="Debug">
<Configuration name="Debug" ctype="DotNetProjectConfiguration">
<Output directory="../../../bin" assemblyKeyFile="." assembly="Banshee.Core" />
Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerSetting.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerSetting.cs (original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerSetting.cs Thu Aug 21 20:52:38 2008
@@ -138,14 +138,14 @@
}
public static readonly SchemaEntry<bool> EnabledSchema = new SchemaEntry<bool> (
- "player", "equalizer_enabled",
+ "player_engine", "equalizer_enabled",
false,
"Equalizer status",
"Whether or not the equalizer is set to be enabled."
);
public static readonly SchemaEntry<string> PresetSchema = new SchemaEntry<string> (
- "player", "equalizer_preset",
+ "player_engine", "equalizer_preset",
"",
"Equalizer preset",
"Default preset to load into equalizer."
Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Metadata.LastFM/LastFMQueryJob.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Metadata.LastFM/LastFMQueryJob.cs (original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Metadata.LastFM/LastFMQueryJob.cs Thu Aug 21 20:52:38 2008
@@ -43,6 +43,7 @@
using Banshee.Kernel;
using Banshee.Streaming;
using Banshee.Networking;
+using Banshee.ServiceStack;
using Lastfm;
@@ -64,7 +65,7 @@
string artwork_id = Track.ArtworkId;
- if (artwork_id == null || CoverArtSpec.CoverExists (artwork_id) || !NetworkDetect.Instance.Connected) {
+ if (artwork_id == null || CoverArtSpec.CoverExists (artwork_id) || !ServiceManager.Get<Network> ().Connected) {
return;
}
Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Metadata.MusicBrainz/MusicBrainzQueryJob.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Metadata.MusicBrainz/MusicBrainzQueryJob.cs (original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Metadata.MusicBrainz/MusicBrainzQueryJob.cs Thu Aug 21 20:52:38 2008
@@ -76,7 +76,7 @@
return false;
} else if (CoverArtSpec.CoverExists (artwork_id)) {
return false;
- } else if (!NetworkDetect.Instance.Connected) {
+ } else if (!InternetConnected) {
return false;
}
Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Metadata.Rhapsody/RhapsodyQueryJob.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Metadata.Rhapsody/RhapsodyQueryJob.cs (original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Metadata.Rhapsody/RhapsodyQueryJob.cs Thu Aug 21 20:52:38 2008
@@ -61,7 +61,7 @@
string artwork_id = Track.ArtworkId;
- if(artwork_id == null || CoverArtSpec.CoverExists(artwork_id) || !NetworkDetect.Instance.Connected) {
+ if(artwork_id == null || CoverArtSpec.CoverExists(artwork_id) || !InternetConnected) {
return;
}
Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Metadata/MetadataServiceJob.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Metadata/MetadataServiceJob.cs (original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Metadata/MetadataServiceJob.cs Thu Aug 21 20:52:38 2008
@@ -36,6 +36,7 @@
using Banshee.Collection;
using Banshee.Streaming;
using Banshee.Networking;
+using Banshee.ServiceStack;
namespace Banshee.Metadata
{
@@ -45,6 +46,10 @@
private IBasicTrackInfo track;
private List<StreamTag> tags = new List<StreamTag>();
+ protected bool InternetConnected {
+ get { return ServiceManager.Get<Network> ().Connected; }
+ }
+
protected MetadataServiceJob()
{
}
@@ -92,7 +97,7 @@
protected HttpWebResponse GetHttpStream(Uri uri, string [] ignoreMimeTypes)
{
- if(!NetworkDetect.Instance.Connected) {
+ if(!InternetConnected) {
throw new NetworkUnavailableException();
}
Added: trunk/banshee/src/Core/Banshee.Services/Banshee.Networking/Network.cs
==============================================================================
--- (empty file)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Networking/Network.cs Thu Aug 21 20:52:38 2008
@@ -0,0 +1,171 @@
+//
+// NetworkDetect.cs
+//
+// Author:
+// Aaron Bockover <abockover novell com>
+//
+// Copyright (C) 2005-2008 Novell, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Collections;
+using Mono.Unix;
+
+using Hyena;
+
+using Banshee.Base;
+
+using Banshee.ServiceStack;
+using Banshee.Preferences;
+using Banshee.Configuration;
+
+namespace Banshee.Networking
+{
+ public delegate void NetworkStateChangedHandler(object o, NetworkStateChangedArgs args);
+
+ public class NetworkStateChangedArgs : EventArgs
+ {
+ public bool Connected;
+ }
+
+ public class NetworkUnavailableException : ApplicationException
+ {
+ public NetworkUnavailableException() : base(Catalog.GetString("There is no available network connection"))
+ {
+ }
+
+ public NetworkUnavailableException(string message) : base(message)
+ {
+ }
+ }
+
+ public class Network : IService, IRegisterOnDemandService, IDisposable
+ {
+ public event NetworkStateChangedHandler StateChanged;
+
+ private NetworkManager nm_manager;
+ private State current_state;
+ private bool disable_internet_access = false;
+
+ public Network ()
+ {
+ InstallPreferences ();
+
+ try {
+ ConnectToNetworkManager();
+ } catch(Exception) {
+ nm_manager = null;
+ Log.Warning(
+ Catalog.GetString("Cannot connect to NetworkManager"),
+ Catalog.GetString("An available, working network connection will be assumed"),
+ false);
+ }
+ }
+
+ public void Dispose ()
+ {
+ UninstallPreferences ();
+ }
+
+ private void ConnectToNetworkManager()
+ {
+ nm_manager = new NetworkManager();
+ nm_manager.StateChange += OnNetworkManagerEvent;
+ current_state = nm_manager.State;
+ }
+
+ private void OnNetworkManagerEvent(State new_state)
+ {
+ try {
+ if(new_state != current_state && (new_state == State.Connected || new_state == State.Disconnected)) {
+ current_state = new_state;
+
+ NetworkStateChangedHandler handler = StateChanged;
+ if(handler != null) {
+ NetworkStateChangedArgs state_changed_args = new NetworkStateChangedArgs();
+ state_changed_args.Connected = Connected;
+ handler(this, state_changed_args);
+ }
+
+ if(Connected) {
+ Log.Debug("Network Connection Established", "Connected");
+ } else {
+ Log.Debug("Network Connection Unavailable", "Disconnected");
+ }
+ }
+ } catch(Exception) {
+ }
+ }
+
+ public bool Connected {
+ get { return disable_internet_access ? false : (nm_manager == null ? true : current_state == State.Connected); }
+ }
+
+ public NetworkManager Manager {
+ get { return nm_manager; }
+ }
+
+#region Offline Preference
+
+ private PreferenceBase disable_internet_access_preference;
+
+ private void InstallPreferences ()
+ {
+ disable_internet_access = DisableInternetAccess.Get ();
+
+ PreferenceService service = ServiceManager.Get<PreferenceService> ();
+ if (service == null) {
+ return;
+ }
+
+ disable_internet_access_preference = service["general"]["misc"].Add (new SchemaPreference<bool> (DisableInternetAccess,
+ Catalog.GetString ("_Disable features requiring Internet access"),
+ Catalog.GetString ("Some features require a broadband Internet connection such as Last.fm or cover art fetching"),
+ delegate { disable_internet_access = DisableInternetAccess.Get (); }
+ ));
+ }
+
+ private void UninstallPreferences ()
+ {
+ PreferenceService service = ServiceManager.Get<PreferenceService> ();
+ if (service == null) {
+ return;
+ }
+
+ service["general"]["misc"].Remove (disable_internet_access_preference);
+ disable_internet_access_preference = null;
+ }
+
+ public static readonly SchemaEntry<bool> DisableInternetAccess = new SchemaEntry<bool> (
+ "core", "disable_internet_access",
+ false,
+ "Disable internet access",
+ "Do not allow components to have internet access within Banshee"
+ );
+
+#endregion
+
+ string IService.ServiceName {
+ get { return "Network"; }
+ }
+ }
+}
Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Preferences/Page.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Preferences/Page.cs (original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Preferences/Page.cs Thu Aug 21 20:52:38 2008
@@ -78,7 +78,7 @@
file_system.Add (new SchemaPreference<string> (LibrarySchema.FilePattern,
Catalog.GetString ("File _name")));
- general.Add (new Section ("playback", Catalog.GetString ("Playback"), 20));
+ general.Add (new Section ("misc", Catalog.GetString ("Miscellaneous"), 20));
service.Add (new Page ("extensions", Catalog.GetString ("Extensions"), 10));
}
Added: trunk/banshee/src/Core/Banshee.Services/Banshee.ServiceStack/IRegisterOnDemandService.cs
==============================================================================
--- (empty file)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.ServiceStack/IRegisterOnDemandService.cs Thu Aug 21 20:52:38 2008
@@ -0,0 +1,36 @@
+//
+// IRegisterOnDemandService.cs
+//
+// Author:
+// Aaron Bockover <abockover novell com>
+//
+// Copyright (C) 2008 Novell, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+namespace Banshee.ServiceStack
+{
+ public interface IRegisterOnDemandService : IService
+ {
+ }
+}
Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.ServiceStack/ServiceManager.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.ServiceStack/ServiceManager.cs (original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.ServiceStack/ServiceManager.cs Thu Aug 21 20:52:38 2008
@@ -106,36 +106,7 @@
uint cumulative_timer_id = Log.InformationTimerStart ();
foreach (Type type in service_types) {
- IService service = null;
-
- try {
- uint timer_id = Log.DebugTimerStart ();
- service = (IService)Activator.CreateInstance (type);
- RegisterService (service);
-
- Log.DebugTimerPrint (timer_id, String.Format (
- "Core service started ({0}, {{0}})", service.ServiceName));
-
- OnServiceStarted (service);
-
- if (service is IDisposable) {
- dispose_services.Push (service);
- }
-
- if (service is IInitializeService) {
- ((IInitializeService)service).Initialize ();
- }
- } catch (Exception e) {
- if (service is IRequiredService) {
- Log.ErrorFormat ("Error initializing required service {0}",
- service == null ? type.ToString () : service.ServiceName, false);
- throw;
- }
-
- Log.Warning (String.Format ("Service `{0}' not started: {1}", type.FullName,
- e.InnerException != null ? e.InnerException.Message : e.Message));
- Log.Exception (e.InnerException ?? e);
- }
+ RegisterService (type);
}
foreach (TypeExtensionNode node in extension_nodes) {
@@ -152,6 +123,44 @@
}
}
+ private static IService RegisterService (Type type)
+ {
+ IService service = null;
+
+ try {
+ uint timer_id = Log.DebugTimerStart ();
+ service = (IService)Activator.CreateInstance (type);
+ RegisterService (service);
+
+ Log.DebugTimerPrint (timer_id, String.Format (
+ "Core service started ({0}, {{0}})", service.ServiceName));
+
+ OnServiceStarted (service);
+
+ if (service is IDisposable) {
+ dispose_services.Push (service);
+ }
+
+ if (service is IInitializeService) {
+ ((IInitializeService)service).Initialize ();
+ }
+
+ return service;
+ } catch (Exception e) {
+ if (service is IRequiredService) {
+ Log.ErrorFormat ("Error initializing required service {0}",
+ service == null ? type.ToString () : service.ServiceName, false);
+ throw;
+ }
+
+ Log.Warning (String.Format ("Service `{0}' not started: {1}", type.FullName,
+ e.InnerException != null ? e.InnerException.Message : e.Message));
+ Log.Exception (e.InnerException ?? e);
+ }
+
+ return null;
+ }
+
private static void StartExtension (TypeExtensionNode node)
{
if (extension_services.ContainsKey (node.Path)) {
@@ -296,7 +305,13 @@
public static T Get<T> () where T : class, IService
{
- return Get (typeof (T).Name) as T;
+ Type type = typeof (T);
+ T service = Get (type.Name) as T;
+ if (service == null && type.GetInterface ("Banshee.ServiceStack.IRegisterOnDemandService") != null) {
+ return RegisterService (type) as T;
+ }
+
+ return service;
}
private static void OnStartupBegin ()
Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Services.mdp
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Services.mdp (original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Services.mdp Thu Aug 21 20:52:38 2008
@@ -87,7 +87,7 @@
<File name="Banshee.Metadata.MusicBrainz/MusicBrainzQueryJob.cs" subtype="Code" buildaction="Compile" />
<File name="Banshee.Metadata.Rhapsody/RhapsodyMetadataProvider.cs" subtype="Code" buildaction="Compile" />
<File name="Banshee.Metadata.Rhapsody/RhapsodyQueryJob.cs" subtype="Code" buildaction="Compile" />
- <File name="Banshee.Networking/NetworkDetect.cs" subtype="Code" buildaction="Compile" />
+ <File name="Banshee.Networking/Network.cs" subtype="Code" buildaction="Compile" />
<File name="Banshee.Networking/NetworkManager.cs" subtype="Code" buildaction="Compile" />
<File name="Banshee.Database/BansheeModelProvider.cs" subtype="Code" buildaction="Compile" />
<File name="Banshee.Database/BansheeModelCache.cs" subtype="Code" buildaction="Compile" />
@@ -184,6 +184,7 @@
<File name="Banshee.Sources/IFilterableSource.cs" subtype="Code" buildaction="Compile" />
<File name="Banshee.MediaEngine/IVisualizationDataSource.cs" subtype="Code" buildaction="Compile" />
<File name="Banshee.Collection/MoveOnInfoSaveJob.cs" subtype="Code" buildaction="Compile" />
+ <File name="Banshee.ServiceStack/IRegisterOnDemandService.cs" subtype="Code" buildaction="Compile" />
</Contents>
<References>
<ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
Modified: trunk/banshee/src/Core/Banshee.Services/Makefile.am
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Makefile.am (original)
+++ trunk/banshee/src/Core/Banshee.Services/Makefile.am Thu Aug 21 20:52:38 2008
@@ -94,7 +94,7 @@
Banshee.Metadata/IMetadataProvider.cs \
Banshee.Metadata/MetadataService.cs \
Banshee.Metadata/MetadataServiceJob.cs \
- Banshee.Networking/NetworkDetect.cs \
+ Banshee.Networking/Network.cs \
Banshee.Networking/NetworkManager.cs \
Banshee.PlaybackController/IBasicPlaybackController.cs \
Banshee.PlaybackController/ICanonicalPlaybackController.cs \
@@ -145,6 +145,7 @@
Banshee.ServiceStack/IExtensionService.cs \
Banshee.ServiceStack/IInitializeService.cs \
Banshee.ServiceStack/InterfaceAction.cs \
+ Banshee.ServiceStack/IRegisterOnDemandService.cs \
Banshee.ServiceStack/IRequiredService.cs \
Banshee.ServiceStack/IService.cs \
Banshee.ServiceStack/IUserJob.cs \
Modified: trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets.mdp
==============================================================================
--- trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets.mdp (original)
+++ trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets.mdp Thu Aug 21 20:52:38 2008
@@ -1,4 +1,4 @@
-<Project name="Banshee.Widgets" fileversion="2.0" language="C#" clr-version="Net_2_0" UseParentDirectoryAsNamespace="True" ctype="DotNetProject">
+<Project name="Banshee.Widgets" fileversion="2.0" language="C#" UseParentDirectoryAsNamespace="True" clr-version="Net_2_0" ctype="DotNetProject">
<Configurations active="Debug">
<Configuration name="Debug" ctype="DotNetProjectConfiguration">
<Output directory="../../../bin" assembly="Banshee.Widgets" />
Modified: trunk/banshee/src/Extensions/Banshee.AudioCd/Banshee.AudioCd.mdp
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.AudioCd/Banshee.AudioCd.mdp (original)
+++ trunk/banshee/src/Extensions/Banshee.AudioCd/Banshee.AudioCd.mdp Thu Aug 21 20:52:38 2008
@@ -1,4 +1,4 @@
-<Project name="Banshee.AudioCd" fileversion="2.0" language="C#" clr-version="Net_2_0" UseParentDirectoryAsNamespace="True" ctype="DotNetProject">
+<Project name="Banshee.AudioCd" fileversion="2.0" language="C#" UseParentDirectoryAsNamespace="True" clr-version="Net_2_0" ctype="DotNetProject">
<Configurations active="Debug">
<Configuration name="Debug" ctype="DotNetProjectConfiguration">
<Output directory="../../../bin" assemblyKeyFile="." assembly="Banshee.AudioCd" />
Modified: trunk/banshee/src/Extensions/Banshee.BooScript/Banshee.BooScript.mdp
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.BooScript/Banshee.BooScript.mdp (original)
+++ trunk/banshee/src/Extensions/Banshee.BooScript/Banshee.BooScript.mdp Thu Aug 21 20:52:38 2008
@@ -1,4 +1,4 @@
-<Project name="Banshee.BooScript" fileversion="2.0" language="C#" clr-version="Net_2_0" UseParentDirectoryAsNamespace="True" ctype="DotNetProject">
+<Project name="Banshee.BooScript" fileversion="2.0" language="C#" UseParentDirectoryAsNamespace="True" clr-version="Net_2_0" ctype="DotNetProject">
<Configurations active="Debug">
<Configuration name="Debug" ctype="DotNetProjectConfiguration">
<Output directory="../../../bin" assemblyKeyFile="." assembly="Banshee.BooScript" />
Modified: trunk/banshee/src/Extensions/Banshee.Bookmarks/Banshee.Bookmarks.mdp
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Bookmarks/Banshee.Bookmarks.mdp (original)
+++ trunk/banshee/src/Extensions/Banshee.Bookmarks/Banshee.Bookmarks.mdp Thu Aug 21 20:52:38 2008
@@ -1,4 +1,4 @@
-<Project name="Banshee.Bookmarks" fileversion="2.0" language="C#" clr-version="Net_2_0" UseParentDirectoryAsNamespace="True" ctype="DotNetProject">
+<Project name="Banshee.Bookmarks" fileversion="2.0" language="C#" UseParentDirectoryAsNamespace="True" clr-version="Net_2_0" ctype="DotNetProject">
<Configurations active="Debug">
<Configuration name="Debug" ctype="DotNetProjectConfiguration">
<Output directory="../../../bin" assemblyKeyFile="." assembly="Banshee.Bookmarks" />
Modified: trunk/banshee/src/Extensions/Banshee.CoverArt/Banshee.CoverArt.mdp
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.CoverArt/Banshee.CoverArt.mdp (original)
+++ trunk/banshee/src/Extensions/Banshee.CoverArt/Banshee.CoverArt.mdp Thu Aug 21 20:52:38 2008
@@ -1,4 +1,4 @@
-<Project name="Banshee.CoverArt" fileversion="2.0" language="C#" clr-version="Net_2_0" UseParentDirectoryAsNamespace="True" ctype="DotNetProject">
+<Project name="Banshee.CoverArt" fileversion="2.0" language="C#" UseParentDirectoryAsNamespace="True" clr-version="Net_2_0" ctype="DotNetProject">
<Configurations active="Debug">
<Configuration name="Debug" ctype="DotNetProjectConfiguration">
<Output directory="../../../bin" assemblyKeyFile="." assembly="Banshee.CoverArt" />
Modified: trunk/banshee/src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs (original)
+++ trunk/banshee/src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs Thu Aug 21 20:52:38 2008
@@ -50,7 +50,7 @@
public class CoverArtService : IExtensionService
{
private InterfaceActionService action_service;
- private ActionGroup actions;
+ private ActionGroup actions;
private bool disposed;
private uint ui_manager_id;
@@ -154,7 +154,7 @@
public void FetchCoverArt (bool force)
{
- if (job == null && NetworkDetect.Instance.Connected) {
+ if (job == null && ServiceManager.Get<Network> ().Connected) {
DateTime last_scan = DateTime.MinValue;
if (!force) {
Modified: trunk/banshee/src/Extensions/Banshee.Daap/Banshee.Daap.mdp
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Daap/Banshee.Daap.mdp (original)
+++ trunk/banshee/src/Extensions/Banshee.Daap/Banshee.Daap.mdp Thu Aug 21 20:52:38 2008
@@ -1,4 +1,4 @@
-<Project name="Banshee.Daap" fileversion="2.0" language="C#" clr-version="Net_2_0" UseParentDirectoryAsNamespace="True" ctype="DotNetProject">
+<Project name="Banshee.Daap" fileversion="2.0" language="C#" UseParentDirectoryAsNamespace="True" clr-version="Net_2_0" ctype="DotNetProject">
<Configurations active="Debug">
<Configuration name="Debug" ctype="DotNetProjectConfiguration">
<Output directory="../../../bin" assemblyKeyFile="." assembly="Banshee.Daap" />
Modified: trunk/banshee/src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue.mdp
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue.mdp (original)
+++ trunk/banshee/src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue.mdp Thu Aug 21 20:52:38 2008
@@ -1,4 +1,4 @@
-<Project name="Banshee.FileSystemQueue" fileversion="2.0" language="C#" clr-version="Net_2_0" UseParentDirectoryAsNamespace="True" ctype="DotNetProject">
+<Project name="Banshee.FileSystemQueue" fileversion="2.0" language="C#" UseParentDirectoryAsNamespace="True" clr-version="Net_2_0" ctype="DotNetProject">
<Configurations active="Debug">
<Configuration name="Debug" ctype="DotNetProjectConfiguration">
<Output directory="../../../bin" assemblyKeyFile="." assembly="Banshee.FileSystemQueue" />
Modified: trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs (original)
+++ trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs Thu Aug 21 20:52:38 2008
@@ -94,8 +94,9 @@
LastfmCore.AudioscrobblerQueue = queue;
connection = LastfmCore.Audioscrobbler;
- connection.UpdateNetworkState (NetworkDetect.Instance.Connected);
- NetworkDetect.Instance.StateChanged += delegate (object o, NetworkStateChangedArgs args) {
+ Network network = ServiceManager.Get<Network> ();
+ connection.UpdateNetworkState (network.Connected);
+ network.StateChanged += delegate (object o, NetworkStateChangedArgs args) {
connection.UpdateNetworkState (args.Connected);
};
Modified: trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs (original)
+++ trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs Thu Aug 21 20:52:38 2008
@@ -91,8 +91,9 @@
Browser.Open = Banshee.Web.Browser.Open;
connection = LastfmCore.Radio;
- connection.UpdateNetworkState (NetworkDetect.Instance.Connected);
- NetworkDetect.Instance.StateChanged += delegate (object o, NetworkStateChangedArgs args) {
+ Network network = ServiceManager.Get<Network> ();
+ connection.UpdateNetworkState (network.Connected);
+ network.StateChanged += delegate (object o, NetworkStateChangedArgs args) {
connection.UpdateNetworkState (args.Connected);
};
Modified: trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.mdp
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.mdp (original)
+++ trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.mdp Thu Aug 21 20:52:38 2008
@@ -1,4 +1,4 @@
-<Project name="Banshee.Plugins.Lastfm" fileversion="2.0" language="C#" clr-version="Net_2_0" UseParentDirectoryAsNamespace="True" ctype="DotNetProject">
+<Project name="Banshee.Plugins.Lastfm" fileversion="2.0" language="C#" UseParentDirectoryAsNamespace="True" clr-version="Net_2_0" ctype="DotNetProject">
<Configurations active="Debug">
<Configuration name="Debug" ctype="DotNetProjectConfiguration">
<Output directory="." assembly="Banshee.Plugins.LastFM" />
@@ -57,7 +57,5 @@
<AsmRefVar />
<ProjectRefVar />
</MonoDevelop.Autotools.MakefileInfo>
- <DeploymentInformation strategy="File">
- <excludeFiles />
- </DeploymentInformation>
+ <DeploymentInformation strategy="File" />
</Project>
\ No newline at end of file
Modified: trunk/banshee/src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys.mdp
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys.mdp (original)
+++ trunk/banshee/src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys.mdp Thu Aug 21 20:52:38 2008
@@ -1,4 +1,4 @@
-<Project name="Banshee.MultimediaKeys" fileversion="2.0" language="C#" clr-version="Net_2_0" UseParentDirectoryAsNamespace="True" ctype="DotNetProject">
+<Project name="Banshee.MultimediaKeys" fileversion="2.0" language="C#" UseParentDirectoryAsNamespace="True" clr-version="Net_2_0" ctype="DotNetProject">
<Configurations active="Debug">
<Configuration name="Debug" ctype="DotNetProjectConfiguration">
<Output directory="../../../bin" assemblyKeyFile="." assembly="Banshee.MultimediaKeys" />
Modified: trunk/banshee/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.mdp
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.mdp (original)
+++ trunk/banshee/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.mdp Thu Aug 21 20:52:38 2008
@@ -1,4 +1,4 @@
-<Project name="Banshee.NotificationArea" fileversion="2.0" language="C#" clr-version="Net_2_0" UseParentDirectoryAsNamespace="True" ctype="DotNetProject">
+<Project name="Banshee.NotificationArea" fileversion="2.0" language="C#" UseParentDirectoryAsNamespace="True" clr-version="Net_2_0" ctype="DotNetProject">
<Configurations active="Debug">
<Configuration name="Debug" ctype="DotNetProjectConfiguration">
<Output directory="../../../bin" assemblyKeyFile="." assembly="Banshee.NotificationArea" />
Modified: trunk/banshee/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue.mdp
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue.mdp (original)
+++ trunk/banshee/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue.mdp Thu Aug 21 20:52:38 2008
@@ -1,4 +1,4 @@
-<Project name="Banshee.PlayQueue" fileversion="2.0" language="C#" clr-version="Net_2_0" UseParentDirectoryAsNamespace="True" ctype="DotNetProject">
+<Project name="Banshee.PlayQueue" fileversion="2.0" language="C#" UseParentDirectoryAsNamespace="True" clr-version="Net_2_0" ctype="DotNetProject">
<Configurations active="Debug">
<Configuration name="Debug" ctype="DotNetProjectConfiguration">
<Output directory="../../../bin" assemblyKeyFile="." assembly="Banshee.PlayQueue" />
Modified: trunk/banshee/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.mdp
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.mdp (original)
+++ trunk/banshee/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.mdp Thu Aug 21 20:52:38 2008
@@ -1,4 +1,4 @@
-<Project name="Banshee.Podcasting" fileversion="2.0" language="C#" clr-version="Net_2_0" UseParentDirectoryAsNamespace="True" ctype="DotNetProject">
+<Project name="Banshee.Podcasting" fileversion="2.0" language="C#" UseParentDirectoryAsNamespace="True" clr-version="Net_2_0" ctype="DotNetProject">
<Configurations active="Debug">
<Configuration name="Debug" ctype="DotNetProjectConfiguration">
<Output directory="../../../bin" assemblyKeyFile="." assembly="Banshee.Podcasting" />
Modified: trunk/banshee/src/Extensions/Banshee.Podcasting/Banshee.Podcasting/PodcastImageFetchJob.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Podcasting/Banshee.Podcasting/PodcastImageFetchJob.cs (original)
+++ trunk/banshee/src/Extensions/Banshee.Podcasting/Banshee.Podcasting/PodcastImageFetchJob.cs Thu Aug 21 20:52:38 2008
@@ -75,7 +75,7 @@
return;
} else if (CoverArtSpec.CoverExists (cover_art_id)) {
return;
- } else if (!NetworkDetect.Instance.Connected) {
+ } else if (!InternetConnected) {
return;
}
Modified: trunk/banshee/src/Extensions/Banshee.Sample/Banshee.Sample.mdp
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Sample/Banshee.Sample.mdp (original)
+++ trunk/banshee/src/Extensions/Banshee.Sample/Banshee.Sample.mdp Thu Aug 21 20:52:38 2008
@@ -1,4 +1,4 @@
-<Project name="Banshee.Sample" fileversion="2.0" language="C#" clr-version="Net_2_0" UseParentDirectoryAsNamespace="True" ctype="DotNetProject">
+<Project name="Banshee.Sample" fileversion="2.0" language="C#" UseParentDirectoryAsNamespace="True" clr-version="Net_2_0" ctype="DotNetProject">
<Configurations active="Debug">
<Configuration name="Debug" ctype="DotNetProjectConfiguration">
<Output directory="../../../bin" assemblyKeyFile="." assembly="Banshee.Sample" />
Modified: trunk/banshee/src/Extensions/Banshee.Torrent/Banshee.Torrent.mdp
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Torrent/Banshee.Torrent.mdp (original)
+++ trunk/banshee/src/Extensions/Banshee.Torrent/Banshee.Torrent.mdp Thu Aug 21 20:52:38 2008
@@ -1,4 +1,4 @@
-<Project name="Banshee.Torrent" fileversion="2.0" language="C#" clr-version="Net_2_0" UseParentDirectoryAsNamespace="True" ctype="DotNetProject">
+<Project name="Banshee.Torrent" fileversion="2.0" language="C#" UseParentDirectoryAsNamespace="True" clr-version="Net_2_0" ctype="DotNetProject">
<Configurations active="Debug">
<Configuration name="Debug" ctype="DotNetProjectConfiguration">
<Output directory="../../../bin" assemblyKeyFile="." assembly="Banshee.Torrent" />
@@ -30,4 +30,4 @@
<AsmRefVar />
<ProjectRefVar />
</MonoDevelop.Autotools.MakefileInfo>
-</Project>
+</Project>
\ No newline at end of file
Modified: trunk/banshee/src/Extensions/Extensions.mds
==============================================================================
--- trunk/banshee/src/Extensions/Extensions.mds (original)
+++ trunk/banshee/src/Extensions/Extensions.mds Thu Aug 21 20:52:38 2008
@@ -61,4 +61,4 @@
<Entry filename="Banshee.SqlDebugConsole/Banshee.SqlDebugConsole.mdp" />
<Entry filename="Banshee.Torrent/Banshee.Torrent.mdp" />
</Entries>
-</Combine>
+</Combine>
\ No newline at end of file
Modified: trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui.mdp
==============================================================================
--- trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui.mdp (original)
+++ trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui.mdp Thu Aug 21 20:52:38 2008
@@ -97,6 +97,7 @@
<ProjectReference type="Gac" localcopy="True" refto="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
</References>
<Deployment.LinuxDeployData generateScript="False" />
+ <GtkDesignInfo gtkVersion="2.12.1" />
<MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="Makefile.am">
<BuildFilesVar Sync="True" Name="SOURCES" />
<DeployFilesVar />
Modified: trunk/banshee/src/Libraries/Hyena/Hyena.mdp
==============================================================================
--- trunk/banshee/src/Libraries/Hyena/Hyena.mdp (original)
+++ trunk/banshee/src/Libraries/Hyena/Hyena.mdp Thu Aug 21 20:52:38 2008
@@ -1,4 +1,4 @@
-<Project name="Hyena" fileversion="2.0" language="C#" clr-version="Net_2_0" UseParentDirectoryAsNamespace="True" ctype="DotNetProject">
+<Project name="Hyena" fileversion="2.0" language="C#" UseParentDirectoryAsNamespace="True" clr-version="Net_2_0" ctype="DotNetProject">
<Configurations active="Debug">
<Configuration name="Debug" ctype="DotNetProjectConfiguration">
<Output directory="../../../bin" assembly="Hyena" />
@@ -109,6 +109,7 @@
<ProjectReference type="Gac" localcopy="True" refto="nunit.core, Version=2.2.0.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" />
</References>
<Deployment.LinuxDeployData generateScript="False" />
+ <GtkDesignInfo gtkVersion="2.12.1" />
<MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="Makefile.am">
<BuildFilesVar Sync="True" Name="SOURCES" />
<DeployFilesVar />
Modified: trunk/banshee/src/Libraries/Lastfm.Gui/Lastfm.Gui.mdp
==============================================================================
--- trunk/banshee/src/Libraries/Lastfm.Gui/Lastfm.Gui.mdp (original)
+++ trunk/banshee/src/Libraries/Lastfm.Gui/Lastfm.Gui.mdp Thu Aug 21 20:52:38 2008
@@ -1,4 +1,4 @@
-<Project name="Lastfm.Gui" fileversion="2.0" language="C#" clr-version="Net_2_0" UseParentDirectoryAsNamespace="True" ctype="DotNetProject">
+<Project name="Lastfm.Gui" fileversion="2.0" language="C#" UseParentDirectoryAsNamespace="True" clr-version="Net_2_0" ctype="DotNetProject">
<Configurations active="Debug">
<Configuration name="Debug" ctype="DotNetProjectConfiguration">
<Output directory="." assembly="Lastfm" />
@@ -20,4 +20,5 @@
<ProjectReference type="Gac" localcopy="True" refto="gnome-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<ProjectReference type="Project" localcopy="True" refto="Lastfm" />
</References>
+ <GtkDesignInfo gtkVersion="2.12.1" />
</Project>
\ No newline at end of file
Modified: trunk/banshee/src/Libraries/Migo/Migo.mdp
==============================================================================
--- trunk/banshee/src/Libraries/Migo/Migo.mdp (original)
+++ trunk/banshee/src/Libraries/Migo/Migo.mdp Thu Aug 21 20:52:38 2008
@@ -1,4 +1,4 @@
-<Project name="Migo" fileversion="2.0" language="C#" clr-version="Net_2_0" UseParentDirectoryAsNamespace="True" ctype="DotNetProject">
+<Project name="Migo" fileversion="2.0" language="C#" UseParentDirectoryAsNamespace="True" clr-version="Net_2_0" ctype="DotNetProject">
<Configurations active="Debug">
<Configuration name="Debug" ctype="DotNetProjectConfiguration">
<Output directory="../../../bin" assembly="Migo" />
@@ -86,6 +86,7 @@
<ProjectReference type="Gac" localcopy="True" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</References>
<Deployment.LinuxDeployData generateScript="False" />
+ <GtkDesignInfo gtkVersion="2.12.1" />
<MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="Makefile.am">
<BuildFilesVar Sync="True" Name="SOURCES" />
<DeployFilesVar />
Modified: trunk/banshee/src/Libraries/Mono.Media/Mono.Media.mdp
==============================================================================
--- trunk/banshee/src/Libraries/Mono.Media/Mono.Media.mdp (original)
+++ trunk/banshee/src/Libraries/Mono.Media/Mono.Media.mdp Thu Aug 21 20:52:38 2008
@@ -15,13 +15,13 @@
<File name="Media.Playlists.Xspf/W3CDateTime.cs" subtype="Code" buildaction="Compile" />
<File name="Media.Playlists.Xspf/XmlUtil.cs" subtype="Code" buildaction="Compile" />
<File name="Media.Playlists.Xspf/XspfBaseObject.cs" subtype="Code" buildaction="Compile" />
- <File name="Media.Playlists.Xspf/Tests" subtype="Directory" buildaction="Compile" />
<File name="Media.Playlists.Xspf/Tests/XspfTests.cs" subtype="Code" buildaction="Compile" />
</Contents>
<References>
<ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<ProjectReference type="Gac" localcopy="True" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</References>
+ <GtkDesignInfo gtkVersion="2.12.1" />
<MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="Makefile.am">
<BuildFilesVar Sync="True" Name="SOURCES" />
<DeployFilesVar />
Modified: trunk/banshee/src/Libraries/Mtp/Mtp.mdp
==============================================================================
--- trunk/banshee/src/Libraries/Mtp/Mtp.mdp (original)
+++ trunk/banshee/src/Libraries/Mtp/Mtp.mdp Thu Aug 21 20:52:38 2008
@@ -1,4 +1,4 @@
-<Project name="Mtp" fileversion="2.0" language="C#" clr-version="Net_2_0" UseParentDirectoryAsNamespace="True" ctype="DotNetProject">
+<Project name="Mtp" fileversion="2.0" language="C#" UseParentDirectoryAsNamespace="True" clr-version="Net_2_0" ctype="DotNetProject">
<Configurations active="Debug">
<Configuration name="Debug" ctype="DotNetProjectConfiguration">
<Output directory="../../../bin" assembly="Mtp" />
@@ -21,6 +21,7 @@
<ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</References>
<Deployment.LinuxDeployData generateScript="False" />
+ <GtkDesignInfo gtkVersion="2.12.1" />
<MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="Makefile.am">
<BuildFilesVar Sync="True" Name="SOURCES" />
<DeployFilesVar />
Modified: trunk/banshee/src/Libraries/MusicBrainz/MusicBrainz.mdp
==============================================================================
--- trunk/banshee/src/Libraries/MusicBrainz/MusicBrainz.mdp (original)
+++ trunk/banshee/src/Libraries/MusicBrainz/MusicBrainz.mdp Thu Aug 21 20:52:38 2008
@@ -1,4 +1,4 @@
-<Project name="MusicBrainz" fileversion="2.0" language="C#" clr-version="Net_2_0" UseParentDirectoryAsNamespace="True" ctype="DotNetProject">
+<Project name="MusicBrainz" fileversion="2.0" language="C#" UseParentDirectoryAsNamespace="True" clr-version="Net_2_0" ctype="DotNetProject">
<Configurations active="Debug">
<Configuration name="Debug" ctype="DotNetProjectConfiguration">
<Output directory="../../../bin" assembly="MusicBrainz" />
@@ -31,6 +31,7 @@
<ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</References>
<Deployment.LinuxDeployData generateScript="False" />
+ <GtkDesignInfo gtkVersion="2.12.1" />
<MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="Makefile.am">
<BuildFilesVar Sync="True" Name="SOURCES" />
<DeployFilesVar />
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
