[banshee/gtk3: 153/153] Merge branch 'master' into gtk3
- From: Bertrand Lorentz <blorentz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee/gtk3: 153/153] Merge branch 'master' into gtk3
- Date: Sat, 12 Nov 2011 18:41:13 +0000 (UTC)
commit db8b8b75bc1a29d217d8031c86fec6468be030ad
Merge: f5ca2af d52c63e
Author: Bertrand Lorentz <bertrand lorentz gmail com>
Date: Sat Nov 12 18:55:16 2011 +0100
Merge branch 'master' into gtk3
Conflicts:
build/build.environment.mk
build/m4/banshee/gio.m4
configure.ac
src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs
src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingContents.cs
src/Hyena
AUTHORS | 4 +
Banshee.sln | 21 +-
NEWS | 100 +-
README | 4 +-
autogen.sh | 2 +-
banshee.doap | 20 +-
build/build.environment.mk | 2 +-
build/m4/banshee/mono-addins.m4 | 4 +-
build/windows/Installer.wixproj | 2 +-
build/windows/InstallerDefinition.wxs | 4 +-
configure.ac | 12 +-
data/addin-xml-strings.cs | 10 +-
extras/create-release-notes | 16 +-
extras/make-release | 6 +-
help/hu/hu.po | 44 +-
libbanshee/Makefile.am | 2 +
libbanshee/banshee-player-dvd.c | 312 ++
libbanshee/banshee-player-dvd.h | 39 +
libbanshee/banshee-player-pipeline.c | 4 +
libbanshee/banshee-player-private.h | 6 +
libbanshee/banshee-player-vis.c | 10 +-
libbanshee/banshee-player.c | 7 +
libbanshee/banshee-transcoder.c | 8 +-
libbanshee/libbanshee.cproj | 3 +-
po/POTFILES.in | 15 +-
po/cs.po | 1093 +++---
po/da.po | 715 ++--
po/de.po | 1131 +++---
po/es.po | 1061 +++---
po/gl.po | 416 ++-
po/hu.po | 426 +--
po/it.po | 896 +++---
po/ja.po | 562 ++--
po/ko.po | 722 ++--
po/lv.po | 772 ++--
po/pl.po | 4033 ++++++++++++--------
po/ru.po | 1439 ++++----
po/sl.po | 1459 +++-----
po/sv.po | 745 ++--
po/tr.po | 3863 ++++++++++++--------
po/zh_HK.po | 369 +-
po/zh_TW.po | 369 +-
profile-configure | 2 +-
.../Banshee.GStreamer/PlayerEngine.cs | 104 +-
.../Banshee.GStreamerSharp.csproj | 1 +
.../Banshee.GStreamerSharp/DvdManager.cs | 293 ++
.../Banshee.GStreamerSharp/PlayerEngine.cs | 78 +-
.../Banshee.GStreamerSharp/Transcoder.cs | 8 +-
.../Banshee.GStreamerSharp/Visualization.cs | 47 +-
src/Backends/Banshee.GStreamerSharp/Makefile.am | 1 +
.../Banshee.Gio/Banshee.Hardware.Gio/DiscVolume.cs | 20 +
.../LowLevel/GioVolumeMetadataSource.cs | 14 +
.../Banshee.Gio/Banshee.IO.Gio/Directory.cs | 4 +-
.../GConfConfigurationClient.cs | 8 +-
src/Clients/Muinshee/Muinshee/AlbumDialog.cs | 9 +-
src/Clients/Muinshee/Muinshee/BaseDialog.cs | 43 +-
src/Clients/Muinshee/Muinshee/MuinsheeActions.cs | 7 +-
src/Clients/Muinshee/Resources/GlobalUI.xml | 1 +
src/Clients/Nereid/Nereid/PlayerInterface.cs | 2 +-
.../Banshee.Core/Banshee.Collection/YearInfo.cs} | 52 +-
src/Core/Banshee.Core/Banshee.Core.csproj | 1 +
.../Banshee.Streaming/StreamRatingTagger.cs | 105 +-
.../Banshee.Core/Banshee.Streaming/StreamTagger.cs | 9 +-
src/Core/Banshee.Core/Makefile.am | 1 +
src/Core/Banshee.Core/Resources/contributors.xml | 4 +
src/Core/Banshee.Core/Resources/translators.xml | 9 +-
.../Banshee.Collection.Database/Bookmark.cs | 2 +-
.../DatabaseAlbumArtistInfo.cs | 86 +
.../DatabaseAlbumArtistListModel.cs | 79 +
.../DatabaseImportManager.cs | 2 +-
.../DatabaseTrackInfo.cs | 12 +-
.../DatabaseTrackListModel.cs | 10 +-
.../DatabaseYearInfo.cs} | 58 +-
.../DatabaseYearListModel.cs | 69 +
.../Banshee.Collection.Database/RandomByAlbum.cs | 15 +-
.../Banshee.Collection.Database/RandomByArtist.cs | 17 +-
.../Banshee.Collection.Database/RandomByRating.cs | 5 +-
.../Banshee.Collection.Database/RandomByScore.cs | 6 +-
.../Banshee.Collection.Database/RandomByTrack.cs | 2 +-
.../Banshee.Collection/RescanPipeline.cs | 7 +-
.../Banshee.Database/BansheeDbFormatMigrator.cs | 36 +-
.../Banshee.Equalizer/EqualizerManager.cs | 4 +-
.../Banshee.Hardware/IDiscVolume.cs | 1 +
.../Banshee.Library/LibrarySchema.cs | 11 +-
.../Banshee.MediaEngine/NullPlayerEngine.cs | 49 +
.../Banshee.MediaEngine/PlayerEngine.cs | 20 +
.../Banshee.MediaEngine/PlayerEngineService.cs | 68 +
.../Banshee.Metadata.LastFM/LastFMQueryJob.cs | 2 +-
.../Banshee.Metadata/SaveTrackMetadataJob.cs | 7 +-
.../Banshee.Metadata/SaveTrackMetadataService.cs | 28 +-
.../Banshee.Metadata/Tests/TaglibReadWriteTests.cs | 2 +-
.../PlaylistFormatBase.cs | 3 +
.../Banshee.Preferences/PreferenceService.cs | 3 +-
.../Banshee.Services/Banshee.Query/BansheeQuery.cs | 247 +-
.../Banshee.Query/Tests/BansheeQueryTests.cs | 1751 +++++++++
src/Core/Banshee.Services/Banshee.Services.csproj | 8 +
.../Banshee.Sources/DatabaseSource.cs | 8 +-
src/Core/Banshee.Services/Makefile.am | 5 +
.../Banshee.Collection.Gui/BaseTrackListView.cs | 4 +
.../Banshee.Collection.Gui/SearchableListView.cs | 8 +
.../Banshee.Collection.Gui/TrackListView.cs | 4 +
.../Banshee.Collection.Gui/YearListView.cs | 49 +
.../Banshee.Gui.TrackEditor/RatingEntry.cs | 4 +
.../Banshee.Gui.Widgets/ConnectedMessageBar.cs | 4 +
.../Banshee.Gui.Widgets/TaskStatusIcon.cs | 4 +
.../Banshee.Gui/GtkBaseClient.cs | 4 +
.../Banshee.Gui/TrackActions.cs | 12 +-
.../CompositeTrackSourceContents.cs | 209 +-
.../FilteredListSourceContents.cs | 24 +-
.../Banshee.Sources.Gui/SourceRowRenderer.cs | 4 +
.../Banshee.ThickClient/Banshee.ThickClient.csproj | 1 +
src/Core/Banshee.ThickClient/Makefile.am | 1 +
.../Banshee.Widgets/StreamPositionLabel.cs | 4 +
.../Banshee.Dap.MassStorage.addin.xml | 4 +-
.../AmazonMp3GroupSource.cs | 2 +-
.../Banshee.Dap.MassStorage/MassStorageSource.cs | 5 +-
.../Banshee.Dap.MassStorage/WebOSDevice.cs | 2 +-
src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs | 33 +
src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs | 35 +-
.../Banshee.AmazonMp3/Banshee.AmazonMp3.csproj | 2 +
.../Banshee.AmazonMp3/AmzXspfPlaylist.cs | 24 +-
.../Banshee.AmazonMp3/Tests/AmzXspfPlaylistTest.cs | 84 +
src/Extensions/Banshee.AmazonMp3/Makefile.am | 3 +-
.../Banshee.AudioCd/AudioCdService.cs | 384 --
src/Extensions/Banshee.AudioCd/Makefile.am | 20 -
.../Banshee.Audiobook/AudiobookGrid.cs | 4 +
.../Banshee.Audiobook/AudiobookLibrarySource.cs | 4 +-
.../Banshee.CoverArt/CoverArtJob.cs | 5 +-
.../Banshee.CoverArt/CoverArtService.cs | 13 +-
.../Banshee.Daap/Banshee.Daap/DaapErrorView.cs | 4 +-
src/Extensions/Banshee.Daap/Daap/ServiceLocator.cs | 11 +-
.../Banshee.LibraryWatcher/SourceWatcher.cs | 6 +-
.../NotificationAreaService.cs | 11 +-
.../Notifications/Notification.cs | 8 +-
.../Banshee.NowPlaying/FullscreenWindow.cs | 46 +-
.../Banshee.NowPlaying/NowPlayingContents.cs | 128 +-
.../Banshee.NowPlaying/NowPlayingInterface.cs | 13 +-
.../Banshee.NowPlaying/NowPlayingSource.cs | 2 +-
.../AudioCdDiscModel.cs | 44 +-
.../AudioCdDuplicator.cs | 2 +-
.../Banshee.OpticalDisc.AudioCd}/AudioCdRipper.cs | 18 +-
.../Banshee.OpticalDisc.AudioCd/AudioCdService.cs | 267 ++
.../Banshee.OpticalDisc.AudioCd}/AudioCdSource.cs | 226 +-
.../AudioCdTrackInfo.cs | 15 +-
.../Banshee.OpticalDisc.Dvd/DvdModel.cs | 48 +
.../Banshee.OpticalDisc.Dvd/DvdService.cs | 132 +
.../Banshee.OpticalDisc.Dvd/DvdSource.cs | 101 +
.../Banshee.OpticalDisc.Dvd/DvdTrackInfo.cs | 49 +
.../Banshee.OpticalDisc.addin.xml} | 9 +-
.../Banshee.OpticalDisc.csproj} | 48 +-
.../Banshee.OpticalDisc/DiscModel.cs | 77 +
.../Banshee.OpticalDisc/DiscService.cs | 218 ++
.../Banshee.OpticalDisc/DiscSource.cs | 199 +
.../Banshee.OpticalDisc/DiscTrackInfo.cs | 44 +
src/Extensions/Banshee.OpticalDisc/Makefile.am | 29 +
.../Resources/ActiveSourceUI.xml | 0
.../Resources/GlobalUI.xml | 0
.../Resources/GlobalUI_Dvd.xml} | 5 +-
.../16x16/actions/media-import-audio-cd.png | Bin 867 -> 867 bytes
.../22x22/actions/media-import-audio-cd.png | Bin 1480 -> 1480 bytes
.../Banshee.Podcasting.Data/PodcastSource.cs | 4 +-
.../PodcastTrackListModel.cs | 19 +-
.../Banshee.Podcasting/PodcastService.cs | 6 +
.../UbuntuOneMusicStoreSource.cs | 38 +-
.../Banshee.YouTube.Data/DataFetch.cs | 1 +
.../Banshee.YouTube.Gui/YouTubeTile.cs | 9 +-
src/Extensions/Makefile.am | 2 +-
src/Hyena | 2 +-
.../Migo/Migo.Syndication/FeedEnclosure.cs | 49 +-
src/Libraries/Migo/Migo.Syndication/RssParser.cs | 3 +
tests/Makefile.am | 1 +
tests/data/amz/clear.amz | 83 +
tests/data/amz/decrypted.amz | 295 ++
tests/data/amz/encrypted.amz | 455 +++
174 files changed, 17486 insertions(+), 10375 deletions(-)
---
diff --cc build/build.environment.mk
index fb2cb14,9ccfa9c..28afb26
--- a/build/build.environment.mk
+++ b/build/build.environment.mk
@@@ -143,7 -143,7 +142,8 @@@ REF_EXTENSION_MPRIS = $(LINK_BANSHEE_TH
REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+LINK_EXTENSION_NOTIFICATIONAREA = -r:$(DIR_BIN)/Banshee.NotificationArea.dll
+ REF_EXTENSION_OPTICALDISC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
diff --cc po/POTFILES.in
index 040b986,ad264d2..badebe0
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@@ -269,8 -267,16 +267,15 @@@ src/Extensions/Banshee.MiroGuide/Banshe
src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys.addin.xml
src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.addin.xml
src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs
-src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationAreaBox.cs
src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying.addin.xml
src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs
+ src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs
+ src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdRipper.cs
+ src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs
+ src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs
+ src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc/DiscSource.cs
+ src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.Dvd/DvdService.cs
+ src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.Dvd/DvdSource.cs
src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration.addin.xml
src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs
src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs
diff --cc src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingContents.cs
index ff716e6,0b89c4a..0a1000e
--- a/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingContents.cs
+++ b/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingContents.cs
@@@ -91,20 -110,23 +110,25 @@@ namespace Banshee.NowPlayin
CheckIdle ();
}
- public override void Dispose ()
+ protected override void Dispose (bool disposing)
{
- video_event.ButtonPressEvent -= OnButtonPress;
- video_event.ButtonReleaseEvent -= OnButtonRelease;
- video_event.MotionNotifyEvent -= OnMouseMove;
- video_event.KeyPressEvent -= OnKeyPress;
+ if (disposing) {
++ video_event.ButtonPressEvent -= OnButtonPress;
++ video_event.ButtonReleaseEvent -= OnButtonRelease;
++ video_event.MotionNotifyEvent -= OnMouseMove;
++ video_event.KeyPressEvent -= OnKeyPress;
+
- IVideoDisplay ivideo_display = video_display as IVideoDisplay;
- if (ivideo_display != null) {
- ivideo_display.IdleStateChanged -= OnVideoDisplayIdleStateChanged;
- }
+ IVideoDisplay ivideo_display = video_display as IVideoDisplay;
+ if (ivideo_display != null) {
+ ivideo_display.IdleStateChanged -= OnVideoDisplayIdleStateChanged;
+ }
- if (video_display != null) {
- video_display = null;
+ if (video_display != null) {
+ video_display = null;
+ }
}
- base.Dispose ();
+ base.Dispose (disposing);
}
protected override void OnShown ()
diff --cc src/Hyena
index 5efb54b,2273ff3..6ae1a8a
--- a/src/Hyena
+++ b/src/Hyena
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 5efb54b661583708ba1a55ce74727141dada7943
-Subproject commit 2273ff3c52a75388e7e8aa8034d03e1bec1ec002
++Subproject commit 6ae1a8a8762a07a7af22c51984370ea4eb9e5c20
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
