Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv16506/src
Modified Files:
display_itdb.c md5.c md5.h misc_track.c prefs.c prefs.h
prefs_window.c
Log Message:
Moved md5 to new prefs.
Index: display_itdb.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_itdb.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- display_itdb.c 4 Jun 2006 16:27:32 -0000 1.53
+++ display_itdb.c 21 Jun 2006 04:50:09 -0000 1.54
@@ -838,9 +838,6 @@
}
}
- /* set md5 */
- prefs_set_md5tracks (prefs_get_md5tracks ());
-
g_free (cfgdir);
}
Index: md5.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/md5.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- md5.c 17 May 2006 13:18:58 -0000 1.42
+++ md5.c 21 Jun 2006 04:50:09 -0000 1.43
@@ -45,6 +45,8 @@
#include "file.h"
#include "prefs.h"
#include "misc.h"
+#include "misc_track.h"
+#include "display.h"
#include "display_itdb.h"
@@ -90,6 +92,30 @@
#define NR_PATH_MAX_BLOCKS 4
#define PATH_MAX_MD5 4096
+/* Set up or destory the md5 hash table */
+void setup_md5(gboolean active)
+{
+ struct itdbs_head *itdbs_head;
+
+ g_return_if_fail (gtkpod_window);
+ itdbs_head = g_object_get_data (G_OBJECT (gtkpod_window),
+ "itdbs_head");
+
+ /* gets called before itdbs are set up -> fail silently */
+ if (itdbs_head)
+ {
+ if (active) /* MD5 hashing turned on */
+ {
+ gp_md5_hash_tracks();
+
+ /* Display duplicates */
+ gp_duplicate_remove(NULL, NULL);
+ }
+ else
+ gp_md5_free_hash();
+ }
+}
+
/**
* get_filesize_for_file_descriptor - get the filesize on disk for the given
* file descriptor
@@ -272,7 +298,7 @@
etr = s->userdata;
g_return_val_if_fail (etr, NULL);
- if (prefs_get_md5tracks ())
+ if (prefs_get_int("md5"))
{
if (eitdb->md5hash == NULL)
{
@@ -315,7 +341,7 @@
eitdb = itdb->userdata;
g_return_val_if_fail (eitdb, NULL);
- if (prefs_get_md5tracks() && eitdb->md5hash)
+ if (prefs_get_int("md5") && eitdb->md5hash)
{
gchar *val = md5_hash_track (s);
if (val)
@@ -343,7 +369,7 @@
eitdb = itdb->userdata;
g_return_val_if_fail (eitdb, NULL);
- if (prefs_get_md5tracks() && eitdb->md5hash)
+ if (prefs_get_int("md5") && eitdb->md5hash)
{
gchar *val = md5_hash_on_filename (file, silent);
if (val)
@@ -372,7 +398,7 @@
eitdb = itdb->userdata;
g_return_val_if_fail (eitdb, NULL);
- if (prefs_get_md5tracks() && eitdb->md5hash)
+ if (prefs_get_int("md5") && eitdb->md5hash)
{
track = g_hash_table_lookup (eitdb->md5hash, md5);
}
@@ -392,7 +418,7 @@
eitdb = s->itdb->userdata;
g_return_if_fail (eitdb);
- if (prefs_get_md5tracks() && eitdb->md5hash)
+ if (prefs_get_int("md5") && eitdb->md5hash)
{
gchar *val = md5_hash_track (s);
if (val)
@@ -538,3 +564,5 @@
}
}
#endif
+
+
Index: md5.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/md5.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- md5.h 17 Jun 2005 13:30:03 -0000 1.20
+++ md5.h 21 Jun 2006 04:50:09 -0000 1.21
@@ -33,6 +33,7 @@
#include "display_itdb.h"
+void setup_md5(gboolean active);
gchar *md5_hash_on_filename (gchar *name, gboolean silent);
/* Any calls to the following functions immediately return if md5sums
* is not on */
@@ -43,4 +44,5 @@
void md5_track_remove (Track *s);
void md5_free (iTunesDB *itdb);
void md5_free_eitdb (ExtraiTunesDBData *eitdb);
+
#endif
Index: misc_track.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/misc_track.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- misc_track.c 20 Jun 2006 04:44:57 -0000 1.47
+++ misc_track.c 21 Jun 2006 04:50:09 -0000 1.48
@@ -60,7 +60,7 @@
g_return_if_fail (itdb);
- if (!prefs_get_md5tracks ()) return;
+ if (!prefs_get_int("md5")) return;
ns = itdb_tracks_number (itdb); /* number of tracks */
if (ns == 0) return;
@@ -342,7 +342,7 @@
g_return_if_fail (itdb);
- if (!prefs_get_md5tracks ()) return;
+ if (!prefs_get_int("md5")) return;
ns = itdb_tracks_number (itdb);
if (ns == 0) return;
Index: prefs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.c,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -d -r1.255 -r1.256
--- prefs.c 21 Jun 2006 00:12:05 -0000 1.255
+++ prefs.c 21 Jun 2006 04:50:09 -0000 1.256
@@ -261,6 +261,7 @@
prefs_set_int("toolbar_style", GTK_TOOLBAR_BOTH);
prefs_set_int("block_display", FALSE);
prefs_set_string("charset", "");
+ prefs_set_int("md5", TRUE);
/* Set sorting prefs */
prefs_set_int("case_sensitive", FALSE);
@@ -1867,7 +1868,6 @@
g_free (dir);
}
- mycfg->md5tracks = TRUE;
mycfg->offline = FALSE;
g_free (cfgdir);
@@ -1979,10 +1979,6 @@
{
/* obsoleted since 0.71 */
}
- else if(g_ascii_strcasecmp (line, "md5") == 0)
- {
- prefs_set_md5tracks((gboolean)atoi(arg));
- }
else if(g_ascii_strcasecmp (line, "offline") == 0)
{
prefs_set_offline((gboolean)atoi(arg));
@@ -2169,7 +2165,6 @@
if(!fp)
fp = stderr;
- fprintf(fp, "md5=%d\n",prefs_get_md5tracks ());
fprintf(fp, "offline=%d\n",prefs_get_offline());
}
@@ -2223,43 +2218,6 @@
info_update_totals_view_space ();
}
-/* If the status of md5 hash flag changes, free or re-init the md5
- hash table */
-void prefs_set_md5tracks (gboolean active)
-{
- struct itdbs_head *itdbs_head;
-
- g_return_if_fail (gtkpod_window);
- itdbs_head = g_object_get_data (G_OBJECT (gtkpod_window),
- "itdbs_head");
-/* g_return_if_fail (itdbs_head);*/
- /* gets called before itdbs are set up -> fail silently */
- if (!itdbs_head)
- {
- cfg->md5tracks = active;
- return;
- }
-
- if (cfg->md5tracks && !active)
- { /* md5 checksums have been turned off */
- cfg->md5tracks = FALSE;
- gp_md5_free_hash ();
- }
- if (!cfg->md5tracks && active)
- { /* md5 checksums have been turned on */
- cfg->md5tracks = TRUE; /* must be set before calling
- gp_md5_hash_tracks() */
- gp_md5_hash_tracks ();
- /* display duplicates */
- gp_duplicate_remove (NULL, NULL);
- }
-}
-
-gboolean prefs_get_md5tracks(void)
-{
- return cfg->md5tracks;
-}
-
gboolean prefs_get_offline(void)
{
return cfg->offline;
Index: prefs.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.h,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -d -r1.182 -r1.183
--- prefs.h 21 Jun 2006 00:12:05 -0000 1.182
+++ prefs.h 21 Jun 2006 04:50:09 -0000 1.183
@@ -59,7 +59,6 @@
struct cfg
{
- gboolean md5tracks; /* don't allow track duplication on your ipod */
gboolean offline; /* are we working offline, i.e. without iPod? */
float version; /* version of gtkpod writing the cfg file */
@@ -200,9 +199,6 @@
gboolean read_prefs_old (GtkWidget *gtkpod, int argc, char *argv[]);
void prefs_set_offline(gboolean active);
-void prefs_set_md5tracks(gboolean active);
-
gboolean prefs_get_offline(void);
-gboolean prefs_get_md5tracks(void);
#endif
Index: prefs_window.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs_window.c,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -d -r1.175 -r1.176
--- prefs_window.c 20 Jun 2006 23:25:31 -0000 1.175
+++ prefs_window.c 21 Jun 2006 04:50:09 -0000 1.176
@@ -34,6 +34,7 @@
#include "display_itdb.h"
#include "info.h"
#include "fileselection.h"
+#include "md5.h"
#include "misc.h"
#include "misc_track.h"
#include "prefs.h"
@@ -374,7 +375,7 @@
w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_md5tracks");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
- tmpcfg->md5tracks);
+ prefs_get_int("md5"));
w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_update_existing");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
@@ -383,7 +384,7 @@
w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_show_duplicates");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
prefs_get_int("show_duplicates"));
- if (!tmpcfg->md5tracks) gtk_widget_set_sensitive (w, FALSE);
+ if (!prefs_get_int("md5")) gtk_widget_set_sensitive (w, FALSE);
w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_show_updated");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
@@ -682,27 +683,34 @@
static void
prefs_window_set(void)
{
- if (temp_prefs)
- {
- /* Update the display if we changed the number of sort tabs */
- if (temp_prefs_get_int_value(temp_prefs, "sort_tab_num", NULL))
- st_show_visible();
- }
-
- if (tmpcfg)
+ gboolean md5active;
+
+ if (temp_prefs)
{
- /* Need this in case user reordered column order (we don't
- * catch the reorder signal) */
- tm_store_col_order ();
+ /* Update the display if we changed the number of sort tabs */
+ if (temp_prefs_get_int_value(temp_prefs, "sort_tab_num", NULL))
+ st_show_visible();
- /* this call well automatically destroy/setup the md5 hash table */
- prefs_set_md5tracks(tmpcfg->md5tracks);
- tm_show_preferred_columns();
- st_show_visible();
- display_show_hide_tooltips();
- display_show_hide_toolbar();
-
+ /* Free/re-initialize the md5 tabe if the setting was changed */
+ if (temp_prefs_get_int_value(temp_prefs, "md5", &md5active))
+ setup_md5(md5active);
}
+
+
+ /* Need this in case user reordered column order (we don't
+ * catch the reorder signal) */
+ tm_store_col_order ();
+
+ /* update columns if user reordered them */
+ tm_show_preferred_columns();
+
+ /* update sort tab display */
+ st_show_visible();
+
+ /* update tooltip/toolbar displays */
+ display_show_hide_tooltips();
+ display_show_hide_toolbar();
+
}
@@ -932,7 +940,7 @@
gboolean val = gtk_toggle_button_get_active(togglebutton);
GtkWidget *w = gtkpod_xml_get_widget (prefs_window_xml,
"cfg_show_duplicates");
- tmpcfg->md5tracks = val;
+ temp_prefs_set_int(temp_prefs, "md5", val);
if(w) gtk_widget_set_sensitive (w, val);
}
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
