Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv21544/src
Modified Files:
file.c prefs.c prefs.h prefs_window.c
Log Message:
Moved parsetags_overwrite to new prefs.
Index: file.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/file.c,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -d -r1.168 -r1.169
--- file.c 11 Jun 2006 01:04:10 -0000 1.168
+++ file.c 11 Jun 2006 01:41:31 -0000 1.169
@@ -522,7 +522,7 @@
{
case 'a': /* artist */
if (track &&
- (!track->artist || prefs_get_parsetags_overwrite ()))
+ (!track->artist ||
prefs_get_int("parsetags_overwrite")))
{
g_free (track->artist);
track->artist = itm;
@@ -530,7 +530,7 @@
break;
case 'A': /* album */
if (track &&
- (!track->album || prefs_get_parsetags_overwrite ()))
+ (!track->album || prefs_get_int("parsetags_overwrite")))
{
g_free (track->album);
track->album = itm;
@@ -538,7 +538,7 @@
break;
case 'c': /* composer */
if (track &&
- (!track->composer || prefs_get_parsetags_overwrite ()))
+ (!track->composer ||
prefs_get_int("parsetags_overwrite")))
{
g_free (track->composer);
track->composer = itm;
@@ -546,7 +546,7 @@
break;
case 't': /* title */
if (track &&
- (!track->title || prefs_get_parsetags_overwrite ()))
+ (!track->title || prefs_get_int("parsetags_overwrite")))
{
g_free (track->title);
track->title = itm;
@@ -555,7 +555,7 @@
case 'g': /* genre */
case 'G': /* genre */
if (track &&
- (!track->genre || prefs_get_parsetags_overwrite ()))
+ (!track->genre || prefs_get_int("parsetags_overwrite")))
{
g_free (track->genre);
track->genre = itm;
@@ -564,19 +564,19 @@
case 'T': /* track */
if (track &&
((track->track_nr == 0) ||
- prefs_get_parsetags_overwrite ()))
+ prefs_get_int("parsetags_overwrite")))
track->track_nr = atoi (itm);
g_free (itm);
break;
case 'C': /* CD */
if (track &&
- (track->cd_nr == 0 || prefs_get_parsetags_overwrite ()))
+ (track->cd_nr == 0 ||
prefs_get_int("parsetags_overwrite")))
track->cd_nr = atoi (itm);
g_free (itm);
break;
case 'Y': /* year */
if (track &&
- (track->year == 0 || prefs_get_parsetags_overwrite ()))
+ (track->year == 0 ||
prefs_get_int("parsetags_overwrite")))
track->year = atoi (itm);
g_free (itm);
break;
Index: prefs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.c,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -d -r1.221 -r1.222
--- prefs.c 11 Jun 2006 01:04:10 -0000 1.221
+++ prefs.c 11 Jun 2006 01:41:31 -0000 1.222
@@ -218,6 +218,7 @@
prefs_set_int("readtags", TRUE);
prefs_set_int("write_extended_info", TRUE);
prefs_set_int("parsetags", FALSE);
+ prefs_set_int("parsetags_overwrite", FALSE);
}
/* Initialize default variable-length list entries */
@@ -1776,7 +1777,6 @@
mycfg->md5tracks = TRUE;
mycfg->block_display = FALSE;
mycfg->offline = FALSE;
- mycfg->parsetags_overwrite = FALSE;
mycfg->parsetags_template = g_strdup ("%a - %A/%T %t.mp3;%t.wav");
mycfg->coverart = TRUE;
mycfg->coverart_template = g_strdup ("%A;folder.jpg");
@@ -1971,10 +1971,6 @@
{
prefs_set_block_display((gboolean)atoi(arg));
}
- else if(g_ascii_strcasecmp (line, "parsetags_overwrite") == 0)
- {
- prefs_set_parsetags_overwrite((gboolean)atoi(arg));
- }
else if(g_ascii_strcasecmp (line, "parsetags_template") == 0)
{
prefs_set_parsetags_template(strdup(arg));
@@ -2293,7 +2289,6 @@
}
fprintf(fp, "md5=%d\n",prefs_get_md5tracks ());
fprintf(fp, "block_display=%d\n",prefs_get_block_display());
- fprintf(fp, "parsetags_overwrite=%d\n", prefs_get_parsetags_overwrite());
fprintf(fp, "parsetags_template=%s\n",cfg->parsetags_template);
fprintf(fp, "coverart=%d\n", prefs_get_coverart());
fprintf(fp, "coverart_template=%s\n",cfg->coverart_template);
@@ -2515,16 +2510,6 @@
return cfgdir;
}
-void prefs_set_parsetags_overwrite(gboolean active)
-{
- cfg->parsetags_overwrite = active;
-}
-
-gboolean prefs_get_parsetags_overwrite(void)
-{
- return cfg->parsetags_overwrite;
-}
-
const gchar *prefs_get_parsetags_template (void)
{
return cfg->parsetags_template;
Index: prefs.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.h,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -d -r1.146 -r1.147
--- prefs.h 11 Jun 2006 01:04:10 -0000 1.146
+++ prefs.h 11 Jun 2006 01:41:31 -0000 1.147
@@ -111,7 +111,6 @@
gboolean offline; /* are we working offline, i.e. without iPod? */
gchar *parsetags_template; /* template for parsing tags */
- gboolean parsetags_overwrite; /* Overwrite tags already set? */
gboolean coverart; /* Read coverart when adding files? */
gchar *coverart_template; /* template for coverart filename */
Index: prefs_window.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs_window.c,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -d -r1.142 -r1.143
--- prefs_window.c 11 Jun 2006 01:04:10 -0000 1.142
+++ prefs_window.c 11 Jun 2006 01:41:31 -0000 1.143
@@ -561,7 +561,7 @@
w = gtkpod_xml_get_widget (prefs_window_xml, "parsetags_overwrite");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
- tmpcfg->parsetags_overwrite);
+ prefs_get_int("parsetags_overwrite"));
gtk_widget_set_sensitive (w, prefs_get_int("parsetags"));
w = gtkpod_xml_get_widget (prefs_window_xml, "parsetags_template");
@@ -705,7 +705,6 @@
tm_store_col_order ();
prefs_set_charset(tmpcfg->charset);
- prefs_set_parsetags_overwrite(tmpcfg->parsetags_overwrite);
prefs_set_parsetags_template(tmpcfg->parsetags_template);
prefs_set_coverart(tmpcfg->coverart);
prefs_set_coverart_template(tmpcfg->coverart_template);
@@ -1162,8 +1161,8 @@
on_parsetags_overwrite_toggled (GtkToggleButton *togglebutton,
gpointer user_data)
{
- tmpcfg->parsetags_overwrite =
- gtk_toggle_button_get_active(togglebutton);
+ temp_prefs_set_int(temp_prefs, "parsetags_overwrite",
+ gtk_toggle_button_get_active(togglebutton));
}
void
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
