changeset 1373:10b899eddd83 trunk

[svn] - next/previous button failed to work in some environments. 150ms seems little bit too short.
author yaz
date Fri, 07 Jul 2006 08:33:43 -0700
parents b861909ec6da
children 136be0f878d6
files ChangeLog audacious/mainwin.c
diffstat 2 files changed, 17 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Jul 04 17:29:40 2006 -0700
+++ b/ChangeLog	Fri Jul 07 08:33:43 2006 -0700
@@ -1,3 +1,15 @@
+2006-07-05 00:29:40 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [1658]
+  mpgdec:
+  - fix smart detection of MPEG streams/Xiph containers/MP3X containers/Fraunhofer VBRX containers
+  - use smart detection instead of extension checking
+  - avoid grabbing FLAC streams if mpgdec is loaded before libflac is.
+  
+
+  Changes:        Modified:
+  +8 -6           trunk/Plugins/Input/mpg123/mpg123.c  
+
+
 2006-07-04 11:59:27 +0000  William Pitcock <nenolod@nenolod.net>
   revision [1656]
   - recursively locate album art, by external contributor Oliver Lumpton.
--- a/audacious/mainwin.c	Tue Jul 04 17:29:40 2006 -0700
+++ b/audacious/mainwin.c	Fri Jul 07 08:33:43 2006 -0700
@@ -77,9 +77,10 @@
 #include "visualization.h"
 #include "libaudacious/configdb.h"
 
-static GTimeVal cb_time; /* 150ms click delay for tristate --nenolod */
+static GTimeVal cb_time; /* click delay for tristate is defined by TRISTATE_THRESHOLD */
 
 #define ITEM_SEPARATOR {"/-", NULL, NULL, 0, "<Separator>"}
+#define TRISTATE_THRESHOLD 200
 
 /*
  * If you change the menu above change these defines also
@@ -2036,7 +2037,7 @@
 
     now_dur = labs((delta_time.tv_sec * 1000) + (glong) (delta_time.tv_usec / 1000));
 
-    if ( now_dur <= 150 )
+    if ( now_dur <= TRISTATE_THRESHOLD )
     {
       /* interpret as 'skip to previous song' */
       playlist_prev();
@@ -2073,7 +2074,7 @@
 
     now_dur = labs((delta_time.tv_sec * 1000) + (glong) (delta_time.tv_usec / 1000));
 
-    if ( now_dur <= 150 )
+    if ( now_dur <= TRISTATE_THRESHOLD )
     {
       /* interpret as 'skip to previous song' */
       playlist_next();
@@ -3502,7 +3503,7 @@
 
       now_dur = labs((delta_time.tv_sec * 1000) + (glong) (delta_time.tv_usec / 1000));
 
-      if ( now_dur > 150 )
+      if ( now_dur > TRISTATE_THRESHOLD )
       {
         gint np;
         if (seek_state == MAINWIN_SEEK_REV)