[banshee/podcast-ng: 89/90] Merge branch 'master' into podcast-ng
- From: Michael C. Urbanski <murbanski src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee/podcast-ng: 89/90] Merge branch 'master' into podcast-ng
- Date: Sun, 9 Jan 2011 07:01:07 +0000 (UTC)
commit 938e28cdd479d421e77ac0a3f8ac252ebadda573
Merge: 87de049 42a9a77
Author: Mike Urbanski <michael c urbanski gmail com>
Date: Sat Jan 8 23:13:44 2011 -0600
Merge branch 'master' into podcast-ng
AUTHORS | 6 +-
Banshee.sln | 26 +
NEWS | 184 +-
banshee.doap | 8 +-
build/build.environment.mk | 4 +
build/m4/banshee/gstreamer.m4 | 9 +-
build/m4/banshee/soundmenu.m4 | 22 +
build/m4/banshee/ubuntuonemusicstore.m4 | 20 +
configure.ac | 18 +-
data/addin-xml-strings.cs | 10 +
extras/create-authors | 2 +-
extras/create-contributors-paragraph | 2 +-
extras/create-release-notes | 2 +-
extras/make-release | 2 +-
extras/metrics.py | 2 +-
extras/metrics/fetch-metrics | 2 +-
help/C/add-radio.page | 2 +-
help/C/amazon.page | 2 +-
help/C/import.page | 2 +-
help/C/introduction.page | 2 +-
help/C/lastfm.page | 6 +-
help/C/manage-playlists.page | 2 +-
help/C/play.page | 2 +-
help/C/search.page | 4 +-
help/C/sort.page | 8 +-
help/C/sync.page | 2 +-
help/C/ui.page | 2 +-
help/Makefile.am | 2 +-
help/ca/ca.po | 676 ++++--
help/da/da.po | 1776 +++++++++++++++
help/de/de.po | 576 +++---
help/fr/fr.po | 79 +-
help/sl/sl.po | 22 +-
libbanshee/banshee-player-pipeline.c | 26 +-
libbanshee/banshee-player-private.h | 1 +
libbanshee/banshee-player-video.c | 37 +-
libbanshee/banshee-player.c | 118 +
libbanshee/libbanshee.sln | 47 +-
po/POTFILES.in | 3 +
po/ca.po | 483 ++---
po/cs.po | 959 +++++----
po/de.po | 1162 +++++-----
po/es.po | 1255 ++++++-----
po/gl.po | 1187 ++++++-----
po/hu.po | 999 +++++----
po/sl.po | 446 +++--
po/sort-potfiles | 2 +-
po/zh_CN.po | 2408 ++++++++++++--------
release-rc | 2 +-
.../Banshee.GStreamer/PlayerEngine.cs | 60 +-
.../Banshee.GStreamerSharp/PlayerEngine.cs | 24 +
src/Core/Banshee.Core/Resources/contributors.xml | 6 +-
src/Core/Banshee.Core/Resources/translators.xml | 1 +
.../Banshee.MediaEngine/NullPlayerEngine.cs | 17 +
.../Banshee.MediaEngine/PlayerEngine.cs | 15 +
.../Banshee.MediaEngine/PlayerEngineService.cs | 18 +
.../Banshee.Metadata/SaveTrackMetadataJob.cs | 2 +-
.../Banshee.SmartPlaylist/SmartPlaylistSource.cs | 5 +-
.../Banshee.Collection.Gui/TrackFilterListView.cs | 2 +-
.../Banshee.Gui.Dialogs/FileChooserDialog.cs | 3 +-
.../Banshee.Gui.TrackEditor/StatisticsPage.cs | 61 +-
.../Banshee.Gui.TrackEditor/TrackEditorDialog.cs | 20 +
.../Banshee.Gui.Widgets/MainMenu.cs | 3 +
.../Banshee.Gui/IconThemeUtils.cs | 18 +
.../Banshee.Gui/PlaybackActions.cs | 19 +-
.../Banshee.Gui/PlaybackSubtitleActions.cs | 220 ++
.../Banshee.Preferences.Gui/PageComboBox.cs | 2 +-
.../Banshee.Sources.Gui/SourceModel.cs | 12 +-
.../Banshee.Sources.Gui/SourceRowRenderer.cs | 6 +-
.../Banshee.ThickClient/Banshee.ThickClient.csproj | 1 +
src/Core/Banshee.ThickClient/Makefile.am | 1 +
.../Resources/core-ui-actions-layout.xml | 2 +
.../Banshee.Dap.AppleDevice/AppleDeviceSource.cs | 49 +-
.../AppleDeviceTrackInfo.cs | 3 +-
.../Banshee.Dap.MassStorage.addin.xml | 2 +-
.../Banshee.LastfmStreaming/StationSource.cs | 2 +-
.../Banshee.LastfmStreaming/StationType.cs | 12 +-
src/Extensions/Banshee.Mpris/Banshee.Mpris.csproj | 2 +
.../Banshee.Mpris/Banshee.Mpris/IPlaylists.cs | 56 +
.../Banshee.Mpris/Banshee.Mpris/MediaPlayer.cs | 165 ++-
.../Banshee.Mpris/Banshee.Mpris/MprisService.cs | 22 +
src/Extensions/Banshee.Mpris/Makefile.am | 1 +
.../X11NotificationArea.cs | 31 +-
.../Banshee.NotificationArea/Makefile.am | 4 +
.../Banshee.NowPlaying/FullscreenWindow.cs | 1 -
.../Banshee.Podcasting.Data/PodcastFeedModel.cs | 2 +-
.../Banshee.Podcasting.Data/PodcastSource.cs | 10 +-
.../Banshee.Podcasting.Gui/PodcastActions.cs | 26 +-
.../Dialog/PodcastFeedPropertiesDialog.cs | 309 ++--
.../Dialog/PodcastSubscribeDialog.cs | 81 +-
.../Banshee.Podcasting/PodcastService.cs | 2 +-
.../Resources/ActiveSourceUI.xml | 3 +
.../Banshee.SoundMenu/Banshee.SoundMenu.addin.xml | 24 +
.../Banshee.SoundMenu/Banshee.SoundMenu.csproj | 94 +
.../Banshee.SoundMenu/SoundMenuService.cs | 432 ++++
src/Extensions/Banshee.SoundMenu/Makefile.am | 21 +
.../Banshee.UbuntuOneMusicStore.addin.xml | 23 +
.../Banshee.UbuntuOneMusicStore.csproj | 95 +
.../Tests/MusicStoreTests.cs | 71 +
.../UbuntuOneMusicStoreSource.cs | 132 ++
.../Banshee.UbuntuOneMusicStore/Makefile.am | 16 +
.../ThemeIcons/16x16/categories/ubuntuone.png | Bin 0 -> 1037 bytes
.../ThemeIcons/22x22/categories/ubuntuone.png | Bin 0 -> 1131 bytes
src/Extensions/Makefile.am | 2 +
src/Hyena | 2 +-
src/Libraries/Migo/Migo.Syndication/Feed.cs | 26 +-
src/Libraries/Migo/Migo.Syndication/FeedItem.cs | 5 +
src/Libraries/Migo/Migo.Syndication/FeedManager.cs | 14 +-
tests/Makefile.am | 4 +
tests/Performance/PerformanceTests.cs | 40 +-
tests/test-a11y | 2 +-
tests/test-perf | 3 +-
112 files changed, 10207 insertions(+), 4719 deletions(-)
---
diff --cc configure.ac
index fbd250d,f2494f1..8b11c89
--- a/configure.ac
+++ b/configure.ac
@@@ -364,8 -366,8 +374,9 @@@ src/Extensions/Banshee.NotificationArea
src/Extensions/Banshee.NowPlaying/Makefile
src/Extensions/Banshee.PlayQueue/Makefile
src/Extensions/Banshee.PlayerMigration/Makefile
+src/Extensions/Banshee.Paas/Makefile
src/Extensions/Banshee.Podcasting/Makefile
+ src/Extensions/Banshee.SoundMenu/Makefile
src/Extensions/Banshee.SqlDebugConsole/Makefile
src/Extensions/Banshee.Sample/Makefile
src/Extensions/Banshee.Torrent/Makefile
@@@ -420,9 -423,10 +432,11 @@@ ${PACKAGE}-${VERSION
HAL Backend: ${enable_hal}
Library Watcher: ${HAVE_MONO_2_4_3} (Mono >= 2.4.3)
Podcasts: ${enable_podcast}
+ Podcast NG: ${enable_podcast_ng}
Gapless playback: ${ENABLE_GAPLESS} (gstreamer-plugins-base > 0.10.25.2)
YouTube extension: ${enable_youtube} (gdata-sharp >= 1.4)
+ Sound menu: ${enable_soundmenu} (indicate-sharp >= 0.4.1)
+ Ubuntu One Store: ${enable_ubuntuone} (ubuntuone-sharp)
Build/Development:
Unit Tests: ${do_tests} (nunit >= ${NUNIT_REQUIRED})
diff --cc src/Core/Banshee.ThickClient/Banshee.ThickClient.csproj
index bb39bcf,134527b..d422360
--- a/src/Core/Banshee.ThickClient/Banshee.ThickClient.csproj
+++ b/src/Core/Banshee.ThickClient/Banshee.ThickClient.csproj
@@@ -315,8 -315,8 +315,9 @@@
<Compile Include="Banshee.Collection.Gui\SearchableListView.cs" />
<Compile Include="Banshee.Gui.Widgets\CoverArtDisplay.cs" />
<Compile Include="Banshee.CairoGlyphs\BansheeLineLogo.cs" />
+ <Compile Include="Banshee.Sources.Gui\IImplementsCustomSearch.cs" />
<Compile Include="Banshee.Gui\IGlobalUIActions.cs" />
+ <Compile Include="Banshee.Gui\PlaybackSubtitleActions.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ProjectExtensions>
diff --cc src/Extensions/Makefile.am
index 27feb67,d0c1509..f588ef0
--- a/src/Extensions/Makefile.am
+++ b/src/Extensions/Makefile.am
@@@ -24,9 -24,9 +24,10 @@@ SUBDIRS =
Banshee.PlayerMigration \
Banshee.PlayQueue \
Banshee.MeeGo \
+ Banshee.Paas \
Banshee.Podcasting \
Banshee.Sample \
+ Banshee.SoundMenu \
Banshee.SqlDebugConsole \
Banshee.Torrent \
Banshee.RemoteAudio \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
