summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJorg Schuler <jcsjcs@users.sourceforge.net>2006-10-22 08:42:49 +0000
committerJorg Schuler <jcsjcs@users.sourceforge.net>2006-10-22 08:42:49 +0000
commit344770dd26661ef37f7b7974a6b42bb16fe5d8fa (patch)
tree67ce85b70f69e71c32957004fa399ec9dd382408
parent6c287f0f7fe8e4f0a7557a8150975ad047c80afc (diff)
downloadlibgpod-344770dd26661ef37f7b7974a6b42bb16fe5d8fa.tar.gz
libgpod-344770dd26661ef37f7b7974a6b42bb16fe5d8fa.tar.xz
libgpod-344770dd26661ef37f7b7974a6b42bb16fe5d8fa.zip
* src/itdb_playlist.c (itdb_playlist_add, itdb_playlist_add_track):
src/itdb_track.c (itdb_track_add): simplify code by using g_list_insert(). git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1328 f01d2545-417e-4e96-918e-98f8d0dbbcb6
-rw-r--r--ChangeLog6
-rw-r--r--src/itdb_playlist.c10
-rw-r--r--src/itdb_track.c5
3 files changed, 13 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 0258328..f9ed363 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2006-10-02 Jorg Schuler <jcsjcs at users.sourceforge.net>
+ * src/itdb_playlist.c (itdb_playlist_add, itdb_playlist_add_track):
+ src/itdb_track.c (itdb_track_add): simplify code by using
+ g_list_insert().
+
+2006-10-02 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
* tests/Makefile.am
tests/test-init-ipod.c: fix compilation error when building with
--disable-gdk-pixbuf. Thanks to David Philippi and Christophe
diff --git a/src/itdb_playlist.c b/src/itdb_playlist.c
index b6c5d9a..0ed0060 100644
--- a/src/itdb_playlist.c
+++ b/src/itdb_playlist.c
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-09-23 21:25:39 jcs>
+/* Time-stamp: <2006-10-22 17:42:28 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -1232,8 +1232,9 @@ void itdb_playlist_add (Itdb_iTunesDB *itdb, Itdb_Playlist *pl, gint32 pos)
}
if (pl->sortorder == 0) pl->sortorder = ITDB_PSO_MANUAL;
if (pl->timestamp == 0) pl->timestamp = itdb_time_get_mac_time ();
- if (pos == -1) itdb->playlists = g_list_append (itdb->playlists, pl);
- else itdb->playlists = g_list_insert (itdb->playlists, pl, pos);
+
+ /* pos == -1 appends at the end of the list */
+ itdb->playlists = g_list_insert (itdb->playlists, pl, pos);
}
@@ -1335,8 +1336,7 @@ void itdb_playlist_add_track (Itdb_Playlist *pl,
track->itdb = pl->itdb;
- if (pos == -1) pl->members = g_list_append (pl->members, track);
- else pl->members = g_list_insert (pl->members, track, pos);
+ pl->members = g_list_insert (pl->members, track, pos);
}
diff --git a/src/itdb_track.c b/src/itdb_track.c
index e304e30..1d3d2e0 100644
--- a/src/itdb_track.c
+++ b/src/itdb_track.c
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-09-18 01:33:31 jcs>
+/* Time-stamp: <2006-10-22 17:42:23 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -234,8 +234,7 @@ void itdb_track_add (Itdb_iTunesDB *itdb, Itdb_Track *track, gint32 pos)
itdb_track_set_defaults (track);
- if (pos == -1) itdb->tracks = g_list_append (itdb->tracks, track);
- else itdb->tracks = g_list_insert (itdb->tracks, track, pos);
+ itdb->tracks = g_list_insert (itdb->tracks, track, pos);
}
/**