GNOME.org
 

banshee r3665 - in trunk/banshee: . build src/Dap src/Dap/Banshee.Dap src/Dap/Banshee.Dap.MassStorage src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage src/Dap/Banshee.Dap/Banshee.Dap src/Extensions

Author: gburt
Date: Fri Apr  4 00:19:39 2008
New Revision: 3665
URL: http://svn.gnome.org/viewvc/banshee?rev=3665&view=rev

Log:
2008-04-03  Gabriel Burt  <gabriel burt gmail com>

	Almost done with move.  Banshee.Dap* not in build yet.

	* build/build.environment.mk:
	* configure.ac: Add Banshee.Dap setup.

	* src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/DapService.cs:
	* src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/DapSource.cs:
	* src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/RemovableSource.cs:
	* src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs:
	* src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:
	* src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs: Moved.

	* src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.mdp:
	* src/Dap/Banshee.Dap.MassStorage/Makefile.am: Removed the above files.

	* src/Dap/Banshee.Dap/Banshee.Dap.addin.xml:
	* src/Dap/Banshee.Dap/Banshee.Dap.mdp:
	* src/Dap/Banshee.Dap/Makefile.am: New files for Banshee.Dap.

	* src/Dap/Dap.mds:
	* src/Dap/Makefile.am: Add Banshee.Dap.

	* src/Extensions/Extensions.mds:
	* src/Extensions/Makefile.am: Remove the Dap.MassStorage extension entries.


Added:
   trunk/banshee/src/Dap/Banshee.Dap/
   trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/
   trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap.addin.xml
   trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap.mdp
   trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs   (contents, props changed)
      - copied, changed from r3664, /trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/DapService.cs
   trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs   (contents, props changed)
      - copied, changed from r3664, /trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/DapSource.cs
   trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs   (contents, props changed)
      - copied, changed from r3664, /trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/RemovableSource.cs
   trunk/banshee/src/Dap/Banshee.Dap/Makefile.am
Removed:
   trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/DapService.cs
   trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/DapSource.cs
   trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/RemovableSource.cs
Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/build/build.environment.mk
   trunk/banshee/configure.ac
   trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.mdp
   trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Makefile.am
   trunk/banshee/src/Dap/Dap.mds
   trunk/banshee/src/Dap/Makefile.am
   trunk/banshee/src/Extensions/Extensions.mds
   trunk/banshee/src/Extensions/Makefile.am

Modified: trunk/banshee/build/build.environment.mk
==============================================================================
--- trunk/banshee/build/build.environment.mk	(original)
+++ trunk/banshee/build/build.environment.mk	Fri Apr  4 00:19:39 2008
@@ -115,9 +115,10 @@
 REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS)
 
 # Dap
-REF_DAP_DAPCORE = $(LINK_BANSHEE_SERVICES_DEPS)
-LINK_DAP_DAPCORE = -r:$(DIR_BIN)/Banshee.DapCore.dll
-LINK_DAP_DAPCORE_DEPS = $(REF_DAP_DAPCORE) $(LINK_DAP_DAPCORE)
+REF_DAP = $(LINK_BANSHEE_SERVICES_DEPS)
+LINK_DAP = -r:$(DIR_BIN)/Banshee.Dap.dll
+LINK_DAP_DEPS = $(REF_DAP) $(LINK_DAP)
+REF_DAP_MASS_STORAGE = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_DAP_DEPS)
 
 # Backends
 REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GCONF) $(LINK_GNOME)
@@ -134,7 +135,6 @@
 REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
 REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
 REF_EXTENSION_NOWPLAYING = $(LINK_BANSHEE_THICKCLIENT_DEPS)
-REF_EXTENSION_DAP_MASS_STORAGE = $(LINK_BANSHEE_SERVICES_DEPS)
 
 # Build rules
 # Ignoring 0278 due to a bug in gmcs: 

Modified: trunk/banshee/configure.ac
==============================================================================
--- trunk/banshee/configure.ac	(original)
+++ trunk/banshee/configure.ac	Fri Apr  4 00:19:39 2008
@@ -157,11 +157,14 @@
 src/Libraries/Mono.Media/Makefile
 src/Libraries/MusicBrainz/Makefile
 
+src/Dap/Makefile
+src/Dap/Banshee.Dap/Makefile
+src/Dap/Banshee.Dap.MassStorage/Makefile
+
 src/Extensions/Makefile
 src/Extensions/Banshee.AudioCd/Makefile
 src/Extensions/Banshee.Bookmarks/Makefile
 src/Extensions/Banshee.Daap/Makefile
-src/Extensions/Banshee.Dap.MassStorage/Makefile
 src/Extensions/Banshee.Lastfm/Makefile
 src/Extensions/Banshee.MultimediaKeys/Makefile
 src/Extensions/Banshee.NotificationArea/Makefile

