Revision: 2260
http://gtkpod.svn.sourceforge.net/gtkpod/?rev=2260&view=rev
Author: jcsjcs
Date: 2009-02-24 13:56:26 +0000 (Tue, 24 Feb 2009)
Log Message:
-----------
* src/display_tracks.c (tm_data_compare)
src/misc_track.c (track_get_text):
Use faster but less convenient code in switch()
statements. Thanks to Javier Kohen for the patch.
Modified Paths:
--------------
gtkpod/trunk/ChangeLog
gtkpod/trunk/src/display_tracks.c
gtkpod/trunk/src/misc_track.c
Modified: gtkpod/trunk/ChangeLog
===================================================================
--- gtkpod/trunk/ChangeLog 2009-02-24 13:43:56 UTC (rev 2259)
+++ gtkpod/trunk/ChangeLog 2009-02-24 13:56:26 UTC (rev 2260)
@@ -1,12 +1,19 @@
2009-02-24 Jorg Schuler <jcsjcs at users.sourceforge.net>
- * src/display_sorttabs.c (st_remove_all_entries_from_model)
+ * src/display_tracks.c (tm_data_compare)
+ src/misc_track.c (track_get_text):
+ Use faster but less convenient code in switch()
+ statements. Thanks to Javier Kohen for the patch.
+
+2009-02-24 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * src/display_sorttabs.c (st_remove_all_entries_from_model):
Faster code to remove all entries in the filter
entries. Thanks to Javier Kohen for the patch.
2009-02-24 Jorg Schuler <jcsjcs at users.sourceforge.net>
- * src/display_tracks.c (tm_remove_all_tracks)
+ * src/display_tracks.c (tm_remove_all_tracks):
Faster code to remove all tracks. Thanks to Javier Kohen
for the patch.
Modified: gtkpod/trunk/src/display_tracks.c
===================================================================
--- gtkpod/trunk/src/display_tracks.c 2009-02-24 13:43:56 UTC (rev 2259)
+++ gtkpod/trunk/src/display_tracks.c 2009-02-24 13:56:26 UTC (rev 2260)
@@ -1700,37 +1700,80 @@
g_return_val_if_fail (track1 && track2, 0);
+ /* 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. */
switch (tm_item)
{
case TM_COLUMN_TITLE:
+ cmp = string_compare_func (track1->title, track2->title);
+ break;
case TM_COLUMN_ALBUM:
+ cmp = string_compare_func (track1->album, track2->album);
+ break;
case TM_COLUMN_ALBUMARTIST:
+ cmp = string_compare_func (track1->albumartist, track2->albumartist);
+ break;
case TM_COLUMN_GENRE:
+ cmp = string_compare_func (track1->genre, track2->genre);
+ break;
case TM_COLUMN_COMPOSER:
+ cmp = string_compare_func (track1->composer, track2->composer);
+ break;
case TM_COLUMN_COMMENT:
+ cmp = string_compare_func (track1->comment, track2->comment);
+ break;
case TM_COLUMN_FILETYPE:
+ cmp = string_compare_func (track1->filetype, track2->filetype);
+ break;
case TM_COLUMN_GROUPING:
+ cmp = string_compare_func (track1->grouping, track2->grouping);
+ break;
case TM_COLUMN_ARTIST:
+ cmp = string_compare_func (track1->artist, track2->artist);
+ break;
case TM_COLUMN_CATEGORY:
+ cmp = string_compare_func (track1->category, track2->category);
+ break;
case TM_COLUMN_DESCRIPTION:
+ cmp = string_compare_func (track1->description, track2->description);
+ break;
case TM_COLUMN_PODCASTURL:
+ cmp = string_compare_func (track1->podcasturl, track2->podcasturl);
+ break;
case TM_COLUMN_PODCASTRSS:
+ cmp = string_compare_func (track1->podcastrss, track2->podcastrss);
+ break;
case TM_COLUMN_SUBTITLE:
+ cmp = string_compare_func (track1->subtitle, track2->subtitle);
+ break;
case TM_COLUMN_TV_SHOW:
+ cmp = string_compare_func (track1->tvshow, track2->tvshow);
+ break;
case TM_COLUMN_TV_EPISODE:
+ cmp = string_compare_func (track1->tvepisode, track2->tvepisode);
+ break;
case TM_COLUMN_TV_NETWORK:
+ cmp = string_compare_func (track1->tvnetwork, track2->tvnetwork);
+ break;
case TM_COLUMN_SORT_TITLE:
+ cmp = string_compare_func (track1->sort_title, track2->sort_title);
+ break;
case TM_COLUMN_SORT_ALBUM:
+ cmp = string_compare_func (track1->sort_album, track2->sort_album);
+ break;
case TM_COLUMN_SORT_ARTIST:
+ cmp = string_compare_func (track1->sort_artist, track2->sort_artist);
+ break;
case TM_COLUMN_SORT_ALBUMARTIST:
+ cmp = string_compare_func (track1->sort_albumartist,
+ track2->sort_albumartist);
+ break;
case TM_COLUMN_SORT_COMPOSER:
+ cmp = string_compare_func (track1->sort_composer, track2->sort_composer);
+ break;
case TM_COLUMN_SORT_TVSHOW:
- /* 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. */
- cmp = string_compare_func (
- track_get_item (track1, TM_to_T (tm_item)),
- track_get_item (track2, TM_to_T (tm_item)));
+ cmp = string_compare_func (track1->sort_tvshow, track2->sort_tvshow);
break;
case TM_COLUMN_TRACK_NR:
cmp = track1->tracks - track2->tracks;
Modified: gtkpod/trunk/src/misc_track.c
===================================================================
--- gtkpod/trunk/src/misc_track.c 2009-02-24 13:43:56 UTC (rev 2259)
+++ gtkpod/trunk/src/misc_track.c 2009-02-24 13:56:26 UTC (rev 2260)
@@ -1291,29 +1291,73 @@
switch (item)
{
case T_TITLE:
+ text = g_strdup (track->title);
+ break;
case T_ARTIST:
+ text = g_strdup (track->artist);
+ break;
case T_ALBUM:
+ text = g_strdup (track->album);
+ break;
case T_GENRE:
+ text = g_strdup (track->genre);
+ break;
case T_COMPOSER:
+ text = g_strdup (track->composer);
+ break;
case T_COMMENT:
+ text = g_strdup (track->comment);
+ break;
case T_FILETYPE:
+ text = g_strdup (track->filetype);
+ break;
case T_GROUPING:
+ text = g_strdup (track->grouping);
+ break;
case T_CATEGORY:
+ text = g_strdup (track->category);
+ break;
case T_DESCRIPTION:
+ text = g_strdup (track->description);
+ break;
case T_PODCASTURL:
+ text = g_strdup (track->podcasturl);
+ break;
case T_PODCASTRSS:
+ text = g_strdup (track->podcastrss);
+ break;
case T_SUBTITLE:
+ text = g_strdup (track->subtitle);
+ break;
case T_TV_SHOW:
+ text = g_strdup (track->tvshow);
+ break;
case T_TV_EPISODE:
+ text = g_strdup (track->tvepisode);
+ break;
case T_TV_NETWORK:
+ text = g_strdup (track->tvnetwork);
+ break;
case T_ALBUMARTIST:
+ text = g_strdup (track->albumartist);
+ break;
case T_SORT_ARTIST:
+ text = g_strdup (track->sort_artist);
+ break;
case T_SORT_TITLE:
+ text = g_strdup (track->sort_title);
+ break;
case T_SORT_ALBUM:
+ text = g_strdup (track->sort_album);
+ break;
case T_SORT_ALBUMARTIST:
+ text = g_strdup (track->sort_albumartist);
+ break;
case T_SORT_COMPOSER:
+ text = g_strdup (track->sort_composer);
+ break;
case T_SORT_TVSHOW:
- text = g_strdup (track_get_item (track, item));
+ text = g_strdup (track->sort_tvshow);
break;
case T_TRACK_NR:
if (track->tracks == 0)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
