[banshee] [build] Update to latest Hyena; use new sqlite binding
- From: Gabriel Burt <gburt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee] [build] Update to latest Hyena; use new sqlite binding
- Date: Sun, 14 Nov 2010 01:59:53 +0000 (UTC)
commit 7f731b3954e1953fc4857a4a4301f98d548d8f10
Author: Gabriel Burt <gabriel burt gmail com>
Date: Wed Nov 10 11:59:29 2010 -0600
[build] Update to latest Hyena; use new sqlite binding
The new binding does not depend on Mono.Data.Sqlite or System.Data.
Remove all Banshee build references to those.
Banshee.sln | 7 -------
Makefile.am | 2 +-
build/build.environment.mk | 8 ++------
build/pkg-config/banshee-1-hyena-data-sqlite.pc.in | 2 +-
configure.ac | 2 --
.../Banshee.Collection.Database/Bookmark.cs | 1 -
.../DatabaseAlbumInfo.cs | 1 -
.../DatabaseAlbumListModel.cs | 1 -
.../DatabaseArtistInfo.cs | 1 -
.../DatabaseArtistListModel.cs | 1 -
.../DatabaseFilterListModel.cs | 1 -
.../DatabaseTrackInfo.cs | 1 -
.../DatabaseTrackListModel.cs | 5 ++---
.../IDatabaseTrackModelCache.cs | 2 +-
.../Banshee.Collection/RescanPipeline.cs | 1 -
.../DatabaseConfigurationClient.cs | 3 +--
.../Banshee.Database/BansheeDbConnection.cs | 1 -
.../Banshee.Database/BansheeDbFormatMigrator.cs | 8 +++++---
.../Banshee.Database/BansheeModelCache.cs | 1 -
.../Banshee.Database/BansheeModelProvider.cs | 1 -
.../Banshee.Playlist/AbstractPlaylistSource.cs | 1 -
.../Banshee.Playlist/PlaylistSource.cs | 1 -
.../Banshee.Services/Banshee.Query/BansheeQuery.cs | 1 -
src/Core/Banshee.Services/Banshee.Services.csproj | 5 -----
.../Banshee.SmartPlaylist/Migrator.cs | 1 -
.../Banshee.SmartPlaylist/SmartPlaylistSource.cs | 1 -
.../Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs | 1 -
.../Banshee.Gui/BookmarksService.cs | 1 -
.../Banshee.ThickClient/Banshee.ThickClient.csproj | 1 -
.../Banshee.AmazonMp3/Banshee.AmazonMp3.csproj | 1 -
src/Extensions/Banshee.Bpm/Banshee.Bpm.csproj | 1 -
.../Banshee.Bpm/Banshee.Bpm/BpmService.cs | 1 -
.../Banshee.CoverArt/Banshee.CoverArt.csproj | 1 -
.../Banshee.CoverArt/CoverArtService.cs | 2 +-
.../Banshee.Emusic/Banshee.Emusic.csproj | 1 -
.../Banshee.Emusic/Banshee.Emusic/EmusicImport.cs | 1 -
.../Banshee.Lastfm/Banshee.Lastfm.csproj | 1 -
.../Banshee.LastfmStreaming.csproj | 1 -
.../Banshee.LastfmStreaming/StationSource.cs | 1 -
.../Banshee.LibraryWatcher.csproj | 1 -
.../Banshee.LibraryWatcher/SourceWatcher.cs | 1 -
.../Banshee.PlayQueue/Banshee.PlayQueue.csproj | 4 ----
.../Banshee.PlayerMigration.csproj | 1 -
.../AmarokPlayerImportSource.cs | 5 ++---
.../ItunesPlayerImportSource.cs | 1 -
.../RhythmboxPlayerImportSource.cs | 1 -
.../Banshee.Podcasting/Banshee.Podcasting.csproj | 1 -
src/Hyena | 2 +-
.../Migo/Migo.Syndication/EnclosureManager.cs | 1 -
.../Migo/Migo.Syndication/FeedsManager.cs | 1 -
.../TablesManagers/EnclosuresTableManager.cs | 1 -
.../TablesManagers/FeedsTableManager.cs | 2 --
.../TablesManagers/ItemsTableManager.cs | 1 -
.../Migo/Migo.Syndication/MigoModelProvider.cs | 2 +-
src/Libraries/Migo/Migo.csproj | 1 -
tests/Makefile.am | 1 +
tests/Performance/PerformanceTests.cs | 1 -
57 files changed, 19 insertions(+), 83 deletions(-)
---
diff --git a/Banshee.sln b/Banshee.sln
index d43dd41..ad28ba7 100644
--- a/Banshee.sln
+++ b/Banshee.sln
@@ -162,8 +162,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MusicBrainz", "src\Librarie
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Migo", "src\Libraries\Migo\Migo.csproj", "{9C7B8E9C-A4E6-4459-A2C4-3D2D199EA919}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Data.Sqlite", "src\Hyena\Mono.Data.Sqlite\Mono.Data.Sqlite.csproj", "{BB1D1D81-7A74-4183-B7B1-3E78B32D42F1}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "metrics", "extras\metrics\metrics.csproj", "{6D17167C-AC3F-4D40-A652-46627276A9A1}"
EndProject
Global
@@ -375,10 +373,6 @@ Global
{BA67DA42-F0DA-4D64-BD8B-22F30C727BAB}.Release|Any CPU.Build.0 = Release|Any CPU
{BA67DA42-F0DA-4D64-BD8B-22F30C727BAB}.Windows|Any CPU.ActiveCfg = Windows|Any CPU
{BA67DA42-F0DA-4D64-BD8B-22F30C727BAB}.Windows|Any CPU.Build.0 = Windows|Any CPU
- {BB1D1D81-7A74-4183-B7B1-3E78B32D42F1}.Debug|Any CPU.ActiveCfg = Submodule|Any CPU
- {BB1D1D81-7A74-4183-B7B1-3E78B32D42F1}.Debug|Any CPU.Build.0 = Submodule|Any CPU
- {BB1D1D81-7A74-4183-B7B1-3E78B32D42F1}.Windows|Any CPU.ActiveCfg = Submodule|Any CPU
- {BB1D1D81-7A74-4183-B7B1-3E78B32D42F1}.Windows|Any CPU.Build.0 = Submodule|Any CPU
{BC2E94DF-7A82-461E-BE7C-60E41ADC3562}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BC2E94DF-7A82-461E-BE7C-60E41ADC3562}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BC2E94DF-7A82-461E-BE7C-60E41ADC3562}.Release|Any CPU.ActiveCfg = Debug|Any CPU
@@ -530,7 +524,6 @@ Global
{A7566CDC-6033-4A16-9E9D-87D05A627066} = {4F47D6F1-4047-4A89-AE85-3AE5EF9F2961}
{C5DD02DE-4F0E-4DC0-ABC7-035A8217CD50} = {4F47D6F1-4047-4A89-AE85-3AE5EF9F2961}
{9C7B8E9C-A4E6-4459-A2C4-3D2D199EA919} = {4F47D6F1-4047-4A89-AE85-3AE5EF9F2961}
- {BB1D1D81-7A74-4183-B7B1-3E78B32D42F1} = {4F47D6F1-4047-4A89-AE85-3AE5EF9F2961}
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = src\Clients\Nereid\Nereid.csproj
diff --git a/Makefile.am b/Makefile.am
index 3ae24a4..a2d863a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -72,7 +72,7 @@ run-perf: run-logged
run-trace: $(MO_FILES)
(cd bin; $(MONO) \
- --trace=$$(find . -name "*dll" | sed 's/\.\///' | sed 's/\.dll//' | sed 's/Mono.Data.Sqlite//' | sort | tr "\n" , | sed 's/,$$//') \
+ --trace=$$(find . -name "*dll" | sed 's/\.\///' | sed 's/\.dll//' | sort | tr "\n" , | sed 's/,$$//') \
Nereid.exe --uninstalled $(BANSHEE_DEV_OPTIONS) > ../banshee.trace)
run-profile-heap: $(MO_FILES)
diff --git a/build/build.environment.mk b/build/build.environment.mk
index 11a83ad..dfd6e7b 100644
--- a/build/build.environment.mk
+++ b/build/build.environment.mk
@@ -31,12 +31,8 @@ LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
DIR_BIN = $(top_builddir)/bin
-# Mono.Data
-REF_SQLITE = -r:System -r:System.Data -r:System.Transactions
-LINK_SQLITE = -r:System.Data -r:$(DIR_BIN)/Mono.Data.Sqlite.dll
-
# Hyena
-REF_HYENA = $(LINK_SYSTEM) $(LINK_SQLITE) $(LINK_MONO_POSIX)
+REF_HYENA = $(LINK_SYSTEM) $(LINK_MONO_POSIX)
LINK_HYENA = -r:$(DIR_BIN)/Hyena.dll -r:$(DIR_BIN)/Hyena.Data.Sqlite.dll
LINK_HYENA_DEPS = $(REF_HYENA) $(LINK_HYENA)
@@ -89,7 +85,7 @@ REF_BANSHEE_CORE = $(LINK_HYENA_DEPS) $(LINK_MONO_POSIX) $(LINK_GLIB) \
LINK_BANSHEE_CORE = -r:$(DIR_BIN)/Banshee.Core.dll
LINK_BANSHEE_CORE_DEPS = $(REF_BANSHEE_CORE) $(LINK_BANSHEE_CORE)
-REF_BANSHEE_SERVICES = $(LINK_SQLITE) $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_MEDIA_DEPS) $(LINK_LASTFM_DEPS) $(LINK_MUSICBRAINZ_DEPS)
+REF_BANSHEE_SERVICES = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_MEDIA_DEPS) $(LINK_LASTFM_DEPS) $(LINK_MUSICBRAINZ_DEPS)
LINK_BANSHEE_SERVICES = -r:$(DIR_BIN)/Banshee.Services.dll
LINK_BANSHEE_SERVICES_DEPS = $(REF_BANSHEE_SERVICES) $(LINK_BANSHEE_SERVICES)
diff --git a/build/pkg-config/banshee-1-hyena-data-sqlite.pc.in b/build/pkg-config/banshee-1-hyena-data-sqlite.pc.in
index 8138b7b..b6b2e7b 100644
--- a/build/pkg-config/banshee-1-hyena-data-sqlite.pc.in
+++ b/build/pkg-config/banshee-1-hyena-data-sqlite.pc.in
@@ -7,5 +7,5 @@ Name: Banshee Hyena
Description: Hyena sqlite libraries for the Banshee Media Framework
Version: @VERSION@
Requires: banshee-1-hyena
-Libs: -r:System.Data -r:${bansheedir}/Mono.Data.Sqlite -r:${bansheedir}/Hyena.Data.Sqlite.dll
+Libs: -r:${bansheedir}/Hyena.Data.Sqlite.dll
diff --git a/configure.ac b/configure.ac
index 20f7de2..4e1f898 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,7 +75,6 @@ SHAMROCK_CHECK_MONO_MODULE(1.9.1)
SHAMROCK_FIND_MONO_2_0_COMPILER
SHAMROCK_FIND_MONO_RUNTIME
SHAMROCK_CHECK_MONO_2_0_GAC_ASSEMBLIES([
- System.Data
Mono.Cairo
Mono.Posix
ICSharpCode.SharpZipLib
@@ -277,7 +276,6 @@ src/Hyena/Makefile
src/Hyena/build/Makefile
src/Hyena/build/pkg-config/Makefile
src/Hyena/build/m4/Makefile
-src/Hyena/Mono.Data.Sqlite/Makefile
src/Hyena/Hyena/Makefile
src/Hyena/Hyena.Data.Sqlite/Makefile
src/Hyena/Hyena.Gui/Makefile
diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/Bookmark.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/Bookmark.cs
index 79ef2d4..ddc17a0 100644
--- a/src/Core/Banshee.Services/Banshee.Collection.Database/Bookmark.cs
+++ b/src/Core/Banshee.Services/Banshee.Collection.Database/Bookmark.cs
@@ -27,7 +27,6 @@
//
using System;
-using System.Data;
using System.Linq;
using System.Collections.Generic;
diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumInfo.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumInfo.cs
index e622f2c..85558aa 100644
--- a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumInfo.cs
+++ b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumInfo.cs
@@ -27,7 +27,6 @@
//
using System;
-using System.Data;
using Mono.Unix;
diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs
index 9894afc..27a91ba 100644
--- a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs
+++ b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs
@@ -28,7 +28,6 @@
//
using System;
-using System.Data;
using System.Text;
using System.Collections.Generic;
using Mono.Unix;
diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistInfo.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistInfo.cs
index 0a0fbfa..3ebf54f 100644
--- a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistInfo.cs
+++ b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistInfo.cs
@@ -27,7 +27,6 @@
//
using System;
-using System.Data;
using Mono.Unix;
diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistListModel.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistListModel.cs
index aaf0d52..f7a2b4b 100644
--- a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistListModel.cs
+++ b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistListModel.cs
@@ -28,7 +28,6 @@
//
using System;
-using System.Data;
using System.Collections.Generic;
using Mono.Unix;
diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseFilterListModel.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseFilterListModel.cs
index 7c8bcdb..018a0f4 100644
--- a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseFilterListModel.cs
+++ b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseFilterListModel.cs
@@ -28,7 +28,6 @@
//
using System;
-using System.Data;
using System.Text;
using System.Collections.Generic;
diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackInfo.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackInfo.cs
index 016c1a6..d9e5a99 100644
--- a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackInfo.cs
+++ b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackInfo.cs
@@ -28,7 +28,6 @@
using System;
using System.Collections.Generic;
-using System.Data;
using System.IO;
using Hyena;
diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackListModel.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackListModel.cs
index afbdf6a..733aec2 100644
--- a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackListModel.cs
+++ b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackListModel.cs
@@ -28,7 +28,6 @@
//
using System;
-using System.Data;
using System.Text;
using System.Collections.Generic;
using System.Linq;
@@ -178,8 +177,8 @@ namespace Banshee.Collection.Database
private void HandleCacheAggregatesUpdated (IDataReader reader)
{
- filtered_duration = TimeSpan.FromMilliseconds (reader.IsDBNull (1) ? 0 : Convert.ToInt64 (reader[1]));
- filtered_filesize = reader.IsDBNull (2) ? 0 : Convert.ToInt64 (reader[2]);
+ filtered_duration = TimeSpan.FromMilliseconds (reader[1] == null ? 0 : Convert.ToInt64 (reader[1]));
+ filtered_filesize = reader[2] == null ? 0 : Convert.ToInt64 (reader[2]);
}
public override void Clear ()
diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/IDatabaseTrackModelCache.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/IDatabaseTrackModelCache.cs
index 9f89bdf..04ec262 100644
--- a/src/Core/Banshee.Services/Banshee.Collection.Database/IDatabaseTrackModelCache.cs
+++ b/src/Core/Banshee.Services/Banshee.Collection.Database/IDatabaseTrackModelCache.cs
@@ -27,7 +27,7 @@
//
using System;
-using System.Data;
+
using Banshee.Collection;
using Hyena.Data.Sqlite;
using Hyena.Query;
diff --git a/src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs b/src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs
index 2f33432..034e377 100644
--- a/src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs
+++ b/src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs
@@ -27,7 +27,6 @@
//
using System;
-using System.Data;
using Mono.Unix;
diff --git a/src/Core/Banshee.Services/Banshee.Configuration/DatabaseConfigurationClient.cs b/src/Core/Banshee.Services/Banshee.Configuration/DatabaseConfigurationClient.cs
index 53aa309..7a60603 100644
--- a/src/Core/Banshee.Services/Banshee.Configuration/DatabaseConfigurationClient.cs
+++ b/src/Core/Banshee.Services/Banshee.Configuration/DatabaseConfigurationClient.cs
@@ -26,7 +26,6 @@
*/
using System;
-using System.Data;
using Hyena.Data.Sqlite;
@@ -84,7 +83,7 @@ namespace Banshee.Configuration
try {
using (IDataReader reader = Get (namespce, key)) {
if (reader.Read ()) {
- return (T) Convert.ChangeType (reader.GetString (0), typeof (T));
+ return (T) Convert.ChangeType (reader[0], typeof (T));
} else {
return fallback;
}
diff --git a/src/Core/Banshee.Services/Banshee.Database/BansheeDbConnection.cs b/src/Core/Banshee.Services/Banshee.Database/BansheeDbConnection.cs
index dab8f53..b9e4c23 100644
--- a/src/Core/Banshee.Services/Banshee.Database/BansheeDbConnection.cs
+++ b/src/Core/Banshee.Services/Banshee.Database/BansheeDbConnection.cs
@@ -30,7 +30,6 @@ using System;
using System.Linq;
using System.Collections.Generic;
using System.IO;
-using System.Data;
using System.Threading;
using Hyena;
diff --git a/src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs b/src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs
index 3d7bfd0..90cddb6 100644
--- a/src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs
+++ b/src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs
@@ -28,12 +28,10 @@
//
using System;
-using System.Data;
using System.Reflection;
using System.Text;
using System.Threading;
using Mono.Unix;
-using Mono.Data.Sqlite;
using Hyena;
using Hyena.Jobs;
@@ -731,6 +729,8 @@ namespace Banshee.Database
// Make paths not relative for Music Library items
string library_path = Banshee.Library.LibrarySource.OldLocationSchema.Get (Banshee.Library.MusicLibrarySource.GetDefaultBaseDirectory ());
if (library_path != null) {
+ connection.AddFunction<MigratePartialFunction> ();
+
int podcast_src_id = connection.Query<int> ("SELECT PrimarySourceID FROM CorePrimarySources WHERE StringID = 'PodcastSource-PodcastLibrary'");
connection.Execute (@"
@@ -743,6 +743,8 @@ namespace Banshee.Database
UPDATE CoreTracks SET Uri = BANSHEE_MIGRATE_PARTIAL(?, Uri)
WHERE UriType = 1
AND PrimarySourceID = ?", podcast_path, podcast_src_id);
+
+ connection.RemoveFunction<MigratePartialFunction> ();
}
} catch (Exception e) {
Hyena.Log.Exception (e);
@@ -1393,7 +1395,7 @@ namespace Banshee.Database
);
int count = 0;
- using (System.Data.IDataReader reader = ServiceManager.DbConnection.Query (select_command)) {
+ using (var reader = ServiceManager.DbConnection.Query (select_command)) {
while (reader.Read ()) {
DatabaseTrackInfo track = null;
try {
diff --git a/src/Core/Banshee.Services/Banshee.Database/BansheeModelCache.cs b/src/Core/Banshee.Services/Banshee.Database/BansheeModelCache.cs
index 83a66da..5bcdca7 100644
--- a/src/Core/Banshee.Services/Banshee.Database/BansheeModelCache.cs
+++ b/src/Core/Banshee.Services/Banshee.Database/BansheeModelCache.cs
@@ -28,7 +28,6 @@
//
using System;
-using System.Data;
using Hyena.Data;
using Hyena.Data.Sqlite;
diff --git a/src/Core/Banshee.Services/Banshee.Database/BansheeModelProvider.cs b/src/Core/Banshee.Services/Banshee.Database/BansheeModelProvider.cs
index 033c69e..3ac9e6a 100644
--- a/src/Core/Banshee.Services/Banshee.Database/BansheeModelProvider.cs
+++ b/src/Core/Banshee.Services/Banshee.Database/BansheeModelProvider.cs
@@ -28,7 +28,6 @@
using System;
using System.Collections.Generic;
-using System.Data;
using Hyena.Data.Sqlite;
diff --git a/src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs b/src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs
index 1d36d8e..2f296b6 100644
--- a/src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs
+++ b/src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs
@@ -28,7 +28,6 @@
//
using System;
-using System.Data;
using System.Collections;
using System.Collections.Generic;
diff --git a/src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs b/src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs
index 0b9efa4..b343a3f 100644
--- a/src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs
+++ b/src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs
@@ -28,7 +28,6 @@
//
using System;
-using System.Data;
using System.Collections;
using System.Collections.Generic;
diff --git a/src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs b/src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs
index e088ceb..4f51d07 100644
--- a/src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs
+++ b/src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs
@@ -28,7 +28,6 @@
//
using System;
-using System.Data;
using System.Text;
using System.Collections.Generic;
diff --git a/src/Core/Banshee.Services/Banshee.Services.csproj b/src/Core/Banshee.Services/Banshee.Services.csproj
index 821ca80..c52ab86 100644
--- a/src/Core/Banshee.Services/Banshee.Services.csproj
+++ b/src/Core/Banshee.Services/Banshee.Services.csproj
@@ -38,7 +38,6 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
- <Reference Include="System.Data" />
<Reference Include="System.Core" />
<Reference Include="glib-sharp">
<SpecificVersion>False</SpecificVersion>
@@ -99,10 +98,6 @@
<Name>Hyena</Name>
<Private>False</Private>
</ProjectReference>
- <ProjectReference Include="..\..\Hyena\Mono.Data.Sqlite\Mono.Data.Sqlite.csproj">
- <Project>{BB1D1D81-7A74-4183-B7B1-3E78B32D42F1}</Project>
- <Name>Mono.Data.Sqlite</Name>
- </ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="Banshee.Database\BansheeDbConnection.cs" />
diff --git a/src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs b/src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs
index d1374b1..3f9f998 100644
--- a/src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs
+++ b/src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs
@@ -28,7 +28,6 @@
//
using System;
-using System.Data;
using System.Text.RegularExpressions;
using System.Collections;
using System.Collections.Generic;
diff --git a/src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs b/src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs
index 53a5717..bea8be0 100644
--- a/src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs
+++ b/src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs
@@ -28,7 +28,6 @@
//
using System;
-using System.Data;
using System.Collections;
using System.Collections.Generic;
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs b/src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs
index c7944fd..4e58f24 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs
@@ -27,7 +27,6 @@
//
using System;
-using System.Data;
using System.Collections.Generic;
using Gtk;
using Mono.Unix;
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui/BookmarksService.cs b/src/Core/Banshee.ThickClient/Banshee.Gui/BookmarksService.cs
index 4c93461..375685d 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui/BookmarksService.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui/BookmarksService.cs
@@ -27,7 +27,6 @@
//
using System;
-using System.Data;
using System.Collections.Generic;
using Gtk;
using Mono.Unix;
diff --git a/src/Core/Banshee.ThickClient/Banshee.ThickClient.csproj b/src/Core/Banshee.ThickClient/Banshee.ThickClient.csproj
index 6422934..52f9d49 100644
--- a/src/Core/Banshee.ThickClient/Banshee.ThickClient.csproj
+++ b/src/Core/Banshee.ThickClient/Banshee.ThickClient.csproj
@@ -93,7 +93,6 @@
<HintPath>..\..\..bin\Mono.Cairo.dll</HintPath>
</Reference>
<Reference Include="System.Xml" />
- <Reference Include="System.Data" />
<Reference Include="Mono.Addins">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\bin\Mono.Addins.dll</HintPath>
diff --git a/src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3.csproj b/src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3.csproj
index 64b4c2f..6f4ca00 100644
--- a/src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3.csproj
+++ b/src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3.csproj
@@ -44,7 +44,6 @@
<HintPath>..\..\..bin\Mono.Posix.dll</HintPath>
</Reference>
<Reference Include="System.Xml" />
- <Reference Include="System.Data" />
<Reference Include="glib-sharp">
<SpecificVersion>False</SpecificVersion>
<Package>glib-sharp-2.0</Package>
diff --git a/src/Extensions/Banshee.Bpm/Banshee.Bpm.csproj b/src/Extensions/Banshee.Bpm/Banshee.Bpm.csproj
index 24bcd1b..4499a70 100644
--- a/src/Extensions/Banshee.Bpm/Banshee.Bpm.csproj
+++ b/src/Extensions/Banshee.Bpm/Banshee.Bpm.csproj
@@ -78,7 +78,6 @@
<Package>mono-addins</Package>
</Reference>
<Reference Include="System" />
- <Reference Include="System.Data" />
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
diff --git a/src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs b/src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs
index b8cfa52..f6a59e0 100644
--- a/src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs
+++ b/src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs
@@ -27,7 +27,6 @@
//
using System;
-using System.Data;
using Mono.Unix;
diff --git a/src/Extensions/Banshee.CoverArt/Banshee.CoverArt.csproj b/src/Extensions/Banshee.CoverArt/Banshee.CoverArt.csproj
index ea76575..6cdf4fb 100644
--- a/src/Extensions/Banshee.CoverArt/Banshee.CoverArt.csproj
+++ b/src/Extensions/Banshee.CoverArt/Banshee.CoverArt.csproj
@@ -77,7 +77,6 @@
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
- <Reference Include="System.Data" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Banshee.CoverArt.addin.xml">
diff --git a/src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs b/src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs
index d36986b..4791425 100644
--- a/src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs
+++ b/src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs
@@ -28,7 +28,7 @@
//
using System;
-using System.Data;
+
using Gtk;
using Mono.Unix;
diff --git a/src/Extensions/Banshee.Emusic/Banshee.Emusic.csproj b/src/Extensions/Banshee.Emusic/Banshee.Emusic.csproj
index 9aa232b..12e643e 100644
--- a/src/Extensions/Banshee.Emusic/Banshee.Emusic.csproj
+++ b/src/Extensions/Banshee.Emusic/Banshee.Emusic.csproj
@@ -44,7 +44,6 @@
<HintPath>..\..\..bin\Mono.Posix.dll</HintPath>
</Reference>
<Reference Include="System.Xml" />
- <Reference Include="System.Data" />
<Reference Include="glib-sharp">
<SpecificVersion>False</SpecificVersion>
<Package>glib-sharp-2.0</Package>
diff --git a/src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs b/src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs
index 3f1cf60..6752911 100644
--- a/src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs
+++ b/src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs
@@ -27,7 +27,6 @@
//
using System;
-using System.Data;
using System.IO;
using System.Xml;
using System.Collections.Generic;
diff --git a/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.csproj b/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.csproj
index 6ca93a9..bed4bf0 100644
--- a/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.csproj
+++ b/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.csproj
@@ -34,7 +34,6 @@
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
- <Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="atk-sharp">
<SpecificVersion>False</SpecificVersion>
diff --git a/src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming.csproj b/src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming.csproj
index a2559c6..ed3fe8c 100644
--- a/src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming.csproj
+++ b/src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming.csproj
@@ -131,7 +131,6 @@
<SpecificVersion>False</SpecificVersion>
<Package>gtk-sharp-2.0</Package>
</Reference>
- <Reference Include="System.Data" />
<Reference Include="Mono.Posix">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\bin\Mono.Posix.dll</HintPath>
diff --git a/src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs b/src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs
index 270208b..bdec5d4 100644
--- a/src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs
+++ b/src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs
@@ -27,7 +27,6 @@
//
using System;
-using System.Data;
using System.IO;
using System.Text.RegularExpressions;
using System.Collections.Generic;
diff --git a/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher.csproj b/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher.csproj
index cfebb42..c584e2d 100644
--- a/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher.csproj
+++ b/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher.csproj
@@ -54,7 +54,6 @@
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
- <Reference Include="System.Data" />
<Reference Include="Mono.Addins">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\bin\Mono.Addins.dll</HintPath>
diff --git a/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher/SourceWatcher.cs b/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher/SourceWatcher.cs
index ab54090..e36a2cc 100644
--- a/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher/SourceWatcher.cs
+++ b/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher/SourceWatcher.cs
@@ -31,7 +31,6 @@
using System;
using System.IO;
using System.Linq;
-using System.Data;
using System.Threading;
using System.Collections.Generic;
diff --git a/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue.csproj b/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue.csproj
index a0219e2..3ef5f08 100644
--- a/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue.csproj
+++ b/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue.csproj
@@ -91,10 +91,6 @@
<Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
<Name>Hyena.Gui</Name>
</ProjectReference>
- <ProjectReference Include="..\..\Hyena\Mono.Data.Sqlite\Mono.Data.Sqlite.csproj">
- <Project>{BB1D1D81-7A74-4183-B7B1-3E78B32D42F1}</Project>
- <Name>Mono.Data.Sqlite</Name>
- </ProjectReference>
</ItemGroup>
<ItemGroup>
<Reference Include="gtk-sharp">
diff --git a/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration.csproj b/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration.csproj
index 947c402..22441ef 100644
--- a/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration.csproj
+++ b/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration.csproj
@@ -45,7 +45,6 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..bin\Mono.Posix.dll</HintPath>
</Reference>
- <Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="atk-sharp">
<SpecificVersion>False</SpecificVersion>
diff --git a/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs b/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs
index 84c6bda..96aed2d 100644
--- a/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs
+++ b/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs
@@ -28,7 +28,6 @@
//
using System;
-using System.Data;
using System.IO;
using Mono.Unix;
@@ -132,7 +131,7 @@ namespace Banshee.PlayerMigration
created = Convert.ToInt64 (stats_reader[2]);
accessed = Convert.ToInt64 (stats_reader[3]);
}
- stats_reader.Close ();
+ stats_reader.Dispose ();
} catch (Exception) {}
UpdateUserJob (processed, count, artist, title);
@@ -161,7 +160,7 @@ namespace Banshee.PlayerMigration
// something went wrong, skip entry
}
}
- reader.Close ();
+ reader.Dispose ();
import_manager.NotifyAllSources ();
// TODO migrating more than the podcast subscriptions (eg whether to auto sync them etc) means 1) we need to have those features
diff --git a/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs b/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs
index 5d2ee4d..0034c0d 100644
--- a/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs
+++ b/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs
@@ -30,7 +30,6 @@
using System;
using System.Collections.Generic;
-using System.Data;
using System.Globalization;
using System.IO;
using System.Text;
diff --git a/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs b/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs
index 87f5d52..7c842ed 100644
--- a/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs
+++ b/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs
@@ -29,7 +29,6 @@
//
using System;
-using System.Data;
using System.IO;
using System.Xml;
diff --git a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.csproj b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.csproj
index ca0d0cf..bd38fd3 100644
--- a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.csproj
+++ b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.csproj
@@ -101,7 +101,6 @@
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
- <Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="gdk-sharp">
<SpecificVersion>False</SpecificVersion>
diff --git a/src/Hyena b/src/Hyena
index 1154965..2e94a81 160000
--- a/src/Hyena
+++ b/src/Hyena
@@ -1 +1 @@
-Subproject commit 115496594e2709b0abba0b518963b19eabd26eca
+Subproject commit 2e94a81e7547edbbb9fe7c1204c14483413880d7
diff --git a/src/Libraries/Migo/Migo.Syndication/EnclosureManager.cs b/src/Libraries/Migo/Migo.Syndication/EnclosureManager.cs
index 520ad41..16e591f 100644
--- a/src/Libraries/Migo/Migo.Syndication/EnclosureManager.cs
+++ b/src/Libraries/Migo/Migo.Syndication/EnclosureManager.cs
@@ -29,7 +29,6 @@
using System;
using System.IO;
-using System.Data;
using System.Threading;
using System.Collections.Generic;
using System.Collections.ObjectModel;
diff --git a/src/Libraries/Migo/Migo.Syndication/FeedsManager.cs b/src/Libraries/Migo/Migo.Syndication/FeedsManager.cs
index 185773e..7c96cf4 100644
--- a/src/Libraries/Migo/Migo.Syndication/FeedsManager.cs
+++ b/src/Libraries/Migo/Migo.Syndication/FeedsManager.cs
@@ -37,7 +37,6 @@
using System;
using System.IO;
-using System.Data;
using System.Threading;
using System.Collections.Generic;
using System.Collections.ObjectModel;
diff --git a/src/Libraries/Migo/Migo.Syndication/Migo.Syndication.Data/TablesManagers/EnclosuresTableManager.cs b/src/Libraries/Migo/Migo.Syndication/Migo.Syndication.Data/TablesManagers/EnclosuresTableManager.cs
index aedc431..a215d9b 100644
--- a/src/Libraries/Migo/Migo.Syndication/Migo.Syndication.Data/TablesManagers/EnclosuresTableManager.cs
+++ b/src/Libraries/Migo/Migo.Syndication/Migo.Syndication.Data/TablesManagers/EnclosuresTableManager.cs
@@ -27,7 +27,6 @@
*/
using System;
-using System.Data;
using System.Collections;
using System.Collections.Generic;
diff --git a/src/Libraries/Migo/Migo.Syndication/Migo.Syndication.Data/TablesManagers/FeedsTableManager.cs b/src/Libraries/Migo/Migo.Syndication/Migo.Syndication.Data/TablesManagers/FeedsTableManager.cs
index 6a28a3e..e8973bc 100644
--- a/src/Libraries/Migo/Migo.Syndication/Migo.Syndication.Data/TablesManagers/FeedsTableManager.cs
+++ b/src/Libraries/Migo/Migo.Syndication/Migo.Syndication.Data/TablesManagers/FeedsTableManager.cs
@@ -27,8 +27,6 @@
*/
using System;
-using System.Data;
-
using System.Collections;
using System.Collections.Generic;
using System.Collections.ObjectModel;
diff --git a/src/Libraries/Migo/Migo.Syndication/Migo.Syndication.Data/TablesManagers/ItemsTableManager.cs b/src/Libraries/Migo/Migo.Syndication/Migo.Syndication.Data/TablesManagers/ItemsTableManager.cs
index 31dd51e..62f6b49 100644
--- a/src/Libraries/Migo/Migo.Syndication/Migo.Syndication.Data/TablesManagers/ItemsTableManager.cs
+++ b/src/Libraries/Migo/Migo.Syndication/Migo.Syndication.Data/TablesManagers/ItemsTableManager.cs
@@ -27,7 +27,6 @@
*/
using System;
-using System.Data;
using System.Collections;
using System.Collections.Generic;
diff --git a/src/Libraries/Migo/Migo.Syndication/MigoModelProvider.cs b/src/Libraries/Migo/Migo.Syndication/MigoModelProvider.cs
index 7c330f6..e7f5c4d 100644
--- a/src/Libraries/Migo/Migo.Syndication/MigoModelProvider.cs
+++ b/src/Libraries/Migo/Migo.Syndication/MigoModelProvider.cs
@@ -69,7 +69,7 @@ namespace Migo.Syndication
}
}
- public override T Load (System.Data.IDataReader reader)
+ public override T Load (IDataReader reader)
{
return GetCached (PrimaryKeyFor (reader)) ?? CacheResult (base.Load (reader));
}
diff --git a/src/Libraries/Migo/Migo.csproj b/src/Libraries/Migo/Migo.csproj
index 4eb3ec0..036b550 100644
--- a/src/Libraries/Migo/Migo.csproj
+++ b/src/Libraries/Migo/Migo.csproj
@@ -33,7 +33,6 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
- <Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="ICSharpCode.SharpZipLib">
<HintPath>..\..\..\bin\ICSharpCode.SharpZipLib.dll</HintPath>
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 53f8dd6..d6bed8e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -9,6 +9,7 @@ if ENABLE_TESTS
TEST_ASSEMBLIES = \
Hyena.dll \
Hyena.Gui.dll \
+ Hyena.Data.Sqlite.dll \
Migo.dll \
Mono.Media.dll \
Banshee.Core.dll \
diff --git a/tests/Performance/PerformanceTests.cs b/tests/Performance/PerformanceTests.cs
index 488612e..01386be 100644
--- a/tests/Performance/PerformanceTests.cs
+++ b/tests/Performance/PerformanceTests.cs
@@ -27,7 +27,6 @@
//
using System;
-using System.Data;
using System.Threading;
using NUnit.Framework;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]