# HG changeset patch # User nenolod # Date 1152526378 25200 # Node ID cface58ec50dd00de669be799a89e0f68cc90636 # Parent f85f9fe625323c2a4c8d8138c7448c804e75566d [svn] - preferences window cleanups diff -r f85f9fe62532 -r cface58ec50d ChangeLog --- a/ChangeLog Mon Jul 10 02:44:30 2006 -0700 +++ b/ChangeLog Mon Jul 10 03:12:58 2006 -0700 @@ -1,3 +1,12 @@ +2006-07-10 09:44:30 +0000 William Pitcock + revision [1676] + - fix compilation + + + Changes: Modified: + +1 -0 trunk/Plugins/Output/jack/jack.c + + 2006-07-10 09:37:04 +0000 William Pitcock revision [1674] - provide some additional debugging hints with gdk_error_trap_push/pop. diff -r f85f9fe62532 -r cface58ec50d audacious/glade/prefswin.glade --- a/audacious/glade/prefswin.glade Mon Jul 10 02:44:30 2006 -0700 +++ b/audacious/glade/prefswin.glade Mon Jul 10 03:12:58 2006 -0700 @@ -112,7 +112,7 @@ True - _Media plugin list: + _Decoder list: True True GTK_JUSTIFY_LEFT @@ -216,7 +216,7 @@ True - Media + Decoders False True GTK_JUSTIFY_LEFT @@ -2362,8 +2362,6 @@ False False True - - @@ -3806,9 +3804,9 @@ 0 - + True - When finished playing a song, don't automatically advance to the next. + When Audacious starts, automatically begin playing from the point where we stopped before. True Continue playback on startup True @@ -3817,40 +3815,8 @@ False False True - - - - - 0 - False - False - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - When finished playing a song, don't automatically advance to the next. - True - Enable gapless playback system (experimental) - True - GTK_RELIEF_NORMAL - True - False - False - True + + @@ -3874,7 +3840,7 @@ 0 - + True When finished playing a song, don't automatically advance to the next. True diff -r f85f9fe62532 -r cface58ec50d audacious/prefswin.c --- a/audacious/prefswin.c Mon Jul 10 02:44:30 2006 -0700 +++ b/audacious/prefswin.c Mon Jul 10 03:12:58 2006 -0700 @@ -1545,6 +1545,18 @@ } static void +on_continue_playback_on_startup_realize(GtkToggleButton * button, gpointer data) +{ + gtk_toggle_button_set_active(button, cfg.resume_playback_on_startup); +} + +static void +on_continue_playback_on_startup_toggled(GtkToggleButton * button, gpointer data) +{ + cfg.resume_playback_on_startup = gtk_toggle_button_get_active(button); +} + +static void on_refresh_file_list_realize(GtkToggleButton * button, gpointer data) { gtk_toggle_button_set_active(button, cfg.refresh_file_list); @@ -2080,6 +2092,8 @@ FUNC_MAP_ENTRY(on_audio_format_det_cb_realize) FUNC_MAP_ENTRY(on_show_filepopup_for_tuple_realize) FUNC_MAP_ENTRY(on_show_filepopup_for_tuple_toggled) + FUNC_MAP_ENTRY(on_continue_playback_on_startup_realize) + FUNC_MAP_ENTRY(on_continue_playback_on_startup_toggled) FUNC_MAP_END void