Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv13708/src
Modified Files:
misc_playlist.c prefs.c prefs.h prefs_window.c
Log Message:
Moved not_played_track to new prefs.
Index: misc_playlist.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/misc_playlist.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- misc_playlist.c 11 Jun 2006 16:04:49 -0000 1.31
+++ misc_playlist.c 12 Jun 2006 21:46:26 -0000 1.32
@@ -595,7 +595,7 @@
/* Insert function: determines whether a track is entered into the playlist */
static gboolean Most_Rated_IF (Track *track, gpointer userdata)
{
- if (track) return ((track->playcount != 0) ||
prefs_get_not_played_track());
+ if (track) return ((track->playcount != 0) ||
prefs_get_int("not_played_track"));
return FALSE;
}
Index: prefs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.c,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -d -r1.234 -r1.235
--- prefs.c 12 Jun 2006 04:48:41 -0000 1.234
+++ prefs.c 12 Jun 2006 21:46:26 -0000 1.235
@@ -232,6 +232,7 @@
prefs_set_int("tmp_disable_sort", TRUE);
prefs_set_int("multi_edit_title", TRUE);
prefs_set_int("multi_edit", FALSE);
+ prefs_set_int("not_played_track", TRUE);
}
/* Initialize default variable-length list entries */
@@ -856,21 +857,30 @@
for (i = 0; i < SORT_TAB_MAX; i++)
{
if (prefs_get_int_value_index("sp_created_cond", i, &int_buf))
+ {
prefs_set_int_index("sp_added_cond", i, int_buf);
+ prefs_set_string("sp_created_cond", NULL);
+ }
}
/* sp_created_state renamed to sp_added_state */
for (i = 0; i < SORT_TAB_MAX; i++)
{
if (prefs_get_int_value_index("sp_created_state", i, &int_buf))
+ {
prefs_set_int_index("sp_added_state", i, int_buf);
+ prefs_set_string("sp_created_state", NULL);
+ }
}
/* sm_col_width renamed to tm_col_width */
for (i = 0; i < TM_NUM_COLUMNS; i++)
{
if (prefs_get_int_value_index("sm_col_width", i, &int_buf))
+ {
prefs_set_int_index("tm_col_width", i, int_buf);
+ prefs_set_string_index("sm_col_width", i, NULL);
+ }
}
/* handle version changes in prefs */
@@ -920,6 +930,13 @@
prefs_set_string("auto_import", NULL);
}
+ /* not_played_song renamed to not_played_track */
+ if (prefs_get_int_value("not_played_song", &int_buf))
+ {
+ prefs_set_int("not_played_track", int_buf);
+ prefs_set_string("not_played_song", NULL);
+ }
+
prefs_set_string ("version", VERSION);
}
@@ -1797,7 +1814,6 @@
mycfg->update_charset = FALSE;
mycfg->write_charset = FALSE;
- mycfg->not_played_track = TRUE;
mycfg->misc_track_nr = 25;
mycfg->sortcfg.pm_sort = SORT_NONE;
mycfg->sortcfg.st_sort = SORT_NONE;
@@ -2036,11 +2052,6 @@
{
prefs_set_display_tooltips_prefs((gboolean)atoi(arg));
}
- else if((g_ascii_strcasecmp (line, "not_played_track") == 0) ||
- (g_ascii_strcasecmp (line, "not_played_song") == 0))
- {
- prefs_set_not_played_track((gboolean)atoi(arg));
- }
else if((g_ascii_strcasecmp (line, "misc_track_nr") == 0) ||
(g_ascii_strcasecmp (line, "misc_song_nr") == 0))
{
@@ -2247,7 +2258,6 @@
fprintf(fp, "display_tooltips_prefs=%d\n",
prefs_get_display_tooltips_prefs());
fprintf(fp, "misc_track_nr=%d\n", prefs_get_misc_track_nr());
- fprintf(fp, "not_played_track=%d\n", prefs_get_not_played_track());
fprintf(fp, "update_charset=%d\n",prefs_get_update_charset());
fprintf(fp, "write_charset=%d\n",prefs_get_write_charset());
fprintf(fp, "case_sensitive=%d\n",prefs_get_case_sensitive());
@@ -2633,16 +2643,6 @@
return cfg->display_tooltips_prefs;
}
-void prefs_set_not_played_track (gboolean state)
-{
- cfg->not_played_track = state;
-}
-
-gboolean prefs_get_not_played_track (void)
-{
- return cfg->not_played_track;
-}
-
void prefs_set_misc_track_nr (gint state)
{
cfg->misc_track_nr = state;
Index: prefs.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.h,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -d -r1.161 -r1.162
--- prefs.h 12 Jun 2006 06:43:35 -0000 1.161
+++ prefs.h 12 Jun 2006 21:46:26 -0000 1.162
@@ -307,8 +307,6 @@
gboolean prefs_get_display_tooltips_prefs (void);
void prefs_set_misc_track_nr (gint state);
gint prefs_get_misc_track_nr (void);
-void prefs_set_not_played_track (gboolean state);
-gboolean prefs_get_not_played_track (void);
gboolean prefs_get_disable_sorting(void);
#endif
Index: prefs_window.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs_window.c,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -d -r1.155 -r1.156
--- prefs_window.c 12 Jun 2006 06:43:35 -0000 1.155
+++ prefs_window.c 12 Jun 2006 21:46:26 -0000 1.156
@@ -425,7 +425,7 @@
w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_not_played_track");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
- tmpcfg->not_played_track);
+ prefs_get_int("not_played_track"));
w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_misc_track_nr");
gtk_spin_button_set_range (GTK_SPIN_BUTTON (w), 0, 0xffffffff);
@@ -701,7 +701,6 @@
prefs_set_display_tooltips_main (tmpcfg->display_tooltips_main);
prefs_set_display_tooltips_prefs (tmpcfg->display_tooltips_prefs);
prefs_set_misc_track_nr (tmpcfg->misc_track_nr);
- prefs_set_not_played_track (tmpcfg->not_played_track);
prefs_set_update_charset(tmpcfg->update_charset);
prefs_set_write_charset(tmpcfg->write_charset);
tm_show_preferred_columns();
@@ -1273,8 +1272,8 @@
on_cfg_not_played_track_toggled (GtkToggleButton *togglebutton,
gpointer user_data)
{
- tmpcfg->not_played_track =
- gtk_toggle_button_get_active (togglebutton);
+ temp_prefs_set_int(temp_prefs, "not_played_track",
+ gtk_toggle_button_get_active(togglebutton));
}
void
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
