GNOME.org
 

banshee r3009 - in branches/banshee/stable: . ext/libmtp-sharp ext/libmtp-sharp/Base ext/libmtp-sharp/Functions src/Dap/Banshee.Dap.Mtp

Author: gburt
Date: Tue Jan 22 18:09:33 2008
New Revision: 3009
URL: http://svn.gnome.org/viewvc/banshee?rev=3009&view=rev

Log:
2008-01-22  Gabriel Burt  <gabriel burt gmail com>

	* src/Dap/Banshee.Dap.Mtp/*:
	* configure.ac:
	* ext/libmtp-sharp/*: Rename libmtpsharp namespace and dll to Mtp.


Added:
   branches/banshee/stable/ext/libmtp-sharp/Mtp.dll.config.in
      - copied unchanged from r2985, /branches/banshee/stable/ext/libmtp-sharp/libmtp-sharp.dll.config.in
Removed:
   branches/banshee/stable/ext/libmtp-sharp/libmtp-sharp.dll.config.in
Modified:
   branches/banshee/stable/ChangeLog
   branches/banshee/stable/configure.ac
   branches/banshee/stable/ext/libmtp-sharp/AssemblyInfo.cs
   branches/banshee/stable/ext/libmtp-sharp/Base/Album.cs
   branches/banshee/stable/ext/libmtp-sharp/Base/DeviceEntry.cs
   branches/banshee/stable/ext/libmtp-sharp/Base/DeviceStorage.cs
   branches/banshee/stable/ext/libmtp-sharp/Base/Enums.cs
   branches/banshee/stable/ext/libmtp-sharp/Base/Error.cs
   branches/banshee/stable/ext/libmtp-sharp/Base/File.cs
   branches/banshee/stable/ext/libmtp-sharp/Base/FileSampleData.cs
   branches/banshee/stable/ext/libmtp-sharp/Base/FolderStruct.cs
   branches/banshee/stable/ext/libmtp-sharp/Base/MtpDeviceStruct.cs
   branches/banshee/stable/ext/libmtp-sharp/Base/Playlist.cs
   branches/banshee/stable/ext/libmtp-sharp/Base/TrackStruct.cs
   branches/banshee/stable/ext/libmtp-sharp/Folder.cs
   branches/banshee/stable/ext/libmtp-sharp/Functions/AlbumManagement.cs
   branches/banshee/stable/ext/libmtp-sharp/Functions/FileManagement.cs
   branches/banshee/stable/ext/libmtp-sharp/Functions/FolderManagement.cs
   branches/banshee/stable/ext/libmtp-sharp/Functions/FunctionCalls.cs
   branches/banshee/stable/ext/libmtp-sharp/Functions/PlaylistManagement.cs
   branches/banshee/stable/ext/libmtp-sharp/Functions/TrackManagement.cs
   branches/banshee/stable/ext/libmtp-sharp/Makefile.am
   branches/banshee/stable/ext/libmtp-sharp/MtpDevice.cs
   branches/banshee/stable/ext/libmtp-sharp/Track.cs
   branches/banshee/stable/ext/libmtp-sharp/libmtp-sharp.mdp
   branches/banshee/stable/src/Dap/Banshee.Dap.Mtp/Makefile.am
   branches/banshee/stable/src/Dap/Banshee.Dap.Mtp/MtpDap.cs
   branches/banshee/stable/src/Dap/Banshee.Dap.Mtp/MtpDapTrackInfo.cs

Modified: branches/banshee/stable/configure.ac
==============================================================================
--- branches/banshee/stable/configure.ac	(original)
+++ branches/banshee/stable/configure.ac	Tue Jan 22 18:09:33 2008
@@ -116,7 +116,7 @@
 ext/dbus-sharp/Makefile
 ext/dbus-sharp/NDesk.DBus.GLib.dll.config
 ext/libmtp-sharp/Makefile
-ext/libmtp-sharp/libmtp-sharp.dll.config
+ext/libmtp-sharp/Mtp.dll.config
 
 src/Makefile
 src/AssemblyInfo.cs

Modified: branches/banshee/stable/ext/libmtp-sharp/AssemblyInfo.cs
==============================================================================
--- branches/banshee/stable/ext/libmtp-sharp/AssemblyInfo.cs	(original)
+++ branches/banshee/stable/ext/libmtp-sharp/AssemblyInfo.cs	Tue Jan 22 18:09:33 2008
@@ -36,7 +36,7 @@
 // change them to the information which is associated with the assembly
 // you compile.
 
-[assembly: AssemblyTitle("libmtp-sharp")]
+[assembly: AssemblyTitle("Mtp")]
 [assembly: AssemblyDescription("A .NET binding for libmtp")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]

Modified: branches/banshee/stable/ext/libmtp-sharp/Base/Album.cs
==============================================================================
--- branches/banshee/stable/ext/libmtp-sharp/Base/Album.cs	(original)
+++ branches/banshee/stable/ext/libmtp-sharp/Base/Album.cs	Tue Jan 22 18:09:33 2008
@@ -30,7 +30,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace libmtpsharp
+namespace Mtp
 {
 	[StructLayout(LayoutKind.Sequential)]
 	internal struct Album

Modified: branches/banshee/stable/ext/libmtp-sharp/Base/DeviceEntry.cs
==============================================================================
--- branches/banshee/stable/ext/libmtp-sharp/Base/DeviceEntry.cs	(original)
+++ branches/banshee/stable/ext/libmtp-sharp/Base/DeviceEntry.cs	Tue Jan 22 18:09:33 2008
@@ -30,7 +30,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace libmtpsharp
+namespace Mtp
 {
 	[StructLayout(LayoutKind.Sequential)]
 	internal struct DeviceEntry

Modified: branches/banshee/stable/ext/libmtp-sharp/Base/DeviceStorage.cs
==============================================================================
--- branches/banshee/stable/ext/libmtp-sharp/Base/DeviceStorage.cs	(original)
+++ branches/banshee/stable/ext/libmtp-sharp/Base/DeviceStorage.cs	Tue Jan 22 18:09:33 2008
@@ -30,7 +30,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace libmtpsharp
+namespace Mtp
 {
 	[StructLayout(LayoutKind.Sequential)]
 	public struct DeviceStorage

Modified: branches/banshee/stable/ext/libmtp-sharp/Base/Enums.cs
==============================================================================
--- branches/banshee/stable/ext/libmtp-sharp/Base/Enums.cs	(original)
+++ branches/banshee/stable/ext/libmtp-sharp/Base/Enums.cs	Tue Jan 22 18:09:33 2008
@@ -29,7 +29,7 @@
 
 using System;
 
-namespace libmtpsharp
+namespace Mtp
 {
 	public enum FileType
 	{

Modified: branches/banshee/stable/ext/libmtp-sharp/Base/Error.cs
==============================================================================
--- branches/banshee/stable/ext/libmtp-sharp/Base/Error.cs	(original)
+++ branches/banshee/stable/ext/libmtp-sharp/Base/Error.cs	Tue Jan 22 18:09:33 2008
@@ -30,7 +30,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace libmtpsharp
+namespace Mtp
 {
 	public class LibMtpException : Exception
 	{

Modified: branches/banshee/stable/ext/libmtp-sharp/Base/File.cs
==============================================================================
--- branches/banshee/stable/ext/libmtp-sharp/Base/File.cs	(original)
+++ branches/banshee/stable/ext/libmtp-sharp/Base/File.cs	Tue Jan 22 18:09:33 2008
@@ -30,7 +30,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace libmtpsharp
+namespace Mtp
 {
 	[StructLayout(LayoutKind.Sequential)]
 	internal struct File

Modified: branches/banshee/stable/ext/libmtp-sharp/Base/FileSampleData.cs
==============================================================================
--- branches/banshee/stable/ext/libmtp-sharp/Base/FileSampleData.cs	(original)
+++ branches/banshee/stable/ext/libmtp-sharp/Base/FileSampleData.cs	Tue Jan 22 18:09:33 2008
@@ -30,7 +30,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace libmtpsharp
+namespace Mtp
 {
 	[StructLayout(LayoutKind.Sequential)]
 	internal struct FileSampleData

Modified: branches/banshee/stable/ext/libmtp-sharp/Base/FolderStruct.cs
==============================================================================
--- branches/banshee/stable/ext/libmtp-sharp/Base/FolderStruct.cs	(original)
+++ branches/banshee/stable/ext/libmtp-sharp/Base/FolderStruct.cs	Tue Jan 22 18:09:33 2008
@@ -31,7 +31,7 @@
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 
-namespace libmtpsharp
+namespace Mtp
 {
 	internal class FolderHandle : SafeHandle
 	{

Modified: branches/banshee/stable/ext/libmtp-sharp/Base/MtpDeviceStruct.cs
==============================================================================
--- branches/banshee/stable/ext/libmtp-sharp/Base/MtpDeviceStruct.cs	(original)
+++ branches/banshee/stable/ext/libmtp-sharp/Base/MtpDeviceStruct.cs	Tue Jan 22 18:09:33 2008
@@ -31,7 +31,7 @@
 using System.Runtime.InteropServices;
 using System.Collections.Generic;
 
-namespace libmtpsharp
+namespace Mtp
 {
 	internal class MtpDeviceHandle : SafeHandle
 	{

Modified: branches/banshee/stable/ext/libmtp-sharp/Base/Playlist.cs
==============================================================================
--- branches/banshee/stable/ext/libmtp-sharp/Base/Playlist.cs	(original)
+++ branches/banshee/stable/ext/libmtp-sharp/Base/Playlist.cs	Tue Jan 22 18:09:33 2008
@@ -30,7 +30,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace libmtpsharp
+namespace Mtp
 {
 	[StructLayout(LayoutKind.Sequential)]
 	internal struct Playlist

Modified: branches/banshee/stable/ext/libmtp-sharp/Base/TrackStruct.cs
==============================================================================
--- branches/banshee/stable/ext/libmtp-sharp/Base/TrackStruct.cs	(original)
+++ branches/banshee/stable/ext/libmtp-sharp/Base/TrackStruct.cs	Tue Jan 22 18:09:33 2008
@@ -30,7 +30,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace libmtpsharp
+namespace Mtp
 {
 	[StructLayout(LayoutKind.Sequential)]
 	internal struct TrackStruct

Modified: branches/banshee/stable/ext/libmtp-sharp/Folder.cs
==============================================================================
--- branches/banshee/stable/ext/libmtp-sharp/Folder.cs	(original)
+++ branches/banshee/stable/ext/libmtp-sharp/Folder.cs	Tue Jan 22 18:09:33 2008
@@ -31,7 +31,7 @@
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 
-namespace libmtpsharp
+namespace Mtp
 {
 	public class Folder
 	{

Modified: branches/banshee/stable/ext/libmtp-sharp/Functions/AlbumManagement.cs
==============================================================================
--- branches/banshee/stable/ext/libmtp-sharp/Functions/AlbumManagement.cs	(original)
+++ branches/banshee/stable/ext/libmtp-sharp/Functions/AlbumManagement.cs	Tue Jan 22 18:09:33 2008
@@ -30,7 +30,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace libmtpsharp
+namespace Mtp
 {
 	internal class AlbumManagement
 	{

Modified: branches/banshee/stable/ext/libmtp-sharp/Functions/FileManagement.cs
==============================================================================
--- branches/banshee/stable/ext/libmtp-sharp/Functions/FileManagement.cs	(original)
+++ branches/banshee/stable/ext/libmtp-sharp/Functions/FileManagement.cs	Tue Jan 22 18:09:33 2008
@@ -30,7 +30,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace libmtpsharp
+namespace Mtp
 {
 	public delegate int ProgressFunction(ulong sent, ulong total, IntPtr data);
 	

Modified: branches/banshee/stable/ext/libmtp-sharp/Functions/FolderManagement.cs
==============================================================================
--- branches/banshee/stable/ext/libmtp-sharp/Functions/FolderManagement.cs	(original)
+++ branches/banshee/stable/ext/libmtp-sharp/Functions/FolderManagement.cs	Tue Jan 22 18:09:33 2008
@@ -30,7 +30,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace libmtpsharp
+namespace Mtp
 {
 	internal class FolderManagement
 	{

Modified: branches/banshee/stable/ext/libmtp-sharp/Functions/FunctionCalls.cs
==============================================================================
--- branches/banshee/stable/ext/libmtp-sharp/Functions/FunctionCalls.cs	(original)
+++ branches/banshee/stable/ext/libmtp-sharp/Functions/FunctionCalls.cs	Tue Jan 22 18:09:33 2008
@@ -30,7 +30,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace libmtpsharp
+namespace Mtp
 {
 	internal class LibMtp
 	{

Modified: branches/banshee/stable/ext/libmtp-sharp/Functions/PlaylistManagement.cs
==============================================================================
--- branches/banshee/stable/ext/libmtp-sharp/Functions/PlaylistManagement.cs	(original)
+++ branches/banshee/stable/ext/libmtp-sharp/Functions/PlaylistManagement.cs	Tue Jan 22 18:09:33 2008
@@ -30,7 +30,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace libmtpsharp
+namespace Mtp
 {
 	internal class PlaylistManagement
 	{

Modified: branches/banshee/stable/ext/libmtp-sharp/Functions/TrackManagement.cs
==============================================================================
--- branches/banshee/stable/ext/libmtp-sharp/Functions/TrackManagement.cs	(original)
+++ branches/banshee/stable/ext/libmtp-sharp/Functions/TrackManagement.cs	Tue Jan 22 18:09:33 2008
@@ -30,7 +30,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace libmtpsharp
+namespace Mtp
 {
 	internal class TrackManagement
 	{

Modified: branches/banshee/stable/ext/libmtp-sharp/Makefile.am
==============================================================================
--- branches/banshee/stable/ext/libmtp-sharp/Makefile.am	(original)
+++ branches/banshee/stable/ext/libmtp-sharp/Makefile.am	Tue Jan 22 18:09:33 2008
@@ -1,6 +1,6 @@
 include $(top_srcdir)/build/Common.Makefile 
 
-ASSEMBLY_NAME = libmtp-sharp
+ASSEMBLY_NAME = Mtp
 ASSEMBLY = $(ASSEMBLY_NAME).dll
 
 asmdir = $(pkglibdir)/Banshee.Dap

Modified: branches/banshee/stable/ext/libmtp-sharp/MtpDevice.cs
==============================================================================
--- branches/banshee/stable/ext/libmtp-sharp/MtpDevice.cs	(original)
+++ branches/banshee/stable/ext/libmtp-sharp/MtpDevice.cs	Tue Jan 22 18:09:33 2008
@@ -31,7 +31,7 @@
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 
-namespace libmtpsharp
+namespace Mtp
 {
 	public class MtpDevice : IDisposable
 	{

Modified: branches/banshee/stable/ext/libmtp-sharp/Track.cs
==============================================================================
--- branches/banshee/stable/ext/libmtp-sharp/Track.cs	(original)
+++ branches/banshee/stable/ext/libmtp-sharp/Track.cs	Tue Jan 22 18:09:33 2008
@@ -29,7 +29,7 @@
 
 using System;
 
-namespace libmtpsharp
+namespace Mtp
 {
 	public class Track
 	{

Modified: branches/banshee/stable/ext/libmtp-sharp/libmtp-sharp.mdp
==============================================================================
--- branches/banshee/stable/ext/libmtp-sharp/libmtp-sharp.mdp	(original)
+++ branches/banshee/stable/ext/libmtp-sharp/libmtp-sharp.mdp	Tue Jan 22 18:09:33 2008
@@ -1,13 +1,13 @@
 <Project name="libmtp-sharp" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="bin/Debug" assembly="libmtp-sharp" />
+      <Output directory="bin/Debug" assembly="Mtp" />
       <Build debugmode="True" target="Library" />
       <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="bin/Release" assembly="libmtp-sharp" />
+      <Output directory="bin/Release" assembly="Mtp" />
       <Build debugmode="False" target="Library" />
       <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
@@ -41,4 +41,4 @@
   <References>
     <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   </References>
-</Project>
\ No newline at end of file
+</Project>

Modified: branches/banshee/stable/src/Dap/Banshee.Dap.Mtp/Makefile.am
==============================================================================
--- branches/banshee/stable/src/Dap/Banshee.Dap.Mtp/Makefile.am	(original)
+++ branches/banshee/stable/src/Dap/Banshee.Dap.Mtp/Makefile.am	Tue Jan 22 18:09:33 2008
@@ -15,7 +15,7 @@
 endif
 
 $(ASSEMBLY): $(ASSEMBLY_SOURCES)
-	$(BUILD_LIB_BANSHEE_CORE) -out:$@ $(LINK_HAL) $(LINK_GTK) $(LINK_MONO_UNIX) -r:$(top_builddir)/ext/libmtp-sharp/libmtp-sharp.dll $(ASSEMBLY_SOURCES)
+	$(BUILD_LIB_BANSHEE_CORE) -out:$@ $(LINK_HAL) $(LINK_GTK) $(LINK_MONO_UNIX) -r:$(top_builddir)/ext/libmtp-sharp/Mtp.dll $(ASSEMBLY_SOURCES)
 
 EXTRA_DIST = $(ASSEMBLY_SOURCES)
 CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb

Modified: branches/banshee/stable/src/Dap/Banshee.Dap.Mtp/MtpDap.cs
==============================================================================
--- branches/banshee/stable/src/Dap/Banshee.Dap.Mtp/MtpDap.cs	(original)
+++ branches/banshee/stable/src/Dap/Banshee.Dap.Mtp/MtpDap.cs	Tue Jan 22 18:09:33 2008
@@ -34,15 +34,18 @@
 using System.Collections.Generic;
 using System.Text;
 using System.Threading;
+
 using Hal;
+using Mono;
+using Mono.Unix;
+using Gtk;
+
 using Banshee.Dap;
 using Banshee.Base;
 using Banshee.Widgets;
 using Banshee.Sources;
-using Mono;
-using Mono.Unix;
-using Gtk;
-using libmtpsharp;
+
+using Mtp;
 
 public static class PluginModuleEntry
 {
@@ -127,7 +130,7 @@
                     String.Format (message, Environment.NewLine, ex.InnerException.Message)
                 );
 				return InitializeResult.Invalid;
-			} catch (libmtpsharp.LibMtpException ex) {
+			} catch (LibMtpException ex) {
 
             } catch (Exception ex) {
 				ShowGeneralExceptionDialog (ex);

Modified: branches/banshee/stable/src/Dap/Banshee.Dap.Mtp/MtpDapTrackInfo.cs
==============================================================================
--- branches/banshee/stable/src/Dap/Banshee.Dap.Mtp/MtpDapTrackInfo.cs	(original)
+++ branches/banshee/stable/src/Dap/Banshee.Dap.Mtp/MtpDapTrackInfo.cs	Tue Jan 22 18:09:33 2008
@@ -28,9 +28,11 @@
 
 using System; 
 using System.IO;
+
 using Banshee.Base;
 using Banshee.Dap;
-using libmtpsharp;
+
+using Mtp;
 
 namespace Banshee.Dap.Mtp
 {
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]