Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv25616/src
Modified Files:
display.h display_tracks.c misc_conversion.c misc_track.c
Log Message:
* gtkpod.glade
src/display.h
src/display_tracks.c
src/misc_conversion.c
src/misc_track.c: Patch by Mario Rossi to allow editing of
TV show metadata and media type. Big thanks!
* configure.in: require libgpod >= 0.4.2
Index: display.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display.h,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -d -r1.118 -r1.119
--- display.h 16 Jan 2007 14:08:55 -0000 1.118
+++ display.h 4 Feb 2007 12:43:49 -0000 1.119
@@ -190,6 +190,12 @@
TM_COLUMN_SUBTITLE,
TM_COLUMN_TIME_RELEASED,
TM_COLUMN_THUMB_PATH,
+ TM_COLUMN_MEDIA_TYPE, /* 35 */
+ TM_COLUMN_TV_SHOW,
+ TM_COLUMN_TV_EPISODE,
+ TM_COLUMN_TV_NETWORK,
+ TM_COLUMN_SEASON_NR,
+ TM_COLUMN_EPISODE_NR, /* 40 */
TM_NUM_COLUMNS
} TM_item;
Index: display_tracks.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_tracks.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- display_tracks.c 16 Jan 2007 09:44:59 -0000 1.115
+++ display_tracks.c 4 Feb 2007 12:43:49 -0000 1.116
@@ -855,6 +855,12 @@
case TM_COLUMN_BITRATE:
case TM_COLUMN_SAMPLERATE:
case TM_COLUMN_BPM:
+ case TM_COLUMN_MEDIA_TYPE:
+ case TM_COLUMN_TV_SHOW:
+ case TM_COLUMN_TV_EPISODE:
+ case TM_COLUMN_TV_NETWORK:
+ case TM_COLUMN_SEASON_NR:
+ case TM_COLUMN_EPISODE_NR:
changed = track_set_text (track, new_text, TM_to_T (column));
if (changed && (column == TM_COLUMN_TRACKLEN))
{ /* be on the safe side and reset starttime, stoptime and
@@ -970,11 +976,20 @@
case TM_COLUMN_TIME_MODIFIED:
case TM_COLUMN_TIME_ADDED:
case TM_COLUMN_TIME_RELEASED:
+ case TM_COLUMN_TV_SHOW:
+ case TM_COLUMN_TV_EPISODE:
+ case TM_COLUMN_TV_NETWORK:
g_object_set (G_OBJECT (renderer),
"text", text,
"editable", TRUE,
"xalign", 0.0, NULL);
break;
+ case TM_COLUMN_MEDIA_TYPE:
+ g_object_set (G_OBJECT (renderer),
+ "text", text,
+ "editable", FALSE,
+ "xalign", 0.0, NULL);
+ break;
case TM_COLUMN_TRACK_NR:
case TM_COLUMN_CD_NR:
case TM_COLUMN_BITRATE:
@@ -986,6 +1001,8 @@
case TM_COLUMN_VOLUME:
case TM_COLUMN_SOUNDCHECK:
case TM_COLUMN_TRACKLEN:
+ case TM_COLUMN_SEASON_NR:
+ case TM_COLUMN_EPISODE_NR:
g_object_set (G_OBJECT (renderer),
"text", text,
"editable", TRUE,
@@ -1429,6 +1446,9 @@
case TM_COLUMN_PODCASTURL:
case TM_COLUMN_PODCASTRSS:
case TM_COLUMN_SUBTITLE:
+ case TM_COLUMN_TV_SHOW:
+ case TM_COLUMN_TV_EPISODE:
+ case TM_COLUMN_TV_NETWORK:
/* string_compare_func is set to either compare_string_fuzzy or
compare_string in tm_sort_column_changed() which is called
once before the comparing begins. */
@@ -1517,6 +1537,15 @@
case TM_COLUMN_YEAR:
cmp = track1->year - track2->year;
break;
+ case TM_COLUMN_SEASON_NR:
+ cmp = track1->season_nr - track2->season_nr;
+ break;
+ case TM_COLUMN_EPISODE_NR:
+ cmp = track1->episode_nr - track2->episode_nr;
+ break;
+ case TM_COLUMN_MEDIA_TYPE:
+ cmp = track1->mediatype - track2->mediatype;
+ break;
default:
g_warning ("Programming error: tm_data_compare_func: no sort method for
tm_item %d\n", tm_item);
break;
@@ -1586,6 +1615,12 @@
case TM_COLUMN_SAMPLERATE:
case TM_COLUMN_BPM:
case TM_COLUMN_TIME_RELEASED:
+ case TM_COLUMN_MEDIA_TYPE:
+ case TM_COLUMN_TV_SHOW:
+ case TM_COLUMN_TV_EPISODE:
+ case TM_COLUMN_TV_NETWORK:
+ case TM_COLUMN_SEASON_NR:
+ case TM_COLUMN_EPISODE_NR:
case TM_NUM_COLUMNS:
g_warning ("Programming error: tm_search_equal_func: no sort method for
column %d\n", column);
break;
@@ -1733,6 +1768,12 @@
case TM_COLUMN_SAMPLERATE:
case TM_COLUMN_BPM:
case TM_COLUMN_TIME_RELEASED:
+ case TM_COLUMN_MEDIA_TYPE:
+ case TM_COLUMN_TV_SHOW:
+ case TM_COLUMN_TV_EPISODE:
+ case TM_COLUMN_TV_NETWORK:
+ case TM_COLUMN_SEASON_NR:
+ case TM_COLUMN_EPISODE_NR:
case TM_NUM_COLUMNS:
gtk_tree_view_set_enable_search (GTK_TREE_VIEW (track_treeview), FALSE);
break;
@@ -1909,6 +1950,12 @@
case TM_COLUMN_IPOD_PATH:
case TM_COLUMN_THUMB_PATH:
case TM_COLUMN_SIZE:
+ case TM_COLUMN_MEDIA_TYPE:
+ case TM_COLUMN_TV_SHOW:
+ case TM_COLUMN_TV_EPISODE:
+ case TM_COLUMN_TV_NETWORK:
+ case TM_COLUMN_SEASON_NR:
+ case TM_COLUMN_EPISODE_NR:
break;
/* for some column names we want to use shorter alternatives to
get_tm_string() */
Index: misc_conversion.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/misc_conversion.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- misc_conversion.c 16 Jan 2007 14:08:56 -0000 1.30
+++ misc_conversion.c 4 Feb 2007 12:43:49 -0000 1.31
@@ -203,6 +203,12 @@
case TM_COLUMN_SUBTITLE: return T_SUBTITLE;
case TM_COLUMN_TIME_RELEASED: return T_TIME_RELEASED;
case TM_COLUMN_THUMB_PATH: return T_THUMB_PATH;
+ case TM_COLUMN_MEDIA_TYPE: return T_MEDIA_TYPE;
+ case TM_COLUMN_TV_SHOW: return T_TV_SHOW;
+ case TM_COLUMN_TV_EPISODE: return T_TV_EPISODE;
+ case TM_COLUMN_TV_NETWORK: return T_TV_NETWORK;
+ case TM_COLUMN_SEASON_NR: return T_SEASON_NR;
+ case TM_COLUMN_EPISODE_NR: return T_EPISODE_NR;
case TM_NUM_COLUMNS: 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.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- misc_track.c 16 Jan 2007 14:08:56 -0000 1.56
+++ misc_track.c 4 Feb 2007 12:43:49 -0000 1.57
@@ -1271,13 +1271,6 @@
}
break;
case T_MEDIA_TYPE:
- nr = atoi (new_text);
- if ((nr >= 0) && (nr != track->mediatype))
- {
- track->mediatype = nr;
- changed = TRUE;
- }
- break;
case T_PC_PATH:
case T_IPOD_PATH:
case T_IPOD_ID:
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
