Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv22262/src
Modified Files:
details.c display.h display_itdb.c display_songs.c file.c
misc_conversion.c misc_track.c
Log Message:
* src/file.c (add_coverart): handle templates better (no
"safety" substitutions of characters). Thanks to Flavio
Stanchino.
* gtkpod.glade
src/details.c
src/display.h
src/display_itdb.c
src/display_songs.c
src/file.c
src/misc_conversion.c
src/misc_track.c: Display artwork path (thanks to Flavio
Stanchino for most of the patch).
Index: details.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/details.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- details.c 4 Jul 2006 15:37:42 -0000 1.15
+++ details.c 21 Sep 2006 15:03:13 -0000 1.16
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-07-04 23:59:08 jcs>
+/* Time-stamp: <2006-09-21 23:31:59 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -596,6 +596,7 @@
case T_PODCASTRSS:
case T_PC_PATH:
case T_IPOD_PATH:
+ case T_THUMB_PATH:
case T_IPOD_ID:
case T_SIZE:
case T_TRACKLEN:
@@ -700,6 +701,7 @@
case T_PODCASTRSS:
case T_PC_PATH:
case T_IPOD_PATH:
+ case T_THUMB_PATH:
case T_IPOD_ID:
case T_SIZE:
case T_TRACKLEN:
@@ -978,8 +980,10 @@
case T_PC_PATH:
case T_IPOD_PATH:
case T_IPOD_ID:
+ case T_THUMB_PATH:
/* These are read-only only */
break;
+ break;
case T_ALL:
case T_ITEM_NUM:
/* cannot happen because of assertion above */
@@ -1147,6 +1151,7 @@
gdk_pixbuf_unref (pixbuf);
}
}
+ details_set_item (detail, detail->track, T_THUMB_PATH);
}
if (gtk_image_get_storage_type (img) == GTK_IMAGE_EMPTY)
Index: display.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display.h,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- display.h 24 Jun 2006 15:39:22 -0000 1.115
+++ display.h 21 Sep 2006 15:03:13 -0000 1.116
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-06-25 00:22:57 jcs>
+/* Time-stamp: <2006-09-21 23:12:28 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -189,6 +189,7 @@
TM_COLUMN_PODCASTRSS,
TM_COLUMN_SUBTITLE,
TM_COLUMN_TIME_RELEASED,
+ TM_COLUMN_THUMB_PATH,
TM_NUM_COLUMNS
} TM_item;
@@ -240,6 +241,7 @@
T_STOPTIME,
T_REMEMBER_PLAYBACK_POSITION,
T_SKIP_WHEN_SHUFFLING,
+ T_THUMB_PATH, /* 40 */
T_ITEM_NUM,
} T_item;
Index: display_itdb.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_itdb.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- display_itdb.c 18 Sep 2006 07:10:44 -0000 1.57
+++ display_itdb.c 21 Sep 2006 15:03:13 -0000 1.58
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-09-18 15:28:13 jcs>
+/* Time-stamp: <2006-09-21 23:56:52 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -352,7 +352,7 @@
if (result == FALSE)
{
if (filename)
- gtkpod_warning (_("Failed to set cover art: '%s'"), filename);
+ gtkpod_warning (_("Failed to set cover art: '%s'\n"), filename);
}
return result;
Index: display_songs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_songs.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- display_songs.c 23 Jun 2006 16:03:05 -0000 1.111
+++ display_songs.c 21 Sep 2006 15:03:13 -0000 1.112
@@ -1000,6 +1000,7 @@
break;
case TM_COLUMN_PC_PATH:
case TM_COLUMN_IPOD_PATH:
+ case TM_COLUMN_THUMB_PATH:
g_object_set (G_OBJECT (renderer),
"text", text,
"editable", FALSE,
@@ -1462,6 +1463,12 @@
case TM_COLUMN_IPOD_PATH:
cmp = g_utf8_collate (track1->ipod_path, track2->ipod_path);
break;
+ case TM_COLUMN_THUMB_PATH:
+ etr1 = track1->userdata;
+ etr2 = track2->userdata;
+ g_return_val_if_fail (etr1 && etr2, 0);
+ cmp = g_utf8_collate (etr1->thumb_path_utf8, etr2->thumb_path_utf8);
+ break;
case TM_COLUMN_TRANSFERRED:
if(track1->transferred == track2->transferred)
cmp = 0;
@@ -1564,6 +1571,7 @@
case TM_COLUMN_YEAR:
case TM_COLUMN_IPOD_PATH:
case TM_COLUMN_COMPILATION:
+ case TM_COLUMN_THUMB_PATH:
cmp = (compare_string_start_case_insensitive (
track_get_item (track1, TM_to_T (column)),
key) != 0);
@@ -1712,6 +1720,7 @@
case TM_COLUMN_YEAR:
case TM_COLUMN_IPOD_PATH:
case TM_COLUMN_COMPILATION:
+ case TM_COLUMN_THUMB_PATH:
gtk_tree_view_set_enable_search (GTK_TREE_VIEW (track_treeview), TRUE);
break;
case TM_COLUMN_TRACK_NR:
@@ -1905,6 +1914,7 @@
case TM_COLUMN_SUBTITLE:
case TM_COLUMN_PC_PATH:
case TM_COLUMN_IPOD_PATH:
+ case TM_COLUMN_THUMB_PATH:
case TM_COLUMN_SIZE:
break;
/* for some column names we want to use shorter alternatives to
Index: file.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/file.c,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -d -r1.186 -r1.187
--- file.c 21 Sep 2006 11:48:07 -0000 1.186
+++ file.c 21 Sep 2006 15:03:13 -0000 1.187
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-09-21 20:45:20 jcs>
+/* Time-stamp: <2006-09-21 22:56:13 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -982,11 +982,11 @@
while (*tplp && !filename_local)
{
gchar *filename_utf8;
- gchar *fname = get_string_from_template (tr, *tplp, TRUE);
+ gchar *fname = get_string_from_template (tr, *tplp, FALSE);
if (fname)
{
- if (strchr (fname, '.') != NULL)
- { /* if fname has an extension, try if it is valid */
+ if (strchr (*tplp, '.') != NULL)
+ { /* if template has an extension, try if it is valid */
filename_utf8 = g_build_filename (dirname, fname, NULL);
filename_local = charset_from_utf8 (filename_utf8);
g_free (filename_utf8);
Index: misc_conversion.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/misc_conversion.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- misc_conversion.c 17 Sep 2006 04:58:21 -0000 1.27
+++ misc_conversion.c 21 Sep 2006 15:03:13 -0000 1.28
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-09-17 13:54:43 jcs>
+/* Time-stamp: <2006-09-21 23:16:41 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -97,6 +97,7 @@
N_("Stop time"),
N_("Remember Playback Position"),
N_("Skip when Shuffling"),
+ N_("Artwork Path"), /* 40 */
NULL };
/* Tooltips for prefs window */
@@ -189,7 +190,8 @@
case TM_COLUMN_PODCASTRSS: return T_PODCASTRSS;
case TM_COLUMN_SUBTITLE: return T_SUBTITLE;
case TM_COLUMN_TIME_RELEASED: return T_TIME_RELEASED;
- case TM_NUM_COLUMNS: return -1;
+ case TM_COLUMN_THUMB_PATH: return T_THUMB_PATH;
+ case TM_NUM_COLUMNS: g_return_val_if_reached (-1);
}
return -1;
}
@@ -209,7 +211,7 @@
case ST_CAT_TITLE: return T_TITLE;
case ST_CAT_YEAR: return T_YEAR;
case ST_CAT_SPECIAL:
- case ST_CAT_NUM: return -1;
+ case ST_CAT_NUM: g_return_val_if_reached (-1);
}
return -1;
}
Index: misc_track.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/misc_track.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- misc_track.c 4 Jul 2006 15:37:42 -0000 1.50
+++ misc_track.c 21 Sep 2006 15:03:13 -0000 1.51
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-07-05 00:34:11 jcs>
+/* Time-stamp: <2006-09-21 23:51:06 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -523,6 +523,9 @@
case T_SUBTITLE:
result = &track->subtitle;
break;
+ case T_THUMB_PATH:
+ result = &etr->thumb_path_utf8;
+ break;
case T_ALL:
case T_IPOD_ID:
case T_TRACK_NR:
@@ -609,6 +612,7 @@
case T_PODCASTURL:
case T_PODCASTRSS:
case T_SUBTITLE:
+ case T_THUMB_PATH:
fritem = track_get_item (frtrack, item);
toitem_ptr = track_get_item_pointer (totrack, item);
g_return_val_if_fail (fritem, FALSE);
@@ -900,6 +904,22 @@
text = g_strdup (_("Local Database"));
}
break;
+ case T_THUMB_PATH:
+ text = g_strdup (etr->thumb_path_utf8);
+ if (!text || (strlen (text) == 0))
+ { /* no path set */
+ g_free (text);
+ text = NULL;
+ if (track->artwork && track->artwork->thumbnails)
+ { /* artwork is set */
+ text = g_strdup (_("Embedded or filename was lost"));
+ }
+ else
+ {
+ text = g_strdup (_("Artwork not set"));
+ }
+ }
+ break;
case T_SIZE:
text = g_strdup_printf ("%d", track->size);
break;
@@ -1192,6 +1212,7 @@
case T_CHECKED:
case T_ALL:
case T_ITEM_NUM:
+ case T_THUMB_PATH: // TODO: this should in fact be settable
gtkpod_warning ("Programming error: track_set_text() called with
illegal argument (item: %d)\n", item);
break;
}
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
