changeset 1896:7b9938c8528a trunk

[svn] - fix A-B repetition
author nenolod
date Tue, 24 Oct 2006 00:34:00 -0700
parents 4ab001eeef36
children 35fa6f69d802
files ChangeLog audacious/mainwin.c
diffstat 2 files changed, 12 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Oct 23 22:57:28 2006 -0700
+++ b/ChangeLog	Tue Oct 24 00:34:00 2006 -0700
@@ -1,3 +1,11 @@
+2006-10-24 05:57:28 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [2747]
+  - make sure the proper wmclass is being set here.
+  
+  trunk/audacious/about.c |    2 +-
+  1 file changed, 1 insertion(+), 1 deletion(-)
+
+
 2006-10-23 20:04:21 +0000  William Pitcock <nenolod@nenolod.net>
   revision [2745]
   - set status text when loop-point A has been set to "LOOP-POINT A HAS BEEN SET."
--- a/audacious/mainwin.c	Mon Oct 23 22:57:28 2006 -0700
+++ b/audacious/mainwin.c	Tue Oct 24 00:34:00 2006 -0700
@@ -360,7 +360,7 @@
      {N_("/-"), NULL, NULL, 0, "<Separator>"},
      {N_("/Set A-B"), "A", mainwin_general_menu_callback,
      MAINWIN_GENERAL_SETAB, "<Item>"},
-     {N_("/Clear A-B"), "S", mainwin_general_menu_callback,
+     {N_("/Clear A-B"), "<control>S", mainwin_general_menu_callback,
      MAINWIN_GENERAL_CLEARAB, "<Item>"},
     {"/-", NULL, NULL, 0, "<Separator>", NULL},
     {N_("/Jump to File"), "J", mainwin_general_menu_callback,
@@ -3256,7 +3256,6 @@
     cfg.timer_mode = mode;
 }
 
-
 void
 mainwin_setup_menus(void)
 {
@@ -3643,6 +3642,9 @@
     gint length, t;
     gchar stime_prefix;
 
+    if (ab_position_a != -1 && ab_position_b != -1)
+        bmp_playback_seek(ab_position_a/1000);
+
     length = playlist_get_current_length();
     if (bmp_playback_get_playing())
         playlistwin_set_time(time, length, cfg.timer_mode);