[banshee] [build] distcheck passes again
- From: Aaron Bockover <abock src gnome org>
- To: svn-commits-list gnome org
- Subject: [banshee] [build] distcheck passes again
- Date: Fri, 22 May 2009 20:34:05 -0400 (EDT)
commit 386f561703f4e6303b7aedf89e23dbd6151ee9ae
Author: Aaron Bockover <abockover novell com>
Date: Fri May 22 20:31:54 2009 -0400
[build] distcheck passes again
Fixed up small distcheck issues and removed the Clutter NowPlaying source as
this version was very outdated and doesn't work anymore. The new Clutter work
will be migrated to Banshee proper from Cubano in due time.
---
configure.ac | 1 -
po/POTFILES.in | 1 -
.../Banshee.NowPlaying.Clutter.addin.xml | 23 ---
.../Banshee.NowPlaying.Clutter.csproj | 102 ----------
.../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/Group.cs | 60 ------
.../Banshee.NowPlaying.Clutter/Clutter/Stage.cs | 84 --------
.../Banshee.NowPlaying.Clutter/Clutter/Texture.cs | 71 -------
.../Banshee.NowPlaying.Clutter/Makefile.am | 26 ---
src/Extensions/Makefile.am | 1 -
tests/Analyzer/Makefile.am | 2 +
tests/Makefile.am | 4 +
17 files changed, 6 insertions(+), 986 deletions(-)
diff --git a/configure.ac b/configure.ac
index 3c821b2..3d3073c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -263,7 +263,6 @@ src/Extensions/Banshee.MiniMode/Makefile
src/Extensions/Banshee.MultimediaKeys/Makefile
src/Extensions/Banshee.NotificationArea/Makefile
src/Extensions/Banshee.NowPlaying/Makefile
-src/Extensions/Banshee.NowPlaying.Clutter/Makefile
src/Extensions/Banshee.PlayQueue/Makefile
src/Extensions/Banshee.PlayerMigration/Makefile
src/Extensions/Banshee.Podcasting/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7dd626c..8ef22b7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -177,7 +177,6 @@ src/Extensions/Banshee.MiniMode/Resources/minimode.glade
src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs
src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationAreaBox.cs
src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs
-src/Extensions/Banshee.NowPlaying.Clutter/Banshee.NowPlaying.Clutter/NowPlayingSource.cs
src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs
src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs
src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs
diff --git a/src/Extensions/Banshee.NowPlaying.Clutter/Banshee.NowPlaying.Clutter.addin.xml b/src/Extensions/Banshee.NowPlaying.Clutter/Banshee.NowPlaying.Clutter.addin.xml
deleted file mode 100644
index 6718bb2..0000000
--- a/src/Extensions/Banshee.NowPlaying.Clutter/Banshee.NowPlaying.Clutter.addin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Addin
- id="Banshee.NowPlaying.Clutter"
- version="1.0"
- compatVersion="1.0"
- copyright="© 2009 Novell Inc. Licensed under the MIT X11 license."
- name="Now Playing"
- category="required:User Interface"
- description="Provides a source that displays embedded video and provides fullscreen video playback and controls."
- author="Aaron Bockover"
- url="http://banshee-project.org/";
- defaultEnabled="true">
-
- <Dependencies>
- <Addin id="Banshee.Services" version="1.0"/>
- <Addin id="Banshee.ThickClient" version="1.0"/>
- </Dependencies>
-
- <Extension path="/Banshee/SourceManager/Source">
- <Source class="Banshee.NowPlaying.Clutter.NowPlayingSource"/>
- </Extension>
-
-</Addin>
diff --git a/src/Extensions/Banshee.NowPlaying.Clutter/Banshee.NowPlaying.Clutter.csproj b/src/Extensions/Banshee.NowPlaying.Clutter/Banshee.NowPlaying.Clutter.csproj
deleted file mode 100644
index f0361fe..0000000
--- a/src/Extensions/Banshee.NowPlaying.Clutter/Banshee.NowPlaying.Clutter.csproj
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="3.5">
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
- <ProjectGuid>{694E4C7C-9385-47D6-A76E-911FC057E89D}</ProjectGuid>
- <OutputType>Library</OutputType>
- <UseParentDirectoryAsNamespace>true</UseParentDirectoryAsNamespace>
- <AssemblyName>Banshee.NowPlaying.Clutter</AssemblyName>
- <SchemaVersion>2.0</SchemaVersion>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
- <Optimize>true</Optimize>
- <OutputPath>..\..\..\bin</OutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <CustomCommands>
- <CustomCommands>
- <Command type="Build" command="make" workingdir="${SolutionDir}" />
- <Command type="Execute" command="make run" workingdir="${SolutionDir}" />
- </CustomCommands>
- </CustomCommands>
- <AssemblyKeyFile>.</AssemblyKeyFile>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Windows|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <PlatformTarget>x86</PlatformTarget>
- <AssemblyKeyFile>.</AssemblyKeyFile>
- </PropertyGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\Core\Banshee.Core\Banshee.Core.csproj">
- <Project>{2ADB831A-A050-47D0-B6B9-9C19D60233BB}</Project>
- <Name>Banshee.Core</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\Banshee.Services\Banshee.Services.csproj">
- <Project>{B28354F0-BA87-44E8-989F-B864A3C7C09F}</Project>
- <Name>Banshee.Services</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\Libraries\Hyena\Hyena.csproj">
- <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
- <Name>Hyena</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\Libraries\Hyena.Gui\Hyena.Gui.csproj">
- <Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
- <Name>Hyena.Gui</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\Banshee.Widgets\Banshee.Widgets.csproj">
- <Project>{A3701765-E571-413D-808C-9788A22791AF}</Project>
- <Name>Banshee.Widgets</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\Banshee.ThickClient\Banshee.ThickClient.csproj">
- <Project>{AC839523-7BDF-4AB6-8115-E17921B96EC6}</Project>
- <Name>Banshee.ThickClient</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <Reference Include="System" />
- <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- <Reference Include="Mono.Posix" />
- <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- <Reference Include="Mono.Cairo" />
- </ItemGroup>
- <ItemGroup>
- </ItemGroup>
- <ItemGroup>
- </ItemGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ProjectExtensions>
- <MonoDevelop>
- <Properties>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am">
- <BuildFilesVar Sync="true" Name="SOURCES" />
- <DeployFilesVar />
- <ResourcesVar Sync="true" Name="RESOURCES" />
- <OthersVar />
- <GacRefVar />
- <AsmRefVar />
- <ProjectRefVar />
- </MonoDevelop.Autotools.MakefileInfo>
- </Properties>
- </MonoDevelop>
- </ProjectExtensions>
- <ItemGroup>
- <Compile Include="Banshee.NowPlaying.Clutter\NowPlayingSource.cs" />
- <Compile Include="Banshee.NowPlaying.Clutter\NowPlayingInterface.cs" />
- <Compile Include="Clutter\Color.cs" />
- <Compile Include="Clutter\Actor.cs" />
- <Compile Include="Clutter.Gtk\Embed.cs" />
- <Compile Include="Clutter\Group.cs" />
- <Compile Include="Clutter\Stage.cs" />
- <Compile Include="Clutter\Texture.cs" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Banshee.NowPlaying.Clutter.addin.xml" />
- </ItemGroup>
-</Project>
diff --git a/src/Extensions/Banshee.NowPlaying.Clutter/Banshee.NowPlaying.Clutter.dll.config b/src/Extensions/Banshee.NowPlaying.Clutter/Banshee.NowPlaying.Clutter.dll.config
deleted file mode 100644
index 28615ae..0000000
--- a/src/Extensions/Banshee.NowPlaying.Clutter/Banshee.NowPlaying.Clutter.dll.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<configuration>
- <dllmap dll="clutter" target="libclutter-glx-0.8.so.0"/>
- <dllmap dll="clutter-gtk" target="libclutter-gtk-0.8.so.0"/>
-</configuration>
-
diff --git a/src/Extensions/Banshee.NowPlaying.Clutter/Banshee.NowPlaying.Clutter/NowPlayingInterface.cs b/src/Extensions/Banshee.NowPlaying.Clutter/Banshee.NowPlaying.Clutter/NowPlayingInterface.cs
deleted file mode 100644
index 8940e9c..0000000
--- a/src/Extensions/Banshee.NowPlaying.Clutter/Banshee.NowPlaying.Clutter/NowPlayingInterface.cs
+++ /dev/null
@@ -1,210 +0,0 @@
-//
-// NowPlayingInterface.cs
-//
-// Author:
-// Aaron Bockover <abockover novell com>
-//
-// Copyright (C) 2008-2009 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 Mono.Unix;
-using Gtk;
-
-using Banshee.ServiceStack;
-using Banshee.Sources;
-using Banshee.Gui;
-using Banshee.Sources.Gui;
-
-using Clutter;
-using Clutter.Gtk;
-
-namespace Banshee.NowPlaying.Clutter
-{
- public class NowPlayingInterface : VBox, ISourceContents
- {
- private NowPlayingSource source;
-
- private Embed display;
- private Stage stage;
- private Texture video_texture;
-
- private int center_x;
- private int center_y;
-
- public NowPlayingInterface ()
- {
- display = new Embed ();
- stage = display.Stage;
- video_texture = new Texture (Banshee.ServiceStack.ServiceManager.PlayerEngine.VideoDisplayContext);
- video_texture.SizeChange += OnVideoTextureSizeChange;
-
- stage.Color = Color.Black;
- stage.Add (video_texture);
-
- PackStart (display, true, true, 0);
-
- HBox rotation_box = new HBox ();
- rotation_box.Spacing = 10;
-
- HScale x_angle = new HScale (0, 360, 1);
- x_angle.ValueChanged += delegate { video_texture.SetRotation (RotateAxis.X, x_angle.Value, center_x, center_y, 0); };
-
- HScale y_angle = new HScale (0, 360, 1);
- y_angle.ValueChanged += delegate { video_texture.SetRotation (RotateAxis.Y, y_angle.Value, center_x, center_y, 0); };
-
- HScale z_angle = new HScale (0, 360, 1);
- z_angle.ValueChanged += delegate { video_texture.SetRotation (RotateAxis.Z, z_angle.Value, center_x, center_y, 0); };
-
- rotation_box.PackStart (x_angle, true, true, 0);
- rotation_box.PackStart (y_angle, true, true, 0);
- rotation_box.PackStart (z_angle, true, true, 0);
- rotation_box.ShowAll ();
-
- PackStart (rotation_box, false, false, 0);
-
- Show ();
- }
-
- private void OnVideoTextureSizeChange (object o, SizeChangeArgs args)
- {
- ReallocateVideoTexture (args.Width, args.Height);
- }
-
- private void ReallocateVideoTexture (int textureWidth, int textureHeight)
- {
- int stage_width, stage_height;
-
- stage.GetSize (out stage_width, out stage_height);
-
- int new_x, new_y, new_width, new_height;
-
- new_height = (textureHeight * stage_width) / textureWidth;
- if (new_height <= stage_height) {
- new_width = stage_width;
- new_x = 0;
- new_y = (stage_height - new_height) / 2;
- } else {
- new_width = (textureWidth * stage_height) / textureHeight;
- new_height = stage_height;
- new_x = (stage_width - new_width) / 2;
- new_y = 0;
- }
-
- center_x = new_width / 2;
- center_y = new_height / 2;
-
- video_texture.SetPosition (new_x, new_y);
- video_texture.SetSize (new_width, new_height);
- }
-
- protected override void OnSizeAllocated (Gdk.Rectangle allocation)
- {
- base.OnSizeAllocated (allocation);
-
- int texture_width, texture_height;
- video_texture.GetSize (out texture_width, out texture_height);
- if (texture_width > 0 && texture_height > 0) {
- ReallocateVideoTexture (texture_width, texture_height);
- }
- }
-
-
-#region Video Fullscreen Override
-
- private ViewActions.FullscreenHandler previous_fullscreen_handler;
-
- private void DisableFullscreenAction ()
- {
- InterfaceActionService service = ServiceManager.Get<InterfaceActionService> ();
- Gtk.ToggleAction action = service.ViewActions["FullScreenAction"] as Gtk.ToggleAction;
- if (action != null) {
- action.Active = false;
- }
- }
-
- internal void OverrideFullscreen ()
- {
- FullscreenHandler (false);
-
- InterfaceActionService service = ServiceManager.Get<InterfaceActionService> ();
- if (service == null || service.ViewActions == null) {
- return;
- }
-
- previous_fullscreen_handler = service.ViewActions.Fullscreen;
- service.ViewActions.Fullscreen = FullscreenHandler;
- DisableFullscreenAction ();
- }
-
- internal void RelinquishFullscreen ()
- {
- FullscreenHandler (false);
-
- InterfaceActionService service = ServiceManager.Get<InterfaceActionService> ();
- if (service == null || service.ViewActions == null) {
- return;
- }
-
- service.ViewActions.Fullscreen = previous_fullscreen_handler;
- }
-
- private void FullscreenHandler (bool fullscreen)
- {
- if (fullscreen) {
- stage.Fullscreen ();
- } else {
- stage.Unfullscreen ();
- }
- }
-
-#endregion
-
-#region ISourceContents
-
- public bool SetSource (ISource src)
- {
- this.source = source as NowPlayingSource;
- if (display != null) {
- display.Show ();
- }
- return this.source != null;
- }
-
- public ISource Source {
- get { return source; }
- }
-
- public void ResetSource ()
- {
- source = null;
- }
-
- public Widget Widget {
- get { return this; }
- }
-
-#endregion
-
- }
-}
diff --git a/src/Extensions/Banshee.NowPlaying.Clutter/Banshee.NowPlaying.Clutter/NowPlayingSource.cs b/src/Extensions/Banshee.NowPlaying.Clutter/Banshee.NowPlaying.Clutter/NowPlayingSource.cs
deleted file mode 100644
index a7e031b..0000000
--- a/src/Extensions/Banshee.NowPlaying.Clutter/Banshee.NowPlaying.Clutter/NowPlayingSource.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-//
-// NowPlayingSource.cs
-//
-// Author:
-// Aaron Bockover <abockover novell com>
-//
-// Copyright (C) 2008-2009 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 Mono.Unix;
-using Gtk;
-
-using Banshee.Sources;
-using Banshee.ServiceStack;
-using Banshee.MediaEngine;
-using Banshee.Collection;
-
-using Banshee.Gui;
-using Banshee.Sources.Gui;
-
-namespace Banshee.NowPlaying.Clutter
-{
- public class NowPlayingSource : Source, IDisposable
- {
- private TrackInfo transitioned_track;
- private NowPlayingInterface now_playing_interface;
-
- public NowPlayingSource () : base ("now-playing-clutter", Catalog.GetString ("Now Playing Clutter"), 10)
- {
- if (Banshee.ServiceStack.ServiceManager.PlayerEngine.VideoDisplayContextType !=
- Banshee.MediaEngine.VideoDisplayContextType.ClutterTexture) {
- throw new ApplicationException ("Unsupported video display context");
- }
-
- TypeUniqueId = "now-playing-clutter";
- 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.SetString ("ActiveSourceUIResource", "ActiveSourceUI.xml");
-
- ServiceManager.SourceManager.AddSource (this);
-
- ServiceManager.PlaybackController.Transition += OnPlaybackControllerTransition;
- ServiceManager.PlaybackController.TrackStarted += OnPlaybackControllerTrackStarted;
- ServiceManager.PlayerEngine.ConnectEvent (OnTrackInfoUpdated, PlayerEvent.TrackInfoUpdated);
- }
-
- public void Dispose ()
- {
- ServiceManager.PlaybackController.Transition -= OnPlaybackControllerTransition;
- ServiceManager.PlaybackController.TrackStarted -= OnPlaybackControllerTrackStarted;
- ServiceManager.PlayerEngine.DisconnectEvent (OnTrackInfoUpdated);
-
- if (now_playing_interface != null) {
- now_playing_interface.Destroy ();
- now_playing_interface.Dispose ();
- now_playing_interface = null;
- }
- }
-
- private void OnTrackInfoUpdated (PlayerEventArgs args)
- {
- CheckForSwitch ();
- }
-
- private void OnPlaybackControllerTrackStarted (object o, EventArgs args)
- {
- CheckForSwitch ();
- }
-
- private void OnPlaybackControllerTransition (object o, EventArgs args)
- {
- transitioned_track = ServiceManager.PlaybackController.CurrentTrack;
- }
-
- private void CheckForSwitch ()
- {
- TrackInfo current_track = ServiceManager.PlaybackController.CurrentTrack;
- if (current_track != null && transitioned_track != current_track &&
- (current_track.MediaAttributes & TrackMediaAttributes.VideoStream) != 0) {
- ServiceManager.SourceManager.SetActiveSource (this);
- }
-
- if ((current_track.MediaAttributes & TrackMediaAttributes.VideoStream) != 0) {
- OnUserNotifyUpdated ();
- }
- }
-
- public override void Activate ()
- {
- if (now_playing_interface != null) {
- now_playing_interface.OverrideFullscreen ();
- }
- }
-
- public override void Deactivate ()
- {
- if (now_playing_interface != null) {
- now_playing_interface.RelinquishFullscreen ();
- }
- }
- }
-}
diff --git a/src/Extensions/Banshee.NowPlaying.Clutter/Clutter.Gtk/Embed.cs b/src/Extensions/Banshee.NowPlaying.Clutter/Clutter.Gtk/Embed.cs
deleted file mode 100644
index 3a66520..0000000
--- a/src/Extensions/Banshee.NowPlaying.Clutter/Clutter.Gtk/Embed.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-//
-// Embed.cs
-//
-// Author:
-// Aaron Bockover <abockover novell com>
-//
-// Copyright (C) 2009 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.Runtime.InteropServices;
-
-using Gtk;
-using Clutter;
-
-namespace Clutter.Gtk
-{
- public class Embed : Widget
- {
- public Embed (IntPtr raw) : base (raw)
- {
- }
-
- [DllImport ("clutter-gtk")]
- private static extern IntPtr gtk_clutter_embed_new ();
-
- public Embed ()
- {
- Raw = gtk_clutter_embed_new ();
- }
-
- [DllImport ("clutter-gtk")]
- private static extern IntPtr gtk_clutter_embed_get_stage (IntPtr handle);
-
- public Stage Stage {
- get { return new Stage (gtk_clutter_embed_get_stage (Handle)); }
- }
-
- [DllImport ("clutter-gtk")]
- private static extern IntPtr gtk_clutter_embed_get_type ();
-
- public static new GLib.GType GType {
- get { return new GLib.GType (gtk_clutter_embed_get_type ()); }
- }
- }
-}
diff --git a/src/Extensions/Banshee.NowPlaying.Clutter/Clutter/Actor.cs b/src/Extensions/Banshee.NowPlaying.Clutter/Clutter/Actor.cs
deleted file mode 100644
index 853dd07..0000000
--- a/src/Extensions/Banshee.NowPlaying.Clutter/Clutter/Actor.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-//
-// Actor.cs
-//
-// Author:
-// Aaron Bockover <abockover novell com>
-//
-// Copyright (C) 2009 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.Runtime.InteropServices;
-
-namespace Clutter
-{
- public enum RotateAxis : int { X, Y, Z }
-
- public class Actor : GLib.InitiallyUnowned
- {
- public Actor (IntPtr raw) : base (raw)
- {
- }
-
- public Actor () : base (IntPtr.Zero)
- {
- CreateNativeObject (new string[0], new GLib.Value[0]);
- }
-
- [DllImport ("clutter")]
- private static extern void clutter_actor_set_position (IntPtr handle, int x, int y);
-
- public void SetPosition (int x, int y)
- {
- clutter_actor_set_position (Handle, x, y);
- }
-
- [DllImport ("clutter")]
- private static extern void clutter_actor_get_position (IntPtr handle, out int x, out int y);
-
- public void GetPosition (out int x, out int y)
- {
- clutter_actor_get_position (Handle, out x, out y);
- }
-
- [DllImport ("clutter")]
- private static extern void clutter_actor_set_size (IntPtr handle, int width, int height);
-
- public void SetSize (int width, int height)
- {
- clutter_actor_set_size (Handle, width, height);
- }
-
- [DllImport ("clutter")]
- private static extern void clutter_actor_get_size (IntPtr handle, out int width, out int height);
-
- public void GetSize (out int width, out int height)
- {
- clutter_actor_get_size (Handle, out width, out height);
- }
-
- [DllImport ("clutter")]
- private static extern void clutter_actor_set_rotation (IntPtr handle, RotateAxis axis,
- double angle, int x, int y, int z);
-
- public void SetRotation (RotateAxis axis, double angle, int x, int y, int z)
- {
- clutter_actor_set_rotation (Handle, axis, angle, x, y, z);
- }
-
- [GLib.Property ("rotation-angle-x")]
- public double RotationAngleX {
- get { using (GLib.Value val = GetProperty ("rotation-angle-x")) return (double)val; }
- set { using (GLib.Value val = new GLib.Value (value)) SetProperty ("rotation-angle-x", val); }
- }
-
- [GLib.Property ("rotation-angle-y")]
- public double RotationAngleY {
- get { using (GLib.Value val = GetProperty ("rotation-angle-y")) return (double)val; }
- set { using (GLib.Value val = new GLib.Value (value)) SetProperty ("rotation-angle-y", val); }
- }
-
- [GLib.Property ("rotation-angle-z")]
- public double RotationAngleZ {
- get { using (GLib.Value val = GetProperty ("rotation-angle-z")) return (double)val; }
- set { using (GLib.Value val = new GLib.Value (value)) SetProperty ("rotation-angle-z", val); }
- }
-
- [DllImport ("clutter")]
- private static extern IntPtr clutter_actor_get_type ();
-
- public static new GLib.GType GType {
- get { return new GLib.GType (clutter_actor_get_type ()); }
- }
- }
-}
diff --git a/src/Extensions/Banshee.NowPlaying.Clutter/Clutter/Color.cs b/src/Extensions/Banshee.NowPlaying.Clutter/Clutter/Color.cs
deleted file mode 100644
index 4090ad0..0000000
--- a/src/Extensions/Banshee.NowPlaying.Clutter/Clutter/Color.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// Color.cs
-//
-// Author:
-// Aaron Bockover <abockover novell com>
-//
-// Copyright (C) 2009 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 Clutter
-{
- public struct Color
- {
- public static Color Zero = new Color (0, 0, 0, 0);
- public static Color Black = new Color (0, 0, 0);
- public static Color White = new Color (0xff, 0xff, 0xff);
-
- // The ClutterColor struct; do not add any other fields
- private byte red;
- private byte green;
- private byte blue;
- private byte alpha;
-
- public Color (byte red, byte green, byte blue)
- {
- this.red = red;
- this.green = green;
- this.blue = blue;
- this.alpha = 0xff;
- }
-
- public Color (byte red, byte green, byte blue, byte alpha)
- {
- this.red = red;
- this.green = green;
- this.blue = blue;
- this.alpha = alpha;
- }
-
- public Color (uint rgbaColor)
- {
- this.red = (byte)(rgbaColor >> 24);
- this.green = (byte)((rgbaColor >> 16) & 0xff);
- this.blue = (byte)((rgbaColor >> 8) & 0xff);
- this.alpha = (byte)(rgbaColor & 0xff);
- }
-
- public static Color FromRgb (uint rgbColor)
- {
- return new Color ((rgbColor << 8) | 0xff);
- }
-
- public static Color FromRgba (uint rgbaColor)
- {
- return new Color (rgbaColor);
- }
-
- public byte Red {
- get { return red; }
- set { red = value; }
- }
-
- public byte Green {
- get { return green; }
- set { green = value; }
- }
-
- public byte Blue {
- get { return blue; }
- set { blue = value; }
- }
-
- public byte Alpha {
- get { return alpha; }
- set { alpha = value; }
- }
- }
-}
diff --git a/src/Extensions/Banshee.NowPlaying.Clutter/Clutter/Group.cs b/src/Extensions/Banshee.NowPlaying.Clutter/Clutter/Group.cs
deleted file mode 100644
index 6967343..0000000
--- a/src/Extensions/Banshee.NowPlaying.Clutter/Clutter/Group.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Group.cs
-//
-// Author:
-// Aaron Bockover <abockover novell com>
-//
-// Copyright (C) 2009 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.Runtime.InteropServices;
-
-namespace Clutter
-{
- public class Group : Actor
- {
- public Group (IntPtr raw) : base (raw)
- {
- }
-
- public Group () : base (IntPtr.Zero)
- {
- CreateNativeObject (new string[0], new GLib.Value[0]);
- }
-
- [DllImport ("clutter")]
- private static extern void clutter_container_add (IntPtr handle, IntPtr actor, IntPtr zero);
-
- public void Add (Actor actor)
- {
- clutter_container_add (Handle, actor.Handle, IntPtr.Zero);
- }
-
- [DllImport ("clutter")]
- private static extern IntPtr clutter_group_get_type ();
-
- public static new GLib.GType GType {
- get { return new GLib.GType (clutter_group_get_type ()); }
- }
- }
-}
diff --git a/src/Extensions/Banshee.NowPlaying.Clutter/Clutter/Stage.cs b/src/Extensions/Banshee.NowPlaying.Clutter/Clutter/Stage.cs
deleted file mode 100644
index 66960b0..0000000
--- a/src/Extensions/Banshee.NowPlaying.Clutter/Clutter/Stage.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Stage.cs
-//
-// Author:
-// Aaron Bockover <abockover novell com>
-//
-// Copyright (C) 2009 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.Runtime.InteropServices;
-
-namespace Clutter
-{
- public class Stage : Group
- {
- public Stage (IntPtr raw) : base (raw)
- {
- }
-
- public Stage () : base (IntPtr.Zero)
- {
- CreateNativeObject (new string[0], new GLib.Value[0]);
- }
-
- [DllImport ("clutter")]
- private static extern void clutter_stage_fullscreen (IntPtr handle);
-
- public void Fullscreen ()
- {
- clutter_stage_fullscreen (Handle);
- }
-
- [DllImport ("clutter")]
- private static extern void clutter_stage_unfullscreen (IntPtr handle);
-
- public void Unfullscreen ()
- {
- clutter_stage_unfullscreen (Handle);
- }
-
- [DllImport ("clutter")]
- private static extern void clutter_stage_set_color (IntPtr handle, ref Color color);
-
- [DllImport ("clutter")]
- private static extern void clutter_stage_get_color (IntPtr handle, out Color color);
-
- public Color Color {
- get {
- Color color = Color.Zero;
- clutter_stage_get_color (Handle, out color);
- return color;
- }
-
- set { clutter_stage_set_color (Handle, ref value); }
- }
-
- [DllImport ("clutter")]
- private static extern IntPtr clutter_stage_get_type ();
-
- public static new GLib.GType GType {
- get { return new GLib.GType (clutter_stage_get_type ()); }
- }
- }
-}
diff --git a/src/Extensions/Banshee.NowPlaying.Clutter/Clutter/Texture.cs b/src/Extensions/Banshee.NowPlaying.Clutter/Clutter/Texture.cs
deleted file mode 100644
index 061cf0e..0000000
--- a/src/Extensions/Banshee.NowPlaying.Clutter/Clutter/Texture.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-//
-// Texture.cs
-//
-// Author:
-// Aaron Bockover <abockover novell com>
-//
-// Copyright (C) 2009 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.Runtime.InteropServices;
-
-namespace Clutter
-{
- public class Texture : Actor
- {
- public Texture (IntPtr raw) : base (raw)
- {
- }
-
- public Texture () : base (IntPtr.Zero)
- {
- CreateNativeObject (new string[0], new GLib.Value[0]);
- }
-
- [GLib.Signal ("size-change")]
- public event SizeChangeHandler SizeChange {
- add { GLib.Signal.Lookup (this, "size-change", typeof (SizeChangeArgs)).AddDelegate (value); }
- remove { GLib.Signal.Lookup (this, "size-change", typeof (SizeChangeArgs)).RemoveDelegate (value); }
- }
-
- [DllImport ("clutter")]
- private static extern IntPtr clutter_texture_get_type ();
-
- public static new GLib.GType GType {
- get { return new GLib.GType (clutter_texture_get_type ()); }
- }
- }
-
- public delegate void SizeChangeHandler (object o, SizeChangeArgs args);
-
- public class SizeChangeArgs : GLib.SignalArgs
- {
- public int Width {
- get { return (int)Args[0]; }
- }
-
- public int Height {
- get { return (int)Args[1]; }
- }
- }
-}
diff --git a/src/Extensions/Banshee.NowPlaying.Clutter/Makefile.am b/src/Extensions/Banshee.NowPlaying.Clutter/Makefile.am
deleted file mode 100644
index 6d6ce60..0000000
--- a/src/Extensions/Banshee.NowPlaying.Clutter/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-ASSEMBLY = Banshee.NowPlaying.Clutter
-TARGET = library
-LINK = $(REF_EXTENSION_NOWPLAYING_CLUTTER)
-INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
-
-SOURCES = \
- Banshee.NowPlaying.Clutter/NowPlayingInterface.cs \
- Banshee.NowPlaying.Clutter/NowPlayingSource.cs \
- Clutter.Gtk/Embed.cs \
- Clutter/Actor.cs \
- Clutter/Color.cs \
- Clutter/Group.cs \
- Clutter/Stage.cs \
- Clutter/Texture.cs
-
-RESOURCES = Banshee.NowPlaying.Clutter.addin.xml
-
-#if HAVE_CLUTTER
-#include $(top_srcdir)/build/build.mk
-#module_SCRIPTS += Banshee.NowPlaying.Clutter.dll.config
-#EXTRA_DIST += Banshee.NowPlaying.Clutter.dll.config
-#else
-EXTRA_DIST = $(SOURCES) $(RESOURCES) Banshee.NowPlaying.Clutter
-#endif
-
-
diff --git a/src/Extensions/Makefile.am b/src/Extensions/Makefile.am
index 60b39a2..2bde3de 100644
--- a/src/Extensions/Makefile.am
+++ b/src/Extensions/Makefile.am
@@ -13,7 +13,6 @@ SUBDIRS = \
Banshee.MultimediaKeys \
Banshee.NotificationArea \
Banshee.NowPlaying \
- Banshee.NowPlaying.Clutter \
Banshee.PlayerMigration \
Banshee.PlayQueue \
Banshee.Podcasting \
diff --git a/tests/Analyzer/Makefile.am b/tests/Analyzer/Makefile.am
index 3273ece..2b4e621 100644
--- a/tests/Analyzer/Makefile.am
+++ b/tests/Analyzer/Makefile.am
@@ -9,5 +9,7 @@ $(ANALYZER_EXE): Analyzer.cs
all: $(ALL_TARGETS)
+EXTRA_DIST = Analyzer.cs
+
CLEANFILES = *.exe *.mdb
MAINTAINERCLEANFILES = Makefile.in
diff --git a/tests/Makefile.am b/tests/Makefile.am
index feaaa23..90eb7ef 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,6 +3,10 @@ include $(top_srcdir)/build/build.environment.mk
SUBDIRS = \
Analyzer
+DIST_SUBDIRS = \
+ Analyzer \
+ Performance
+
if ENABLE_TESTS
TEST_ASSEMBLIES = \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
