Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv20440/src
Modified Files:
misc_playlist.c prefs.c prefs.h prefs_window.c
Log Message:
Moved misc_track_nr to new prefs.
Index: misc_playlist.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/misc_playlist.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- misc_playlist.c 12 Jun 2006 21:46:26 -0000 1.32
+++ misc_playlist.c 12 Jun 2006 22:04:26 -0000 1.33
@@ -231,7 +231,7 @@
/* Generates a playlist containing a random selection of
- prefs_get_misc_track_nr() tracks in random order from the currently
+ prefs_get_int("misc_track_nr") tracks in random order from the currently
displayed tracks */
Playlist *generate_random_playlist (iTunesDB *itdb)
{
@@ -240,7 +240,7 @@
gchar *pl_name, *pl_name1;
GList *rtracks = NULL;
GList *tracks = tm_get_all_tracks ();
- gint tracks_max = prefs_get_misc_track_nr();
+ gint tracks_max = prefs_get_int("misc_track_nr");
gint tracks_nr = 0;
@@ -520,7 +520,7 @@
void most_listened_pl (iTunesDB *itdb)
{
- gint tracks_nr = prefs_get_misc_track_nr();
+ gint tracks_nr = prefs_get_int("misc_track_nr");
gchar *str;
g_return_if_fail (itdb);
@@ -601,7 +601,7 @@
void most_rated_pl (iTunesDB *itdb)
{
- gint tracks_nr = prefs_get_misc_track_nr();
+ gint tracks_nr = prefs_get_int("misc_track_nr");
gchar *str;
g_return_if_fail (itdb);
@@ -691,7 +691,7 @@
void last_listened_pl (iTunesDB *itdb)
{
- gint tracks_nr = prefs_get_misc_track_nr();
+ gint tracks_nr = prefs_get_int("misc_track_nr");
gchar *str;
g_return_if_fail (itdb);
Index: prefs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.c,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -d -r1.235 -r1.236
--- prefs.c 12 Jun 2006 21:46:26 -0000 1.235
+++ prefs.c 12 Jun 2006 22:04:26 -0000 1.236
@@ -233,6 +233,7 @@
prefs_set_int("multi_edit_title", TRUE);
prefs_set_int("multi_edit", FALSE);
prefs_set_int("not_played_track", TRUE);
+ prefs_set_int("misc_track_nr", 25);
}
/* Initialize default variable-length list entries */
@@ -937,6 +938,13 @@
prefs_set_string("not_played_song", NULL);
}
+ /* misc_song_nr renamed to misc_track_nr */
+ if (prefs_get_int_value("misc_song_nr", &int_buf))
+ {
+ prefs_set_int("misc_track_nr", int_buf);
+ prefs_set_string("misc_song_nr", NULL);
+ }
+
prefs_set_string ("version", VERSION);
}
@@ -1814,7 +1822,6 @@
mycfg->update_charset = FALSE;
mycfg->write_charset = FALSE;
- mycfg->misc_track_nr = 25;
mycfg->sortcfg.pm_sort = SORT_NONE;
mycfg->sortcfg.st_sort = SORT_NONE;
mycfg->sortcfg.tm_sort = SORT_NONE;
@@ -2052,11 +2059,6 @@
{
prefs_set_display_tooltips_prefs((gboolean)atoi(arg));
}
- else if((g_ascii_strcasecmp (line, "misc_track_nr") == 0) ||
- (g_ascii_strcasecmp (line, "misc_song_nr") == 0))
- {
- prefs_set_misc_track_nr(atoi(arg));
- }
else if(g_ascii_strcasecmp (line, "update_charset") == 0)
{
prefs_set_update_charset((gboolean)atoi(arg));
@@ -2257,7 +2259,6 @@
prefs_get_display_tooltips_main());
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, "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());
@@ -2643,16 +2644,6 @@
return cfg->display_tooltips_prefs;
}
-void prefs_set_misc_track_nr (gint state)
-{
- cfg->misc_track_nr = state;
-}
-
-gint prefs_get_misc_track_nr (void)
-{
- return cfg->misc_track_nr;
-}
-
/* sorting gets disabled temporarily if either of the options
'tmp_disable_sort' or 'block_display' is checked */
gboolean prefs_get_disable_sorting(void)
Index: prefs.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.h,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -d -r1.162 -r1.163
--- prefs.h 12 Jun 2006 21:46:26 -0000 1.162
+++ prefs.h 12 Jun 2006 22:04:26 -0000 1.163
@@ -117,7 +117,6 @@
gboolean group_compilations; /* group compilations when browsing */
guint32 statusbar_timeout; /* timeout for statusbar messages */
gboolean not_played_track; /* not played track in Highest rated
playlist?*/
- gint misc_track_nr; /* track's nr in the Highest rated, most
played and most recently played pl*/
float version; /* version of gtkpod writing the cfg file */
};
@@ -305,8 +304,6 @@
gboolean prefs_get_display_tooltips_main (void);
void prefs_set_display_tooltips_prefs (gboolean state);
gboolean prefs_get_display_tooltips_prefs (void);
-void prefs_set_misc_track_nr (gint state);
-gint prefs_get_misc_track_nr (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.156
retrieving revision 1.157
diff -u -d -r1.156 -r1.157
--- prefs_window.c 12 Jun 2006 21:46:26 -0000 1.156
+++ prefs_window.c 12 Jun 2006 22:04:26 -0000 1.157
@@ -430,8 +430,7 @@
w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_misc_track_nr");
gtk_spin_button_set_range (GTK_SPIN_BUTTON (w), 0, 0xffffffff);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (w),
- prefs_get_misc_track_nr ());
- tmpcfg->misc_track_nr = tmpcfg->misc_track_nr;
+ prefs_get_int("misc_track_nr"));
w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_multi_edit_title");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
@@ -700,7 +699,6 @@
prefs_set_display_toolbar(tmpcfg->display_toolbar);
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_update_charset(tmpcfg->update_charset);
prefs_set_write_charset(tmpcfg->write_charset);
tm_show_preferred_columns();
@@ -1280,7 +1278,8 @@
on_cfg_misc_track_nr_value_changed (GtkSpinButton *spinbutton,
gpointer user_data)
{
- tmpcfg->misc_track_nr = gtk_spin_button_get_value (spinbutton);
+ temp_prefs_set_int(temp_prefs, "misc_track_nr",
+ gtk_spin_button_get_value (spinbutton));
}
static void prefs_window_set_sort_tab_num (gint num)
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