Modified: trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.mdp
==============================================================================
--- trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.mdp	(original)
+++ trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.mdp	Fri Apr  4 00:19:39 2008
@@ -9,16 +9,13 @@
   </Configurations>
   <Contents>
     <File name="Banshee.Dap.MassStorage/MassStorageSource.cs" subtype="Code" buildaction="Compile" />
-    <File name="Banshee.Dap.MassStorage/DapSource.cs" subtype="Code" buildaction="Compile" />
-    <File name="Banshee.Dap.MassStorage/RemovableSource.cs" subtype="Code" buildaction="Compile" />
-    <File name="Banshee.Dap.MassStorage/DapService.cs" subtype="Code" buildaction="Compile" />
     <File name="Banshee.Dap.MassStorage.addin.xml" subtype="Code" buildaction="EmbedAsResource" />
   </Contents>
   <References>
     <ProjectReference type="Project" localcopy="True" refto="Banshee.Core" />
     <ProjectReference type="Project" localcopy="True" refto="Banshee.Services" />
     <ProjectReference type="Project" localcopy="True" refto="Hyena" />
-    <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+    <ProjectReference type="Project" localcopy="True" refto="Banshee.Dap" />
     <ProjectReference type="Project" localcopy="True" refto="MusicBrainz" />
   </References>
   <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am">

Modified: trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Makefile.am
==============================================================================
--- trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Makefile.am	(original)
+++ trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Makefile.am	Fri Apr  4 00:19:39 2008
@@ -4,10 +4,7 @@
 INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
 
 SOURCES =  \
-	Banshee.Dap.MassStorage/DapService.cs \
-	Banshee.Dap.MassStorage/DapSource.cs \
-	Banshee.Dap.MassStorage/MassStorageSource.cs \
-	Banshee.Dap.MassStorage/RemovableSource.cs
+	Banshee.Dap.MassStorage/MassStorageSource.cs
 
 RESOURCES = Banshee.Dap.MassStorage.addin.xml
 

Added: trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap.addin.xml
==============================================================================
--- (empty file)
+++ trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap.addin.xml	Fri Apr  4 00:19:39 2008
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Addin 
+    id="Banshee.Dap"
+    version="1.0"
+    compatVersion="1.0"
+    copyright="Â 2008 Novell Inc. Licensed under the MIT X11 license."
+    name="Digital Audio Player Support"
+    category="Hardware"
+    description="Provides support for Digital Audio Players."
+    author="Gabriel Burt"
+    url="http://banshee-project.org/";
+    defaultEnabled="true">
+
+  <Dependencies>
+    <Addin id="Banshee.Services" version="1.0"/>
+  </Dependencies>
+
+  <Extension path="/Banshee/ServiceManager/Service">
+    <Service class="Banshee.Dap.DapService"/>
+  </Extension>
+
+</Addin>

Added: trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap.mdp
==============================================================================
--- (empty file)
+++ trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap.mdp	Fri Apr  4 00:19:39 2008
@@ -0,0 +1,31 @@
+<Project name="Banshee.Dap" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
+  <Configurations active="Debug">
+    <Configuration name="Debug" ctype="DotNetProjectConfiguration">
+      <Output directory="../../../bin" assemblyKeyFile="." assembly="Banshee.AudioCd" />
+      <Build debugmode="True" target="Library" />
+      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
+      <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
+    </Configuration>
+  </Configurations>
+  <Contents>
+    <File name="Banshee.Dap/DapSource.cs" subtype="Code" buildaction="Compile" />
+    <File name="Banshee.Dap/RemovableSource.cs" subtype="Code" buildaction="Compile" />
+    <File name="Banshee.Dap/DapService.cs" subtype="Code" buildaction="Compile" />
+    <File name="Banshee.Dap.addin.xml" subtype="Code" buildaction="EmbedAsResource" />
+  </Contents>
+  <References>
+    <ProjectReference type="Project" localcopy="True" refto="Banshee.Core" />
+    <ProjectReference type="Project" localcopy="True" refto="Banshee.Services" />
+    <ProjectReference type="Project" localcopy="True" refto="Hyena" />
+    <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  </References>
+  <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>
+</Project>

Copied: trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs (from r3664, /trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/DapService.cs)
==============================================================================
--- /trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/DapService.cs	(original)
+++ trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs	Fri Apr  4 00:19:39 2008
@@ -39,7 +39,7 @@
 using Banshee.Collection.Database;
 using Banshee.Hardware;
 
