Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv31750/src
Modified Files:
mp3file.c mp4file.c prefs.c prefs.h prefs_window.c
Log Message:
Moved readtags to new prefs.
Index: mp3file.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/mp3file.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- mp3file.c 10 Jun 2006 16:56:49 -0000 1.66
+++ mp3file.c 10 Jun 2006 23:22:00 -0000 1.67
@@ -2077,7 +2077,7 @@
}
track = gp_track_new ();
- if (prefs_get_readtags() && (id3_tag_read (name, &filetag) == TRUE))
+ if (prefs_get_int("readtags") && (id3_tag_read (name, &filetag) == TRUE))
{
track->filetype = g_strdup ("MPEG audio file");
Index: mp4file.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/mp4file.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- mp4file.c 10 Jun 2006 16:49:19 -0000 1.30
+++ mp4file.c 10 Jun 2006 23:22:00 -0000 1.31
@@ -74,7 +74,7 @@
guint32 peak_signal; /+ LAME Peak Signal * 0x800000 +/
gboolean compilation; /+ Track is part of a compilation CD +/
- If prefs_get_tag_readtags() returns FALSE you only should fill in
+ If prefs_get_int("readtags") returns FALSE you only should fill in
tracklen, bitrate and fdesc
Please note that the iPod will only play as much of the track as
@@ -181,7 +181,7 @@
if (g_strcasecmp (value, ".mp4") == 0)
track->filetype = g_strdup ("MP4 video file");
}
- if (prefs_get_readtags ())
+ if (prefs_get_int("readtags"))
{
u_int8_t *ppValue;
u_int32_t pValueSize;
Index: prefs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.c,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -d -r1.217 -r1.218
--- prefs.c 10 Jun 2006 23:04:06 -0000 1.217
+++ prefs.c 10 Jun 2006 23:22:00 -0000 1.218
@@ -215,6 +215,7 @@
prefs_set_int("size_info.y", 300);
prefs_set_int("autoimport", FALSE);
+ prefs_set_int("readtags", TRUE);
}
/* Initialize default variable-length list entries */
@@ -1774,7 +1775,6 @@
mycfg->block_display = FALSE;
mycfg->offline = FALSE;
mycfg->write_extended_info = TRUE;
- mycfg->readtags = TRUE;
mycfg->parsetags = FALSE;
mycfg->parsetags_overwrite = FALSE;
mycfg->parsetags_template = g_strdup ("%a - %A/%T %t.mp3;%t.wav");
@@ -1971,10 +1971,6 @@
{
prefs_set_block_display((gboolean)atoi(arg));
}
- else if(g_ascii_strcasecmp (line, "readtags") == 0)
- {
- prefs_set_readtags((gboolean)atoi(arg));
- }
else if(g_ascii_strcasecmp (line, "parsetags") == 0)
{
prefs_set_parsetags((gboolean)atoi(arg));
@@ -2305,7 +2301,6 @@
}
fprintf(fp, "md5=%d\n",prefs_get_md5tracks ());
fprintf(fp, "block_display=%d\n",prefs_get_block_display());
- fprintf(fp, "readtags=%d\n", prefs_get_readtags());
fprintf(fp, "parsetags=%d\n", prefs_get_parsetags());
fprintf(fp, "parsetags_overwrite=%d\n", prefs_get_parsetags_overwrite());
fprintf(fp, "parsetags_template=%s\n",cfg->parsetags_template);
@@ -2550,16 +2545,6 @@
return cfgdir;
}
-void prefs_set_readtags(gboolean active)
-{
- cfg->readtags = active;
-}
-
-gboolean prefs_get_readtags(void)
-{
- return cfg->readtags;
-}
-
void prefs_set_parsetags(gboolean active)
{
cfg->parsetags = active;
Index: prefs.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.h,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -d -r1.142 -r1.143
--- prefs.h 10 Jun 2006 23:04:06 -0000 1.142
+++ prefs.h 10 Jun 2006 23:22:00 -0000 1.143
@@ -114,7 +114,6 @@
gboolean write_extended_info; /* write additional file with PC
filenames etc? */
- gboolean readtags; /* Read tags from file contents? */
gboolean parsetags; /* Get tags by parsing filename? */
gchar *parsetags_template; /* template for parsing tags */
gboolean parsetags_overwrite; /* Overwrite tags already set? */
@@ -295,8 +294,6 @@
void prefs_set_write_extended_info(gboolean active);
void prefs_set_md5tracks(gboolean active);
void prefs_set_block_display(gboolean active);
-void prefs_set_readtags (gboolean active);
-gboolean prefs_get_readtags(void);
void prefs_set_parsetags (gboolean active);
gboolean prefs_get_parsetags(void);
void prefs_set_parsetags_overwrite (gboolean active);
Index: prefs_window.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs_window.c,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -d -r1.139 -r1.140
--- prefs_window.c 10 Jun 2006 23:04:06 -0000 1.139
+++ prefs_window.c 10 Jun 2006 23:22:00 -0000 1.140
@@ -553,7 +553,7 @@
w = gtkpod_xml_get_widget (prefs_window_xml, "readtags");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
- tmpcfg->readtags);
+ prefs_get_int("readtags"));
w = gtkpod_xml_get_widget (prefs_window_xml, "parsetags");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
@@ -705,7 +705,6 @@
tm_store_col_order ();
prefs_set_charset(tmpcfg->charset);
- prefs_set_readtags(tmpcfg->readtags);
prefs_set_parsetags(tmpcfg->parsetags);
prefs_set_parsetags_overwrite(tmpcfg->parsetags_overwrite);
prefs_set_parsetags_template(tmpcfg->parsetags_template);
@@ -1143,8 +1142,8 @@
on_readtags_toggled (GtkToggleButton *togglebutton,
gpointer user_data)
{
- tmpcfg->readtags =
- gtk_toggle_button_get_active(togglebutton);
+ temp_prefs_set_int(temp_prefs, "readtags",
+ gtk_toggle_button_get_active(togglebutton));
}
void
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
