Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18317/src
Modified Files:
display_itdb.c file.c file_itunesdb.c misc_track.c
misc_track.h
Log Message:
* file.c: strip whitespace when getting tags from filename
via template.
* take care of flag1/2/3/4 when adding and removing podcasts,
normal tracks...
Index: display_itdb.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_itdb.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- display_itdb.c 12 Nov 2005 16:54:15 -0000 1.34
+++ display_itdb.c 13 Nov 2005 07:34:34 -0000 1.35
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-11-13 01:39:07 jcs>
+/* Time-stamp: <2005-11-13 16:29:00 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -209,6 +209,7 @@
Track *track = itdb_track_new ();
/* Add ExtraTrackData */
gp_track_add_extra (track);
+ gp_track_set_flags_default (track);
return track;
}
@@ -507,6 +508,10 @@
{
remove_track = TRUE;
}
+ else
+ { /* strip the podcast flags */
+ gp_track_set_flags_default (track);
+ }
}
if (itdb_playlist_is_mpl (plitem))
Index: file.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/file.c,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -d -r1.145 -r1.146
--- file.c 12 Nov 2005 16:54:15 -0000 1.145
+++ file.c 13 Nov 2005 07:34:34 -0000 1.146
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-11-12 23:38:13 jcs>
+/* Time-stamp: <2005-11-13 16:29:27 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -426,7 +426,7 @@
#ifdef DEBUG
printf ("%s: '%s'\n", token, fnp);
#endif
- itm = g_strdup (fnp);
+ itm = g_strstrip (g_strdup (fnp));
switch (token[1])
{
case 'a': /* artist */
@@ -1883,6 +1883,10 @@
added_track = gp_track_add (itdb, track);
g_return_val_if_fail (added_track, FALSE);
+ /* set flags to 'podcast' if adding to podcast list */
+ if (itdb_playlist_is_podcasts (plitem))
+ gp_track_set_flags_podcast (added_track);
+
if (addtrackfunc)
{
if (itdb_playlist_is_mpl (plitem))
Index: file_itunesdb.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/file_itunesdb.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- file_itunesdb.c 12 Nov 2005 09:22:14 -0000 1.67
+++ file_itunesdb.c 13 Nov 2005 07:34:34 -0000 1.68
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-11-12 18:10:50 jcs>
+/* Time-stamp: <2005-11-13 16:21:35 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -577,6 +577,9 @@
g_return_val_if_fail (track, (release_widgets(), NULL));
fill_in_extended_info (track, total, num);
gp_track_validate_entries (track);
+ /* set new default value for flag1 (unknown) */
+ if (track->flag1 == 0)
+ track->flag1 = 0x02;
++num;
}
/* take over the pending deletion information */
Index: misc_track.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/misc_track.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- misc_track.c 12 Nov 2005 16:54:15 -0000 1.28
+++ misc_track.c 13 Nov 2005 07:34:34 -0000 1.29
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-11-12 23:57:26 jcs>
+/* Time-stamp: <2005-11-13 16:29:42 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -647,6 +647,11 @@
/* printf ("add tr %p to pl: %p\n", track, pl); */
if (from_itdb == to_itdb)
{ /* DND within the same itdb */
+
+ /* set flags to 'podcast' if adding to podcast list */
+ if (itdb_playlist_is_podcasts (pl))
+ gp_track_set_flags_podcast (track);
+
if (!itdb_playlist_contains_track (to_mpl, track))
{ /* add to MPL if not already present (will happen
* if dragged from the podcasts playlist */
@@ -669,6 +674,10 @@
existing track is returned and @duptr is freed */
addtr = gp_track_add (to_itdb, duptr);
+ /* set flags to 'podcast' if adding to podcast list */
+ if (itdb_playlist_is_podcasts (pl))
+ gp_track_set_flags_podcast (addtr);
+
if (addtr == duptr)
{ /* no duplicate */
/* we need to add to the MPL if the track is no
@@ -875,6 +884,33 @@
return NULL;
}
+/*------------------------------------------------------------------*\
+ * *
+ * Functions setting default values on tracks *
+ * *
+\*------------------------------------------------------------------*/
+
+/* set podcast-specific flags for @track */
+void gp_track_set_flags_podcast (Track *track)
+{
+ g_return_if_fail (track);
+ track->flag1 = 0x02; /* unknown */
+ track->flag2 = 0x01; /* skip when shuffling */
+ track->flag3 = 0x01; /* remember playback position */
+ track->flag4 = 0x01; /* Show Title/Album on the 'Now Playing' page */
+}
+
+/* set podcast-specific flags for @track */
+void gp_track_set_flags_default (Track *track)
+{
+ g_return_if_fail (track);
+ track->flag1 = 0x02; /* unknown */
+ track->flag2 = 0x00; /* do not skip when shuffling */
+ track->flag3 = 0x00; /* do not remember playback position */
+ track->flag4 = 0x00; /* Show Title/Album/Artist on the 'Now
+ Playing' page */
+}
+
/*------------------------------------------------------------------*\
* *
Index: misc_track.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/misc_track.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- misc_track.h 17 Jun 2005 13:30:04 -0000 1.11
+++ misc_track.h 13 Nov 2005 07:34:34 -0000 1.12
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-06-17 22:12:14 jcs>
+/* Time-stamp: <2005-11-13 16:28:33 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -56,5 +56,7 @@
void gp_do_selected_entry (void (*do_func)(GList *tracks), gint inst);
void gp_do_selected_playlist (void (*do_func)(GList *tracks));
+void gp_track_set_flags_podcast (Track *track);
+void gp_track_set_flags_default (Track *track);
#endif
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
gtkpod-cvs2 mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
