[SVN] r3916 - in branches/gsoc2008_force_feedback/src/haptic: darwin win32

[svn-owner at libsdl.org]

Author: bobbens
Date: 2008-08-06 03:48:35 -0700 (Wed, 06 Aug 2008)
New Revision: 3916

Modified:
   branches/gsoc2008_force_feedback/src/haptic/darwin/SDL_syshaptic.c
   branches/gsoc2008_force_feedback/src/haptic/win32/SDL_syshaptic.c
Log:
Removed TODO.
Fixed condition envelope behaviour.


Modified: branches/gsoc2008_force_feedback/src/haptic/darwin/SDL_syshaptic.c
===================================================================
--- branches/gsoc2008_force_feedback/src/haptic/darwin/SDL_syshaptic.c	2008-08-06 10:33:16 UTC (rev 3915)
+++ branches/gsoc2008_force_feedback/src/haptic/darwin/SDL_syshaptic.c	2008-08-06 10:48:35 UTC (rev 3916)
@@ -765,15 +765,9 @@
             return -1;                
          }                            
                                       
-         /* Envelope */
+         /* Envelope - Not actually supported by most CONDITION implementations. */
          SDL_free(dest->lpEnvelope);
          dest->lpEnvelope = NULL;
-/* TODO Check is envelope actually used.
-         envelope->dwAttackLevel = CCONVERT(hap_condition->attack_level);
-         envelope->dwAttackTime = hap_condition->attack_length * 1000;
-         envelope->dwFadeLevel = CCONVERT(hap_condition->fade_level);
-         envelope->dwFadeTime = hap_condition->fade_length * 1000;
-*/
 
          break;
 

Modified: branches/gsoc2008_force_feedback/src/haptic/win32/SDL_syshaptic.c
===================================================================
--- branches/gsoc2008_force_feedback/src/haptic/win32/SDL_syshaptic.c	2008-08-06 10:33:16 UTC (rev 3915)
+++ branches/gsoc2008_force_feedback/src/haptic/win32/SDL_syshaptic.c	2008-08-06 10:48:35 UTC (rev 3916)
@@ -882,13 +882,9 @@
             return -1;                
          }                            
                                       
-         /* Envelope */
-/* TODO Check is envelope actually used.
-         envelope->dwAttackLevel = CONVERT(hap_condition->attack_level);
-         envelope->dwAttackTime = hap_condition->attack_length * 1000;
-         envelope->dwFadeLevel = CONVERT(hap_condition->fade_level);
-         envelope->dwFadeTime = hap_condition->fade_length * 1000;
-*/
+         /* Envelope - Not actually supported by most CONDITION implementations. */
+         SDL_free(dest->lpEnvelope);
+         dest->lpEnvelope = NULL;
 
          break;