Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv8090/src
Modified Files:
file.c prefs.c prefs.h prefs_window.c
Log Message:
Moved parsetags_template to new prefs.
Index: file.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/file.c,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -d -r1.169 -r1.170
--- file.c 11 Jun 2006 01:41:31 -0000 1.169
+++ file.c 11 Jun 2006 05:10:20 -0000 1.170
@@ -624,19 +624,19 @@
}
/* parse the filename of @track and extract the tags as specified in
- prefs_get_parsetags_template(). Several templates can be separated
+ prefs_get_string("parsetags_template"). Several templates can be separated
with the "," character. */
static void parse_filename (Track *track)
{
ExtraTrackData *etr;
- const gchar *template;
+ gchar *template;
gchar **templates, **tplp;
g_return_if_fail (track);
etr = track->userdata;
g_return_if_fail (etr);
- template = prefs_get_parsetags_template ();
+ template = prefs_get_string("parsetags_template");
if (!template) return;
templates = g_strsplit (template, ";", 0);
tplp = templates;
@@ -648,6 +648,7 @@
}
if (*tplp) parse_filename_with_template (track, etr->pc_path_utf8, *tplp);
g_strfreev (templates);
+ g_free(template);
}
/* Set entry "column" (TM_COLUMN_TITLE etc) according to filename */
Index: prefs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.c,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -d -r1.222 -r1.223
--- prefs.c 11 Jun 2006 01:41:31 -0000 1.222
+++ prefs.c 11 Jun 2006 05:10:20 -0000 1.223
@@ -219,6 +219,7 @@
prefs_set_int("write_extended_info", TRUE);
prefs_set_int("parsetags", FALSE);
prefs_set_int("parsetags_overwrite", FALSE);
+ prefs_set_string("parsetags_template", "%a - %A/%T %t.mp3;%t.wav");
}
/* Initialize default variable-length list entries */
@@ -1777,7 +1778,6 @@
mycfg->md5tracks = TRUE;
mycfg->block_display = FALSE;
mycfg->offline = FALSE;
- mycfg->parsetags_template = g_strdup ("%a - %A/%T %t.mp3;%t.wav");
mycfg->coverart = TRUE;
mycfg->coverart_template = g_strdup ("%A;folder.jpg");
mycfg->display_toolbar = TRUE;
@@ -1971,10 +1971,6 @@
{
prefs_set_block_display((gboolean)atoi(arg));
}
- else if(g_ascii_strcasecmp (line, "parsetags_template") == 0)
- {
- prefs_set_parsetags_template(strdup(arg));
- }
else if(g_ascii_strcasecmp (line, "coverart") == 0)
{
prefs_set_coverart((gboolean)atoi(arg));
@@ -2289,7 +2285,6 @@
}
fprintf(fp, "md5=%d\n",prefs_get_md5tracks ());
fprintf(fp, "block_display=%d\n",prefs_get_block_display());
- 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);
fprintf(fp, "group_compilations=%d\n",prefs_get_group_compilations());
@@ -2463,7 +2458,6 @@
{
result = g_memdup (cfg, sizeof (struct cfg));
result->charset = g_strdup(cfg->charset);
- result->parsetags_template = g_strdup(cfg->parsetags_template);
result->coverart_template = g_strdup(cfg->coverart_template);
result->mserv_username = g_strdup(cfg->mserv_username);
}
@@ -2510,20 +2504,6 @@
return cfgdir;
}
-const gchar *prefs_get_parsetags_template (void)
-{
- return cfg->parsetags_template;
-}
-
-void prefs_set_parsetags_template (const gchar *tpl)
-{
- if (tpl)
- {
- g_free(cfg->parsetags_template);
- cfg->parsetags_template = g_strdup (tpl);
- }
-}
-
void prefs_set_coverart(gboolean active)
{
cfg->coverart = active;
@@ -2928,5 +2908,3 @@
{
return cfg->mserv_username;
}
-
-
Index: prefs.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.h,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- prefs.h 11 Jun 2006 03:19:23 -0000 1.148
+++ prefs.h 11 Jun 2006 05:10:20 -0000 1.149
@@ -287,10 +287,6 @@
void prefs_set_tm_autostore (gboolean active);
void prefs_set_md5tracks(gboolean active);
void prefs_set_block_display(gboolean active);
-void prefs_set_parsetags_overwrite (gboolean active);
-gboolean prefs_get_parsetags_overwrite(void);
-void prefs_set_parsetags_template (const gchar *tpl);
-const gchar *prefs_get_parsetags_template (void);
void prefs_set_coverart (gboolean active);
gboolean prefs_get_coverart(void);
void prefs_set_coverart_template (const gchar *tpl);
Index: prefs_window.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs_window.c,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -d -r1.143 -r1.144
--- prefs_window.c 11 Jun 2006 01:41:31 -0000 1.143
+++ prefs_window.c 11 Jun 2006 05:10:20 -0000 1.144
@@ -278,6 +278,7 @@
GtkWidget *w = NULL;
GtkTooltips *tt;
GtkTooltipsData *tooltipsdata;
+ gchar *buf = NULL;
/* List of standard toggle widget names */
const gchar *toggle_widget_names[] = {
"sync_confirm_dirs_toggle",
@@ -482,7 +483,6 @@
w = gtkpod_xml_get_widget (prefs_window_xml, "autoselect_hbox");
for (i=0; i<SORT_TAB_MAX; ++i)
{
- gchar *buf;
GtkWidget *as;
gint padding;
@@ -534,7 +534,6 @@
for (i=0; i<TM_NUM_TAGS_PREFS; ++i)
{
- gchar *buf;
buf = g_strdup_printf ("tag_autoset%d", i);
if((w = gtkpod_xml_get_widget (prefs_window_xml, buf)))
{
@@ -565,15 +564,10 @@
gtk_widget_set_sensitive (w, prefs_get_int("parsetags"));
w = gtkpod_xml_get_widget (prefs_window_xml, "parsetags_template");
- if (tmpcfg->parsetags_template)
- { /* we should copy the new path first because by setting
- the text we might get a callback destroying the old
- value... */
- gchar *buf = g_strdup (tmpcfg->parsetags_template);
- gtk_entry_set_text(GTK_ENTRY(w), buf);
- g_free (buf);
- }
gtk_widget_set_sensitive (w, prefs_get_int("parsetags"));
+ buf = prefs_get_string("parsetags_template");
+ gtk_entry_set_text(GTK_ENTRY(w), buf);
+ g_free(buf);
w = gtkpod_xml_get_widget (prefs_window_xml, "coverart");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
@@ -584,7 +578,7 @@
{ /* we should copy the new path first because by setting
the text we might get a callback destroying the old
value... */
- gchar *buf = g_strdup (tmpcfg->coverart_template);
+ buf = g_strdup (tmpcfg->coverart_template);
gtk_entry_set_text(GTK_ENTRY(w), buf);
g_free (buf);
}
@@ -592,7 +586,7 @@
for (i=0; i<TM_NUM_COLUMNS; ++i)
{
- gchar *buf = g_strdup_printf ("col_visible%d", i);
+ buf = g_strdup_printf ("col_visible%d", i);
if((w = gtkpod_xml_get_widget (prefs_window_xml, buf)))
{
/* set label */
@@ -705,7 +699,6 @@
tm_store_col_order ();
prefs_set_charset(tmpcfg->charset);
- prefs_set_parsetags_template(tmpcfg->parsetags_template);
prefs_set_coverart(tmpcfg->coverart);
prefs_set_coverart_template(tmpcfg->coverart_template);
@@ -1169,8 +1162,8 @@
on_parsetags_template_changed (GtkEditable *editable,
gpointer user_data)
{
- g_free (tmpcfg->parsetags_template);
- tmpcfg->parsetags_template = gtk_editable_get_chars (editable,0, -1);
+ temp_prefs_set_string(temp_prefs, "parsetags_template",
+ gtk_editable_get_chars (editable,0, -1));
}
void
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
