Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv9959/src
Modified Files:
date_parser2.l display.h display_playlists.c
display_sorttabs.c display_spl.c display_tracks.c file.c
lastfm.c misc_conversion.c misc_track.c misc_track.h syncdir.c
Log Message:
* src/date_parser2.l
src/display.h
src/display_playlists.c
src/display_sorttabs.c
src/display_spl.c
src/display_tracks.c
src/file.c
src/lastfm.c
src/misc_conversion.c
src/misc_track.c
src/misc_track.h
src/syncdir.c: removed references to itdb_time_...()
functions that are obsoleted.
Index: date_parser2.l
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/date_parser2.l,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- date_parser2.l 18 Jan 2007 16:54:07 -0000 1.12
+++ date_parser2.l 27 Apr 2007 15:19:53 -0000 1.13
@@ -1,7 +1,6 @@
/* -*- mode: c -*-
-| Time-stamp: <2007-01-19 01:52:29 jcs>
|
-| Copyright (C) 2002-2003 Jorg Schuler <jcsjcs at users.sourceforge.net>
+| Copyright (C) 2002-2007 Jorg Schuler <jcsjcs at users.sourceforge.net>
| Part of the gtkpod project.
|
| URL: http://gtkpod.sourceforge.net/
@@ -225,9 +224,9 @@
{ /* no error occurred -> set the information accordingly */
ti->valid = TRUE;
if (dp_int_type & INT_NO_LOWER) ti->lower = 0;
- else ti->lower = itdb_time_host_to_mac (lower_stamp);
+ else ti->lower = lower_stamp;
if (dp_int_type & INT_NO_UPPER) ti->upper = -1; /* -1 = 2^32-1 */
- else ti->upper = itdb_time_host_to_mac (upper_stamp);
+ else ti->upper = upper_stamp;
}
#if DP_DEBUG
printf ("valid: %d, int_type: %d, lower: %u, upper: %u\n",
Index: display.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display.h,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- display.h 1 Apr 2007 04:27:55 -0000 1.123
+++ display.h 27 Apr 2007 15:19:53 -0000 1.124
@@ -1,6 +1,5 @@
-/* Time-stamp: <2007-03-29 23:22:15 jcs>
-|
-| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
+/*
+| Copyright (C) 2002-2007 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
|
| URL: http://www.gtkpod.org/
@@ -100,8 +99,8 @@
typedef struct {
gchar *int_str; /* copy of string specified in the sort tab */
gboolean valid; /* is current string valid? */
- guint32 lower; /* MAC timestamp for lower limit */
- guint32 upper; /* MAC timestamp for upper limit ("-1": no limit) */
+ time_t lower; /* timestamp for lower limit */
+ time_t upper; /* timestamp for upper limit ("-1": no limit) */
GtkWidget *entry; /* pointer to GtkEntry in sort tab */
GtkWidget *active;/* pointer to toggle button */
} TimeInfo;
@@ -320,9 +319,6 @@
void sp_go (guint32 inst);
void sp_conditions_changed (guint32 inst);
-TimeInfo *sp_update_date_interval_from_string (guint32 inst,
- T_item item,
- gboolean force_update);
void tm_add_track_to_track_model (Track *track, GtkTreeIter *into_iter);
gint tm_get_nr_of_tracks(void);
void tm_rows_reordered(void);
Index: display_playlists.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_playlists.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- display_playlists.c 22 Apr 2007 18:06:16 -0000 1.102
+++ display_playlists.c 27 Apr 2007 15:19:53 -0000 1.103
@@ -1,5 +1,4 @@
-/* Time-stamp: <2007-03-30 21:55:44 jcs>
-|
+/*
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
|
Index: display_sorttabs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_sorttabs.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- display_sorttabs.c 22 Apr 2007 18:06:16 -0000 1.92
+++ display_sorttabs.c 27 Apr 2007 15:19:53 -0000 1.93
@@ -1,5 +1,4 @@
-/* Time-stamp: <2007-03-19 23:29:07 jcs>
-|
+/*
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
|
@@ -53,6 +52,9 @@
static void sp_store_sp_entries (gint inst);
static void st_page_selected (GtkNotebook *notebook, guint page);
static void st_create_notebook (gint inst);
+static TimeInfo *sp_update_date_interval_from_string (guint32 inst,
+ T_item item,
+ gboolean force_update);
/* Drag and drop definitions */
static GtkTargetEntry st_drag_types [] = {
@@ -384,9 +386,9 @@
message again, if necessary */
/* Return value: pointer to the corresponding TimeInfo struct (for
convenience) or NULL if error occurred */
-TimeInfo *sp_update_date_interval_from_string (guint32 inst,
- T_item item,
- gboolean force_update)
+static TimeInfo *sp_update_date_interval_from_string (guint32 inst,
+ T_item item,
+ gboolean force_update)
{
SortTab *st;
TimeInfo *ti;
@@ -2242,7 +2244,7 @@
g_free (*itemp_utf8);
*itemp_utf8 = g_strdup (new_text);
}
- track->time_modified = itdb_time_get_mac_time ();
+ track->time_modified = time (NULL);
pm_track_changed (track);
/* If prefs say to write changes to file, do so */
if (prefs_get_int("id3_write"))
@@ -3241,16 +3243,16 @@
GtkSpinButton *hour,
GtkSpinButton *min,
GtkToggleButton *no_margin,
- guint32 mactime)
+ time_t timet)
{
struct tm *tm;
time_t tt = time (NULL);
/* 0, -1 are treated in a special way (no lower/upper margin
* -> set calendar to current time */
- if ((mactime != 0) && (mactime != -1))
+ if ((timet != 0) && (timet != -1))
{
- tt = itdb_time_mac_to_host (mactime);
+ tt = timet;
if (no_margin) gtk_toggle_button_set_active (no_margin, FALSE);
}
else if (no_margin) gtk_toggle_button_set_active (no_margin, TRUE);
@@ -3270,7 +3272,7 @@
}
-static void cal_set_time (GtkWidget *cal, MarginType type, guint32 mactime)
+static void cal_set_time (GtkWidget *cal, MarginType type, time_t timet)
{
GtkCalendar *calendar = NULL;
GtkSpinButton *hour = NULL;
@@ -3292,7 +3294,7 @@
no_margin = GTK_TOGGLE_BUTTON (gtkpod_xml_get_widget (cal_xml,
"no_upper_margin"));
break;
}
- cal_set_time_widgets (calendar, hour, min, no_margin, mactime);
+ cal_set_time_widgets (calendar, hour, min, no_margin, timet);
}
Index: display_spl.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_spl.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- display_spl.c 26 Feb 2007 13:11:27 -0000 1.21
+++ display_spl.c 27 Apr 2007 15:19:53 -0000 1.22
@@ -1,6 +1,5 @@
-/* Time-stamp: <2007-02-26 22:07:30 jcs>
-|
-| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users.sourceforge.net>
+/*
+| Copyright (C) 2002-2007 Jorg Schuler <jcsjcs at users.sourceforge.net>
| Part of the gtkpod project.
|
| URL: http://gtkpod.sourceforge.net/
@@ -645,7 +644,7 @@
case spl_ET_FROMVALUE_DATE:
t = time_string_to_fromtime (str);
if (t != -1)
- splr->fromvalue = itdb_time_host_to_mac (t);
+ splr->fromvalue = t;
break;
case spl_ET_FROMDATE:
splr->fromdate = atol (str);
@@ -660,7 +659,7 @@
case spl_ET_TOVALUE_DATE:
t = time_string_to_totime (str);
if (t != -1)
- splr->tovalue = itdb_time_host_to_mac (t);
+ splr->tovalue = t;
break;
case spl_ET_TODATE:
splr->todate = atol (str);
@@ -983,7 +982,7 @@
g_return_if_fail (str != NULL);
- t = itdb_time_mac_to_host (value);
+ t = (time_t)value;
if (et == spl_ET_FROMVALUE_DATE)
{
resstr = time_fromtime_to_string (t);
Index: display_tracks.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_tracks.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- display_tracks.c 18 Mar 2007 14:27:18 -0000 1.119
+++ display_tracks.c 27 Apr 2007 15:19:53 -0000 1.120
@@ -1,6 +1,5 @@
-/* Time-stamp: <2007-03-18 21:34:22 jcs>
-|
-| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
+/*
+| Copyright (C) 2002-2007 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
|
| URL: http://www.gtkpod.org/
@@ -901,7 +900,7 @@
/* printf (" changed: %d\n", changed); */
if (changed)
{
- track->time_modified = itdb_time_get_mac_time ();
+ track->time_modified = time (NULL);
pm_track_changed (track); /* notify playlist model... */
data_changed (track->itdb); /* indicate that data has changed */
@@ -1108,7 +1107,7 @@
/* printf (" changed: %d\n", changed); */
if (changed)
{
- track->time_modified = itdb_time_get_mac_time ();
+ track->time_modified = time (NULL);
/* pm_track_changed (track); notify playlist model... -- not
* necessary here because only the track model is affected */
data_changed (track->itdb); /* indicate that data has changed */
Index: file.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/file.c,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -d -r1.199 -r1.200
--- file.c 23 Apr 2007 15:33:31 -0000 1.199
+++ file.c 27 Apr 2007 15:19:53 -0000 1.200
@@ -1213,9 +1213,9 @@
}
/* Set modification date to the files modified date */
- nti->time_modified = itdb_time_host_to_mac(enti->mtime);
+ nti->time_modified = enti->mtime;
/* Set added date to *now* */
- nti->time_added = itdb_time_get_mac_time ();
+ nti->time_added = time (NULL);
/* Make sure all strings are initialized -- that way we don't
have to worry about it when we are handling the
@@ -2080,7 +2080,12 @@
case SOURCE_PREFER_LOCAL:
result = get_file_name_from_source (track, SOURCE_LOCAL);
if (!result)
- result = get_file_name_from_source (track, SOURCE_IPOD);
+ {
+ if (track->itdb && (track->itdb->usertype & GP_ITDB_TYPE_IPOD))
+ {
+ result = get_file_name_from_source (track, SOURCE_IPOD);
+ }
+ }
break;
case SOURCE_PREFER_IPOD:
result = get_file_name_from_source (track, SOURCE_IPOD);
Index: lastfm.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/lastfm.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- lastfm.c 24 Nov 2006 06:44:03 -0000 1.2
+++ lastfm.c 27 Apr 2007 15:19:53 -0000 1.3
@@ -1,6 +1,5 @@
-/* Time-stamp: <2006-11-17 17:27:06 jcs>
-|
-| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
+/*
+| Copyright (C) 2002-2007 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
|
| URL: http://www.gtkpod.org/
@@ -153,9 +152,9 @@
#ifdef HAVE_CURL
GString *tr = g_string_new(NULL);
gint32 length = (track->tracklen) / 100.0;
- guint32 time = (track->time_played) - 2082844800;
- g_string_printf(tr, "artist=%s&track=%s&album=%s&length=%d&time=%d\n",
- track->artist, track->title, track->album, length, time);
+ time_t timet = track->time_played;
+ g_string_printf(tr, "artist=%s&track=%s&album=%s&length=%d&time=%ld\n",
+ track->artist, track->title, track->album, length,
(long)timet);
tracks = g_slist_prepend(tracks, tr);
g_string_free(tr, TRUE);
#endif
Index: misc_conversion.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/misc_conversion.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- misc_conversion.c 4 Feb 2007 12:43:49 -0000 1.31
+++ misc_conversion.c 27 Apr 2007 15:19:53 -0000 1.32
@@ -1,6 +1,5 @@
-/* Time-stamp: <2007-01-16 14:08:05 jcs>
-|
-| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
+/*
+| Copyright (C) 2002-2007 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
|
| URL: http://www.gtkpod.org/
@@ -482,7 +481,7 @@
mactime = 0;
break;
}
- return (itdb_time_mac_to_host (mactime));
+ return mactime;
}
@@ -494,23 +493,23 @@
/* get the timestamp TM_COLUMN_TIME_CREATE/PLAYED/MODIFIED/RELEASED */
-void time_set_time (Track *track, time_t time, T_item t_item)
+void time_set_time (Track *track, time_t timet, T_item t_item)
{
- guint32 mactime = itdb_time_host_to_mac (time);
+ g_return_if_fail (track);
- if (track) switch (t_item)
+ switch (t_item)
{
case T_TIME_ADDED:
- track->time_added = mactime;
+ track->time_added = timet;
break;
case T_TIME_PLAYED:
- track->time_played = mactime;
+ track->time_played = timet;
break;
case T_TIME_MODIFIED:
- track->time_modified = mactime;
+ track->time_modified = timet;
break;
case T_TIME_RELEASED:
- track->time_released = mactime;
+ track->time_released = timet;
break;
default:
break;
Index: misc_track.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/misc_track.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- misc_track.c 23 Apr 2007 15:33:31 -0000 1.64
+++ misc_track.c 27 Apr 2007 15:19:53 -0000 1.65
@@ -1160,7 +1160,7 @@
/* return a pointer to the specified timestamp. @t_item is one of (the
applicable) T_* defined in track.h. If the parameters are illegal,
"0" is returned. */
-guint32 *track_get_timestamp_ptr (Track *track, T_item t_item)
+time_t *track_get_timestamp_ptr (Track *track, T_item t_item)
{
g_return_val_if_fail (track, NULL);
@@ -1183,9 +1183,9 @@
/* return the specified timestamp. @t_item is one of
(the * applicable) T_* defined in track.h. If the parameters are
illegal, "0" is returned. */
-guint32 track_get_timestamp (Track *track, T_item t_item)
+time_t track_get_timestamp (Track *track, T_item t_item)
{
- guint32 *ptr;
+ time_t *ptr;
g_return_val_if_fail (track, 0);
ptr = track_get_timestamp_ptr (track, t_item);
Index: misc_track.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/misc_track.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- misc_track.h 23 Apr 2007 15:33:31 -0000 1.19
+++ misc_track.h 27 Apr 2007 15:19:54 -0000 1.20
@@ -52,8 +52,8 @@
gchar **track_get_item_pointer (Track *track, T_item t_item);
const gchar *track_get_item (Track *track, T_item t_item);
-guint32 *track_get_timestamp_ptr (Track *track, T_item t_item);
-guint32 track_get_timestamp (Track *track, T_item t_item);
+time_t *track_get_timestamp_ptr (Track *track, T_item t_item);
+time_t track_get_timestamp (Track *track, T_item t_item);
gchar *track_get_text (Track *track, T_item item);
gboolean track_set_text (Track *track,
const gchar *new_text, T_item item);
Index: syncdir.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/syncdir.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- syncdir.c 16 Jan 2007 09:45:00 -0000 1.8
+++ syncdir.c 27 Apr 2007 15:19:54 -0000 1.9
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-09-24 15:25:27 jcs>
+/* Time-stamp: <2007-04-28 00:06:00 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -473,7 +473,7 @@
{
GHashTable *dirs_hash;
gboolean delete_tracks, is_mpl;
- guint64 current_time;
+ time_t current_time;
GList *tracks_to_delete_from_ipod = NULL;
GList *tracks_to_delete_from_playlist = NULL;
GList *tracks_updated = NULL;
@@ -557,7 +557,7 @@
/* current_time can be used to recognize newly added/updated
tracks */
- current_time = itdb_time_get_mac_time ();
+ current_time = time (NULL);
/* Add all files in all directories entered into dirs_hash */
afd.playlist = playlist;
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
