Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5090/src
Modified Files:
mp3file.c prefs.c prefs.h prefs_window.c
Log Message:
* applied James Liggett's preferences patches
(id3-write-id3v24)
Index: mp3file.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/mp3file.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- mp3file.c 24 Apr 2006 15:11:11 -0000 1.61
+++ mp3file.c 25 Apr 2006 13:11:52 -0000 1.62
@@ -1307,7 +1307,7 @@
encoding = get_encoding (id3tag);
/* ...unless it's ISO_8859_1 and prefs say we should use
unicode (i.e. ID3v2.4) */
- if (prefs_get_id3_write_id3v24 () &&
+ if (prefs_get_int("id3_write_id3v24") &&
(encoding == ID3_FIELD_TEXTENCODING_ISO_8859_1))
encoding = ID3_FIELD_TEXTENCODING_UTF_8;
Index: prefs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.c,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -d -r1.161 -r1.162
--- prefs.c 24 Apr 2006 14:11:31 -0000 1.161
+++ prefs.c 25 Apr 2006 13:11:52 -0000 1.162
@@ -121,7 +121,8 @@
static void set_default_prefrences()
{
prefs_set_int("update_existing", FALSE);
- prefs_set_int("id3_write", FALSE);
+ prefs_set_int("id3_write", FALSE);
+ prefs_set_int("id3_write_id3v24", FALSE);
}
/* Initialize default variable-length list entries */
@@ -1123,7 +1124,6 @@
mycfg->mpl_autoselect = TRUE;
mycfg->offline = FALSE;
mycfg->write_extended_info = TRUE;
- mycfg->id3_write_id3v24 = FALSE;
mycfg->size_gtkpod.x = 600;
mycfg->size_gtkpod.y = 500;
mycfg->size_cal.x = 500;
@@ -1428,10 +1428,6 @@
{
/* obsoleted since 0.71 */
}
- else if(g_ascii_strcasecmp (line, "id3_write_id3v24") == 0)
- {
- prefs_set_id3_write_id3v24((gboolean)atoi(arg));
- }
else if(g_ascii_strcasecmp (line, "md5") == 0)
{
prefs_set_md5tracks((gboolean)atoi(arg));
@@ -2101,7 +2097,6 @@
} else {
fprintf(fp, "charset=\n");
}
- fprintf(fp, "id3_write_id3v24=%d\n", prefs_get_id3_write_id3v24 ());
fprintf(fp, "md5=%d\n",prefs_get_md5tracks ());
fprintf(fp, "block_display=%d\n",prefs_get_block_display());
fprintf(fp, _("# delete confirmation\n"));
@@ -2380,16 +2375,6 @@
return cfg->block_display;
}
-void prefs_set_id3_write_id3v24(gboolean active)
-{
- cfg->id3_write_id3v24 = active;
-}
-
-gboolean prefs_get_id3_write_id3v24(void)
-{
- return cfg->id3_write_id3v24;
-}
-
gboolean prefs_get_offline(void)
{
return cfg->offline;
Index: prefs.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.h,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- prefs.h 24 Apr 2006 14:11:31 -0000 1.105
+++ prefs.h 25 Apr 2006 13:11:52 -0000 1.106
@@ -67,7 +67,6 @@
{
gchar *ipod_mount; /* mount point of iPod */
gchar *charset; /* CHARSET to use with file operations */
- gboolean id3_write_id3v24;/* should all ID3 tags be updated */
gboolean md5tracks; /* don't allow track duplication on your ipod */
gboolean block_display; /* block display during change of selection? */
gboolean tmp_disable_sort;/* tmp. disable sorting during change of slctn? */
@@ -329,7 +328,6 @@
void prefs_set_st_category (guint32 inst, guint category);
void prefs_set_md5tracks(gboolean active);
void prefs_set_block_display(gboolean active);
-void prefs_set_id3_write_id3v24 (gboolean active);
void prefs_set_readtags (gboolean active);
gboolean prefs_get_readtags(void);
void prefs_set_parsetags (gboolean active);
@@ -375,7 +373,6 @@
gboolean prefs_get_st_autoselect (guint32 inst);
gboolean prefs_get_mpl_autoselect (void);
guint prefs_get_st_category (guint32 inst);
-gboolean prefs_get_id3_write_id3v24(void);
const gchar *prefs_get_ipod_mount (void);
gchar * prefs_get_charset (void);
void prefs_get_size_gtkpod (gint *x, gint *y);
Index: prefs_window.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs_window.c,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- prefs_window.c 24 Apr 2006 14:11:31 -0000 1.117
+++ prefs_window.c 25 Apr 2006 13:11:52 -0000 1.118
@@ -553,7 +553,7 @@
w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_id3_write_id3v24");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
- tmpcfg->id3_write_id3v24);
+ prefs_get_int("id3_write_id3v24"));
if (!prefs_get_int("id3_write")) gtk_widget_set_sensitive (w, FALSE);
w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_write_charset");
@@ -898,7 +898,6 @@
/* Need this in case user reordered column order (we don't
* catch the reorder signal) */
tm_store_col_order ();
- prefs_set_id3_write_id3v24(tmpcfg->id3_write_id3v24);
prefs_set_ipod_mount(tmpcfg->ipod_mount);
for (i=0; i<PATH_NUM; ++i)
{
@@ -1389,7 +1388,8 @@
on_cfg_id3_write_id3v24_toggled (GtkToggleButton *togglebutton,
gpointer user_data)
{
- tmpcfg->id3_write_id3v24 = gtk_toggle_button_get_active (togglebutton);
+ temp_prefs_set_int(temp_prefs,"id3_write_id3v24",
+ gtk_toggle_button_get_active (togglebutton));
}
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
