View | Details | Raw Unified
Collapse All | Expand All

(-) banshee-1-1.2.1.old/build/m4/banshee/dap-mtp.m4 (-1 / +1 lines)
 Lines 1-6    Link Here  
AC_DEFUN([BANSHEE_CHECK_DAP_MTP],
AC_DEFUN([BANSHEE_CHECK_DAP_MTP],
[
[
	LIBMTP_REQUIRED=0.2.0
 
	LIBMTP_REQUIRED=0.3.0
 

        
	AC_ARG_ENABLE(mtp, AC_HELP_STRING([--disable-mtp], [Disable MTP DAP support]), , enable_mtp="yes")
	AC_ARG_ENABLE(mtp, AC_HELP_STRING([--disable-mtp], [Disable MTP DAP support]), , enable_mtp="yes")

        
	
	



(-) banshee-1-1.2.1.old/src/Libraries/Mtp/Mtp/Album.cs
      (-2 / +4 lines)




  

    

    

       Lines 131-137
       
    
  Link Here 
    

  

        
            if (saved) {
            if (saved) {

        
                saved = LIBMTP_Update_Album (device.Handle, ref album) == 0;
                saved = LIBMTP_Update_Album (device.Handle, ref album) == 0;

        
            } else {
            } else {

            

              
                saved = LIBMTP_Create_New_Album (device.Handle, ref album, 0) == 0;

              
                saved = LIBMTP_Create_New_Album (device.Handle, ref album) == 0;

            

        
            }
            }

        

        
            if (album.tracks != IntPtr.Zero) {
            if (album.tracks != IntPtr.Zero) {

  

    

    

       Lines 211-217
       
    
  Link Here 
    

  

        
		internal static extern IntPtr LIBMTP_Get_Album (MtpDeviceHandle handle, uint albumId); // LIBMTP_album_t*
		internal static extern IntPtr LIBMTP_Get_Album (MtpDeviceHandle handle, uint albumId); // LIBMTP_album_t*

        

        
		[DllImport("libmtp.dll")]
		[DllImport("libmtp.dll")]

            

              
		internal static extern int LIBMTP_Create_New_Album (MtpDeviceHandle handle, ref AlbumStruct album, uint parentId);

              
		internal static extern int LIBMTP_Create_New_Album (MtpDeviceHandle handle, ref AlbumStruct album);

            

        

        
		[DllImport("libmtp.dll")]
		[DllImport("libmtp.dll")]

        
		internal static extern int LIBMTP_Update_Album (MtpDeviceHandle handle, ref AlbumStruct album);
		internal static extern int LIBMTP_Update_Album (MtpDeviceHandle handle, ref AlbumStruct album);

  

    

    

       Lines 221-226
       
    
  Link Here 
    

  

        
    internal struct AlbumStruct
    internal struct AlbumStruct

        
    {
    {

        
        public uint album_id;
        public uint album_id;

            

              
              
	public uint parent_id;

            

            

              
              
	public uint storage_id;

            

        

        
        [MarshalAs(UnmanagedType.LPStr)]
        [MarshalAs(UnmanagedType.LPStr)]

        
        public string name;
        public string name;



(-) banshee-1-1.2.1.old/src/Libraries/Mtp/Mtp/Folder.cs
      (+1 lines)




  

    

    

       Lines 210-215
       
    
  Link Here 
    

  

        
	{
	{

        
		public uint folder_id;
		public uint folder_id;

        
		public uint parent_id;
		public uint parent_id;

            

              
              
		public uint storage_id;

            

        
		[MarshalAs(UnmanagedType.LPStr)] public string name;
		[MarshalAs(UnmanagedType.LPStr)] public string name;

        
		public IntPtr sibling; // LIBMTP_folder_t*
		public IntPtr sibling; // LIBMTP_folder_t*

        
		public IntPtr child;   // LIBMTP_folder_t*
		public IntPtr child;   // LIBMTP_folder_t*



(-) banshee-1-1.2.1.old/src/Libraries/Mtp/Mtp/Track.cs
      (-3 / +4 lines)




  

    

    

       Lines 195-201
       
    
  Link Here 
    

  

        

        
		internal static void SendTrack (MtpDeviceHandle handle, string path, ref TrackStruct metadata, ProgressFunction callback, IntPtr data, uint parent)
		internal static void SendTrack (MtpDeviceHandle handle, string path, ref TrackStruct metadata, ProgressFunction callback, IntPtr data, uint parent)

        
		{
		{

            

              
			if (LIBMTP_Send_Track_From_File (handle, path, ref metadata, callback, data, parent) != 0)

              
			if (LIBMTP_Send_Track_From_File (handle, path, ref metadata, callback, data) != 0)

            

        
			{
			{

        
				LibMtpException.CheckErrorStack (handle);
				LibMtpException.CheckErrorStack (handle);

        
				throw new LibMtpException (ErrorCode.General, "Could not upload the track");
				throw new LibMtpException (ErrorCode.General, "Could not upload the track");

  

    

    

       Lines 227-233
       
    
  Link Here 
    

  

        
		private static extern int LIBMTP_Get_Track_To_File (MtpDeviceHandle handle, uint trackId, string path, ProgressFunction callback, IntPtr data);
		private static extern int LIBMTP_Get_Track_To_File (MtpDeviceHandle handle, uint trackId, string path, ProgressFunction callback, IntPtr data);

        

        
		[DllImport("libmtp.dll")]
		[DllImport("libmtp.dll")]

            

              
		private static extern int LIBMTP_Send_Track_From_File (MtpDeviceHandle handle, string path, ref TrackStruct track, ProgressFunction callback, IntPtr data, uint parentHandle);

              
		private static extern int LIBMTP_Send_Track_From_File (MtpDeviceHandle handle, string path, ref TrackStruct track, ProgressFunction callback, IntPtr data);

            

        

        
		[DllImport("libmtp.dll")]
		[DllImport("libmtp.dll")]

        
	    private static extern int LIBMTP_Update_Track_Metadata (MtpDeviceHandle handle, ref TrackStruct metadata);
	    private static extern int LIBMTP_Update_Track_Metadata (MtpDeviceHandle handle, ref TrackStruct metadata);

  

    

    

       Lines 244-250
       
    
  Link Here 
    

  

        
	{
	{

        
		public uint item_id;
		public uint item_id;

        
		public uint parent_id;
		public uint parent_id;

            

              
		

              
		public uint storage_id;

            

            

              

              

            

        
		[MarshalAs(UnmanagedType.LPStr)] public string title;
		[MarshalAs(UnmanagedType.LPStr)] public string title;

        
		[MarshalAs(UnmanagedType.LPStr)] public string artist;
		[MarshalAs(UnmanagedType.LPStr)] public string artist;

        
		[MarshalAs(UnmanagedType.LPStr)] public string genre;
		[MarshalAs(UnmanagedType.LPStr)] public string genre;