[banshee/source-contents: 138/141] Merge branch 'master' into source-contents
- From: Gabriel Burt <gburt src gnome org>
- To: svn-commits-list gnome org
- Subject: [banshee/source-contents: 138/141] Merge branch 'master' into source-contents
- Date: Wed, 17 Jun 2009 19:58:21 -0400 (EDT)
commit 170abc5c595fa607d5cbdad99e0653c20f88f1d5
Merge: cdf8480... 57dac8b...
Author: Gabriel Burt <gabriel burt gmail com>
Date: Wed Jun 17 17:50:03 2009 -0500
Merge branch 'master' into source-contents
Conflicts:
src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs
.gitignore | 4 +
Banshee.sln | 693 +-
Makefile.am | 21 +-
NEWS | 177 +-
autogen.sh | 2 +-
banshee.doap | 34 +
build/build.environment.mk | 9 +-
build/build.rules.mk | 21 +-
build/create-contributors-paragraph | 31 +
build/m4/Makefile.am | 6 +-
build/m4/banshee/gstreamer.m4 | 7 +
build/m4/banshee/libbanshee.m4 | 4 +-
build/m4/shamrock/i18n.m4 | 2 +-
build/m4/shave/shave-libtool.in | 109 +
build/m4/shave/shave.in | 109 +
build/m4/shave/shave.m4 | 102 +
build/osx/release.sh | 4 +-
build/osx/targets/bundle-00-base-libs.targets | 5 +-
build/osx/targets/bundle-10-xiph-libs.targets | 4 +-
build/osx/targets/bundle-30-gstreamer.targets | 12 +-
configure.ac | 72 +-
data/audio-profiles/mp3-lame.xml.in | 28 +-
data/banshee.ico | Bin 0 -> 167206 bytes
ChangeLog => extras/YeOldeChangeLog | 11 +
extras/make-release | 158 +
extras/perf-analyze-log | 18 +
gstreamer/Makefile.am | 2 +
libbanshee/Makefile.am | 24 +-
libbanshee/banshee-gst.c | 13 +-
libbanshee/banshee-gst.h | 18 +
libbanshee/banshee-player-equalizer.c | 3 +
libbanshee/banshee-player-pipeline.c | 31 +-
libbanshee/banshee-player-private.h | 33 +-
libbanshee/banshee-player-video.c | 88 +-
libbanshee/banshee-player.c | 13 +-
libbanshee/banshee-transcoder.c | 1 -
libbanshee/clutter-gst-video-sink.c | 988 ++-
libbanshee/libbanshee.sln | 20 +
libbanshee/libbanshee.vcproj | 300 +
libbanshee/nautilus-burn.c | 128 -
libbanshee/shaders/I420.h | 36 +
libbanshee/shaders/YV12.h | 36 +
po/POTFILES.in | 14 +-
po/POTFILES.skip | 1 +
po/ca.po | 587 +-
po/de.po | 377 +-
po/es.po | 427 +-
po/fr.po | 6 +-
po/gl.po | 2264 +++---
po/hu.po | 723 +-
po/pa.po | 9120 +++++++++++++-------
po/pl.po | 2792 +++----
po/pt.po | 1120 ++-
po/sv.po | 426 +-
.../Banshee.GStreamer/Banshee.GStreamer.csproj | 20 +-
.../Banshee.GStreamer/Banshee.GStreamer.dll.config | 4 +
.../Banshee.GStreamer/AudioCdRipper.cs | 14 +-
.../Banshee.GStreamer/BpmDetector.cs | 20 +-
.../Banshee.GStreamer/PlayerEngine.cs | 175 +-
.../Banshee.GStreamer/Banshee.GStreamer/Service.cs | 32 +-
.../Banshee.GStreamer/Banshee.GStreamer/TagList.cs | 8 +-
.../Banshee.GStreamer/Transcoder.cs | 16 +-
src/Backends/Banshee.GStreamer/Makefile.am | 2 +
src/Backends/Banshee.Gnome/Banshee.Gnome.addin.xml | 2 +-
src/Backends/Banshee.Gnome/Banshee.Gnome.csproj | 21 +-
.../GConfConfigurationClient.cs | 26 +-
.../GnomeScreensaverManager.cs | 3 +-
src/Backends/Banshee.Hal/Banshee.Hal.csproj | 21 +-
.../Banshee.NowPlaying.X11.csproj | 21 +-
src/Backends/Banshee.Unix/Banshee.Unix.csproj | 21 +-
src/Clients/Beroe/Beroe.csproj | 25 +-
src/Clients/Beroe/Beroe/IndexerClient.cs | 2 +
src/Clients/Booter/Booter.csproj | 30 +-
src/Clients/Booter/Booter/Entry.cs | 1 +
src/Clients/Booter/banshee-1.in | 10 +-
src/Clients/Halie/Halie.csproj | 27 +-
src/Clients/Muinshee/Muinshee.csproj | 45 +-
.../Muinshee/Muinshee/MuinsheeTrackInfoDisplay.cs | 2 +-
src/Clients/Nereid/Nereid.csproj | 53 +-
.../IndexerClient.cs | 9 +-
.../Banshee.CollectionIndexer.csproj | 20 +-
.../Banshee.Core/Banshee.Base/PlatformHacks.cs | 7 +
.../Banshee.Base/Tests/TaglibReadWriteTests.cs | 107 +-
src/Core/Banshee.Core/Banshee.Core.csproj | 58 +-
.../Banshee.Core/Banshee.IO.SystemIO/DemuxVfs.cs | 2 +-
.../Banshee.Core/Banshee.Streaming/StreamTagger.cs | 53 +-
src/Core/Banshee.Core/Resources/contributors.xml | 32 +-
src/Core/Banshee.Core/Resources/translators.xml | 5 +-
.../DatabaseFilterListModel.cs | 2 +-
.../DatabaseImportManager.cs | 5 +-
.../DatabaseTrackInfo.cs | 5 +-
.../DatabaseTrackListModel.cs | 212 +-
.../Banshee.Collection/MemoryTrackListModel.cs | 2 +-
.../Banshee.Collection/TrackListModel.cs | 2 +-
.../DatabaseConfigurationClient.cs | 2 +-
.../Banshee.Database/BansheeDbConnection.cs | 2 +-
.../Banshee.Database/BansheeDbFormatMigrator.cs | 56 +-
.../Banshee.Hardware/VendorProductInfo.cs | 3 +-
.../Banshee.Library/ThreadPoolImportSource.cs | 2 +-
.../Banshee.MediaEngine/IBpmDetector.cs | 16 +-
.../Banshee.MediaEngine/ISupportClutter.cs} | 35 +-
.../Banshee.MediaEngine/PlayerEngine.cs | 12 +-
.../Banshee.MediaEngine/PlayerEngineService.cs | 39 +-
.../Banshee.MediaEngine/VideoDisplayContextType.cs | 2 +-
.../Banshee.MediaProfiles/MediaProfileManager.cs | 50 +-
.../IScreensaverManager.cs | 2 +-
.../ScreensaverManager.cs | 4 +-
.../PlaybackControllerService.cs | 12 +-
.../PlaybackShuffleMode.cs | 3 +-
.../Banshee.Playlist/PlaylistSource.cs | 3 +
.../Banshee.Playlists.Formats/PlaylistParser.cs | 14 +-
.../Banshee.ServiceStack/DBusConnection.cs | 14 +-
.../Banshee.ServiceStack/TestUserJob.cs | 2 +-
.../Banshee.Services/Banshee.Services.addin.xml | 4 +
src/Core/Banshee.Services/Banshee.Services.csproj | 63 +-
.../Banshee.SmartPlaylist/SmartPlaylistSource.cs | 3 +-
.../Banshee.Sources/DatabaseSource.cs | 8 +
.../Banshee.Sources/ITrackModelSource.cs | 5 +-
.../Banshee.Sources/PrimarySource.cs | 4 +-
.../Banshee.Sources/SourceSortType.cs | 7 +-
src/Core/Banshee.Services/Makefile.am | 3 +
.../Banshee.Collection.Gui/ArtworkManager.cs | 4 +-
.../Banshee.Collection.Gui/ArtworkRenderer.cs | 4 +-
.../Banshee.Collection.Gui/ColumnCellAlbum.cs | 2 +-
.../ColumnCellStatusIndicator.cs | 2 +-
.../Banshee.ContextPane/ContextPageManager.cs | 2 +-
.../EqualizerPresetComboBox.cs | 8 +-
.../Banshee.Gui.TrackEditor/TrackEditorDialog.cs | 3 +-
.../Banshee.Gui.Widgets/LargeTrackInfoDisplay.cs | 2 +-
.../Banshee.Gui.Widgets/TaskStatusIcon.cs | 75 +-
.../Banshee.Gui.Widgets/TrackInfoDisplay.cs | 23 +-
.../Banshee.Gui/GtkBaseClient.cs | 20 +-
.../Banshee.Gui/PlaybackRepeatActions.cs | 21 +-
.../Banshee.Gui/PlaybackShuffleActions.cs | 34 +-
.../FilteredListSourceContents.cs | 5 +-
.../Banshee.ThickClient.addin.xml | 3 +-
.../Banshee.ThickClient/Banshee.ThickClient.csproj | 65 +-
src/Core/Banshee.Widgets/Banshee.Widgets.csproj | 22 +-
.../Banshee.Widgets/Banshee.Widgets/SearchEntry.cs | 9 +
src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod.csproj | 21 +-
.../Banshee.Dap.Ipod/IpodSource.cs | 2 +-
.../Banshee.Dap.MassStorage.csproj | 21 +-
src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp.csproj | 21 +-
src/Dap/Banshee.Dap/Banshee.Dap.csproj | 21 +-
src/Dap/Banshee.Dap/Banshee.Dap/DapLibrarySync.cs | 2 +
.../Banshee.AudioCd/Banshee.AudioCd.csproj | 33 +-
.../Banshee.AudioCd/AudioCdDiscModel.cs | 175 +-
.../Banshee.AudioCd/AudioCdSource.cs | 10 +-
.../Banshee.BooScript/Banshee.BooScript.csproj | 21 +-
.../Banshee.Bookmarks/Banshee.Bookmarks.csproj | 36 +-
src/Extensions/Banshee.Bpm/Banshee.Bpm.csproj | 21 +-
.../Banshee.Bpm/Banshee.Bpm/BpmDetectJob.cs | 6 +-
src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs | 8 +-
.../Banshee.CoverArt/Banshee.CoverArt.csproj | 30 +-
src/Extensions/Banshee.Daap/Banshee.Daap.csproj | 21 +-
.../Banshee.FileSystemQueue.csproj | 33 +-
.../Banshee.InternetRadio.csproj | 45 +-
.../AudioscrobblerService.cs | 12 +-
.../Banshee.Lastfm.Radio/LastfmActions.cs | 33 +-
.../Banshee.Lastfm.Radio/LastfmSourceContents.cs | 3 +-
.../Banshee.Lastfm.Radio/StationSource.cs | 10 +-
.../Banshee.Lastfm/Banshee.Lastfm.addin.xml | 2 +-
.../Banshee.Lastfm/Banshee.Lastfm.csproj | 35 +-
.../Banshee.MediaWeb/Banshee.MediaWeb.csproj | 8 +-
.../Banshee.MiniMode/Banshee.MiniMode.csproj | 44 +-
.../Banshee.MiniMode/MiniModeWindow.cs | 38 +-
.../Banshee.MultimediaKeys.csproj | 34 +-
.../Banshee.NotificationArea.csproj | 28 +-
.../GtkNotificationAreaBox.cs | 11 +
.../INotificationAreaBox.cs | 3 +
.../NotificationAreaService.cs | 135 +-
.../X11NotificationAreaBox.cs | 36 +-
.../Notifications/Notification.cs | 97 +-
.../Notifications/Notifications.cs | 65 +-
.../Banshee.NowPlaying.Clutter.addin.xml | 23 -
.../Banshee.NowPlaying.Clutter.csproj | 95 -
.../Banshee.NowPlaying.Clutter.dll.config | 5 -
.../NowPlayingInterface.cs | 210 -
.../Banshee.NowPlaying.Clutter/NowPlayingSource.cs | 125 -
.../Clutter.Gtk/Embed.cs | 65 -
.../Banshee.NowPlaying.Clutter/Clutter/Actor.cs | 113 -
.../Banshee.NowPlaying.Clutter/Clutter/Color.cs | 99 -
.../Banshee.NowPlaying.Clutter/Clutter/Stage.cs | 84 -
.../Banshee.NowPlaying.Clutter/Clutter/Texture.cs | 71 -
.../Banshee.NowPlaying.Clutter/Makefile.am | 26 -
.../Banshee.NowPlaying.addin.xml | 4 -
.../Banshee.NowPlaying/Banshee.NowPlaying.csproj | 28 +-
.../Banshee.NowPlaying/NowPlayingInterface.cs | 1 +
.../Banshee.NowPlaying/NowPlayingSource.cs | 5 +-
src/Extensions/Banshee.NowPlaying/Makefile.am | 2 -
.../Banshee.PlayQueue/Banshee.PlayQueue.csproj | 39 +-
.../Banshee.PlayQueue/PlayQueueSource.cs | 12 +-
.../RhythmboxPlayerImportSource.cs | 33 +-
.../Banshee.Podcasting.Gui/ColumnCellPodcast.cs | 2 +-
.../Dialog/PodcastSubscribeDialog.cs | 4 +-
.../Banshee.Podcasting/Banshee.Podcasting.csproj | 40 +-
.../Banshee.Sample/Banshee.Sample.csproj | 21 +-
.../Banshee.SqlDebugConsole.csproj | 21 +-
.../Banshee.Torrent/Banshee.Torrent.csproj | 10 +-
.../Banshee.Wikipedia/Banshee.Wikipedia.addin.xml | 2 +-
src/Extensions/Makefile.am | 2 -
.../Hyena.Gui/Hyena.Data.Gui/ColumnCellText.cs | 20 +-
.../Hyena.Data.Gui/ListView/ListView_Rendering.cs | 2 +-
.../Hyena.Gui/Hyena.Gui.Theming/GtkTheme.cs | 14 +-
.../Hyena.Gui/Hyena.Gui.Theming/ThemeEngine.cs | 47 +
src/Libraries/Hyena.Gui/Hyena.Gui.csproj | 34 +-
.../Hyena.Gui/Hyena.Gui/PixbufImageSurface.cs | 18 +
.../Hyena.Gui/Hyena.Query.Gui/QueryTermsBox.cs | 83 +-
.../Hyena.Gui/Hyena.Widgets/MessageBar.cs | 2 +-
.../Hyena.Gui/Hyena.Widgets/RoundedFrame.cs | 2 +-
src/Libraries/Hyena.Gui/Makefile.am | 1 +
.../Hyena/Hyena.Collections/RangeCollection.cs | 4 +-
src/Libraries/Hyena/Hyena.Query/DateQueryValue.cs | 8 +-
src/Libraries/Hyena/Hyena.csproj | 52 +-
src/Libraries/Lastfm.Gui/Lastfm.Gui.csproj | 23 +-
src/Libraries/Lastfm/Lastfm.Data/LastfmData.cs | 6 +-
src/Libraries/Lastfm/Lastfm.csproj | 23 +-
src/Libraries/Lastfm/Lastfm/Account.cs | 6 +
.../Lastfm/Lastfm/AudioscrobblerConnection.cs | 9 +-
src/Libraries/Migo/Migo.Net/AsyncWebClient.cs | 14 +-
src/Libraries/Migo/Migo.csproj | 32 +-
src/Libraries/Mono.Data.Sqlite/Makefile.am | 6 +-
.../Mono.Data.Sqlite/Mono.Data.Sqlite.csproj | 87 +
src/Libraries/Mono.Media/Mono.Media.csproj | 20 +-
src/Libraries/Mtp/Mtp.csproj | 20 +-
src/Libraries/MusicBrainz/MusicBrainz.csproj | 21 +-
.../MusicBrainz/MusicBrainz/MusicBrainzObject.cs | 5 +-
tests/Analyzer/Makefile.am | 2 +
tests/Makefile.am | 4 +
229 files changed, 15409 insertions(+), 10449 deletions(-)
---
diff --cc src/Core/Banshee.ThickClient/Banshee.ThickClient.addin.xml
index 59b6623,daabd16..9fc8bb6
--- a/src/Core/Banshee.ThickClient/Banshee.ThickClient.addin.xml
+++ b/src/Core/Banshee.ThickClient/Banshee.ThickClient.addin.xml
@@@ -41,12 -37,12 +42,12 @@@
<ExtensionNode name="ActionGroup"/>
</ExtensionPoint>
- <ExtensionPoint path="/Banshee/ThickClient/SourceView">
+ <ExtensionPoint path="/Banshee/ThickClient/SourceContentProvider">
<Description>Defines a new GTK+ source view, possibly in conjunction with a Source extension.</Description>
- <ExtensionNode name="SourceView"/>
+ <ExtensionNode name="Provider"/>
</ExtensionPoint>
- <ExtensionPoint path="/Banshee/ThickClient/ContextPage">
+ <ExtensionPoint path="/Banshee/ThickClient/ContextPane">
<Description>Defines a new GTK+ context page, for showing contextual information beneath the main track source view.</Description>
<ExtensionNode name="ContextPage"/>
</ExtensionPoint>
diff --cc src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs
index b6c15c2,e34ddfe..83779b3
--- a/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs
+++ b/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs
@@@ -46,13 -46,12 +46,10 @@@ namespace Banshee.NowPlayin
public NowPlayingSource () : base ("now-playing", Catalog.GetString ("Now Playing"), 10, "now-playing")
{
- if (Banshee.ServiceStack.ServiceManager.PlayerEngine.VideoDisplayContextType !=
- Banshee.MediaEngine.VideoDisplayContextType.GdkWindow) {
- throw new ApplicationException ("Unsupported video display context");
- }
+ now_playing_interface = new NowPlayingInterface ();
Properties.SetString ("Icon.Name", "applications-multimedia");
- Properties.Set<ISourceContents> ("Nereid.SourceContents", now_playing_interface);
- Properties.Set<bool> ("Nereid.SourceContents.HeaderVisible", false);
+ //Properties.Set<bool> ("Nereid.SourceContents.HeaderVisible", false);
Properties.SetString ("ActiveSourceUIResource", "ActiveSourceUI.xml");
ServiceManager.SourceManager.AddSource (this);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