-namespace Banshee.Dap.MassStorage
+namespace Banshee.Dap
 {
     public class DapService : IExtensionService, IDisposable
     {

Copied: trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs (from r3664, /trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/DapSource.cs)
==============================================================================
--- /trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/DapSource.cs	(original)
+++ trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs	Fri Apr  4 00:19:39 2008
@@ -39,7 +39,7 @@
 using Banshee.Collection.Database;
 using Banshee.Hardware;
 
-namespace Banshee.Dap.MassStorage
+namespace Banshee.Dap
 {
     public abstract class DapSource : RemovableSource
     {

Copied: trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs (from r3664, /trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/RemovableSource.cs)
==============================================================================
--- /trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/RemovableSource.cs	(original)
+++ trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs	Fri Apr  4 00:19:39 2008
@@ -39,7 +39,7 @@
 using Banshee.Collection.Database;
 using Banshee.Hardware;
 
-namespace Banshee.Dap.MassStorage
+namespace Banshee.Dap
 {
     public abstract class RemovableSource : PrimarySource, IUnmapableSource, IDisposable
     {

Added: trunk/banshee/src/Dap/Banshee.Dap/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/banshee/src/Dap/Banshee.Dap/Makefile.am	Fri Apr  4 00:19:39 2008
@@ -0,0 +1,14 @@
+ASSEMBLY = Banshee.Dap
+TARGET = library
+LINK = $(REF_EXTENSION_DAP)
+INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
+
+SOURCES =  \
+	Banshee.Dap/DapService.cs \
+	Banshee.Dap/DapSource.cs \
+	Banshee.Dap/RemovableSource.cs
+
+RESOURCES = Banshee.Dap.addin.xml
+
+include $(top_srcdir)/build/build.mk
+

Modified: trunk/banshee/src/Dap/Dap.mds
==============================================================================
--- trunk/banshee/src/Dap/Dap.mds	(original)
+++ trunk/banshee/src/Dap/Dap.mds	Fri Apr  4 00:19:39 2008
@@ -1,16 +1,16 @@
 <Combine name="Dap" fileversion="2.0">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="CombineConfiguration">
-      <Entry build="True" name="Banshee.DapCore" configuration="Debug" />
+      <Entry build="True" name="Banshee.Dap" configuration="Debug" />
       <Entry build="True" name="Banshee.Dap.MassStorage" configuration="Debug" />
     </Configuration>
   </Configurations>
   <StartMode startupentry="Banshee.DapCore" single="True">
-    <Execute type="None" entry="Banshee.DapCore" />
+    <Execute type="None" entry="Banshee.Dap" />
     <Execute type="None" entry="Banshee.Dap.MassStorage" />
   </StartMode>
   <Entries>
-    <Entry filename="Banshee.DapCore/Banshee.DapCore.mdp" />
+    <Entry filename="Banshee.Dap/Banshee.Dap.mdp" />
     <Entry filename="Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.mdp" />
   </Entries>
-</Combine>
\ No newline at end of file
+</Combine>

Modified: trunk/banshee/src/Dap/Makefile.am
==============================================================================
--- trunk/banshee/src/Dap/Makefile.am	(original)
+++ trunk/banshee/src/Dap/Makefile.am	Fri Apr  4 00:19:39 2008
@@ -1,5 +1,5 @@
 SUBDIRS = \
-	Banshee.DapCore \
+	Banshee.Dap \
 	Banshee.Dap.MassStorage
 
 run:

Modified: trunk/banshee/src/Extensions/Extensions.mds
==============================================================================
--- trunk/banshee/src/Extensions/Extensions.mds	(original)
+++ trunk/banshee/src/Extensions/Extensions.mds	Fri Apr  4 00:19:39 2008
@@ -9,7 +9,6 @@
       <Entry build="True" name="Banshee.PlayQueue" configuration="Debug" />
       <Entry build="True" name="Banshee.AudioCd" configuration="Debug" />
       <Entry build="True" name="Banshee.Daap" configuration="Debug" />
-      <Entry build="True" name="Banshee.Dap.MassStorage" configuration="Debug" />
     </Configuration>
   </Configurations>
   <StartMode single="True">
@@ -21,7 +20,6 @@
     <Execute type="None" entry="Banshee.NowPlaying" />
     <Execute type="None" entry="Banshee.Bookmarks" />
     <Execute type="None" entry="Banshee.AudioCd" />
-    <Execute type="None" entry="Banshee.Dap.MassStorage" />
   </StartMode>
   <Entries>
     <Entry filename="Banshee.Daap/Banshee.Daap.mdp" />
@@ -32,6 +30,5 @@
     <Entry filename="Banshee.NowPlaying/Banshee.NowPlaying.mdp" />
     <Entry filename="Banshee.Bookmarks/Banshee.Bookmarks.mdp" />
     <Entry filename="Banshee.AudioCd/Banshee.AudioCd.mdp" />
-    <Entry filename="Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.mdp" />
   </Entries>
-</Combine>
\ No newline at end of file
+</Combine>

Modified: trunk/banshee/src/Extensions/Makefile.am
==============================================================================
--- trunk/banshee/src/Extensions/Makefile.am	(original)
+++ trunk/banshee/src/Extensions/Makefile.am	Fri Apr  4 00:19:39 2008
@@ -3,7 +3,6 @@
 SUBDIRS = \
 	Banshee.AudioCd \
 	Banshee.Bookmarks \
-	Banshee.Dap.MassStorage \
 	Banshee.Lastfm \
 	Banshee.MultimediaKeys \
 	Banshee.NotificationArea \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]