rhythmbox r5930 - in trunk: . plugins/mtpdevice

[jmatthew svn gnome org]

Author: jmatthew
Date: Thu Sep 18 11:09:27 2008
New Revision: 5930
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=5930&view=rev

Log:
2008-09-18  Jonathan Matthew  <jonathan d14n org>

	* plugins/mtpdevice/rb-mtp-source.c: (impl_delete),
	(rb_mtp_source_transfer_track_to_disk),
	(rb_mtp_source_get_playback_uri), (transfer_track):
	Add some useful debug output


Modified:
   trunk/ChangeLog
   trunk/plugins/mtpdevice/rb-mtp-source.c

Modified: trunk/plugins/mtpdevice/rb-mtp-source.c
==============================================================================
--- trunk/plugins/mtpdevice/rb-mtp-source.c	(original)
+++ trunk/plugins/mtpdevice/rb-mtp-source.c	Thu Sep 18 11:09:27 2008
@@ -526,7 +526,7 @@
 		uri = rhythmdb_entry_get_string (entry, RHYTHMDB_PROP_LOCATION);
 		track = g_hash_table_lookup (priv->entry_map, entry);
 		if (track == NULL) {
-			rb_debug ("Couldn't find track on mtp-device! (%s)\n", uri);
+			rb_debug ("Couldn't find track on mtp-device! (%s)", uri);
 			continue;
 		}
 
@@ -536,7 +536,7 @@
 			LIBMTP_destroy_track_t (track);
 			rhythmdb_entry_delete (db, entry);
 		} else {
-			rb_debug ("Delete track failed");
+			rb_debug ("Delete track %d failed", track->item_id);
 		}
 	}
 	rhythmdb_commit (db);
@@ -583,10 +583,12 @@
 	}
 
 	if (rb_check_dir_has_space_uri (uri, track->filesize) == FALSE) {
+		rb_debug ("not enough space to transfer track %d to %s", track->item_id, uri);
 		return FALSE;
 	}
 
 	ret = LIBMTP_Get_Track_To_File (device, track->item_id, uri, NULL, NULL);
+	rb_debug ("LIBMTP_Get_Track_To_File(%d, %s) returned %d", track->item_id, uri, ret);
 
 	return (ret == 0);
 }
@@ -610,6 +612,9 @@
 	g_free (path);
 
 	if (rb_mtp_source_transfer_track_to_disk (priv->device, track, uri) == TRUE) {
+		rb_debug ("playback URI for %s: %s",
+			  rhythmdb_entry_get_string (entry, RHYTHMDB_PROP_LOCATION),
+			  uri);
 		return uri;
 	} else {
 		g_free (uri);
@@ -684,6 +689,7 @@
 {
 	LIBMTP_track_t *trackmeta = LIBMTP_new_track_t ();
 	GDate d;
+	int ret;
 
 	trackmeta->title = rhythmdb_entry_dup_string (entry, RHYTHMDB_PROP_TITLE);
 	trackmeta->album = rhythmdb_entry_dup_string (entry, RHYTHMDB_PROP_ALBUM);
@@ -707,12 +713,13 @@
 	}
 
 #ifdef HAVE_LIBMTP_030
-	if (LIBMTP_Send_Track_From_File (device, filename, trackmeta, NULL, NULL) != 0) {
+	ret = LIBMTP_Send_Track_From_File (device, filename, trackmeta, NULL, NULL);
 #else
-	if (LIBMTP_Send_Track_From_File (device, filename, trackmeta, NULL, NULL, 0) != 0) {
+	ret = LIBMTP_Send_Track_From_File (device, filename, trackmeta, NULL, NULL, 0);
 #endif
+	rb_debug ("LIBMTP_Send_Track_From_File (%s) returned %d", filename, ret);
+	if (ret != 0) {
 		LIBMTP_destroy_track_t (trackmeta);
-		rb_debug ("Tracktransfer failed\n");
 		return NULL;
 	}