version 1.1, 2004/02/06 12:04:54
|
version 1.2, 2004/05/18 19:42:17
|
Line 1
|
Line 1
|
diff -u -r1.13 ifusionsoundstream.c |
diff -u -u -r1.25 ifusionsoundstream.c |
--- src/ifusionsoundstream.c 5 Feb 2004 13:01:37 -0000 1.13 |
--- src/ifusionsoundstream.c 29 Apr 2004 21:37:24 -0000 1.25 |
+++ src/ifusionsoundstream.c 5 Feb 2004 15:55:32 -0000 |
+++ src/ifusionsoundstream.c 18 May 2004 19:40:43 -0000 |
@@ -30,6 +30,7 @@ |
@@ -257,6 +257,9 @@ |
#include <stdlib.h> |
|
#include <unistd.h> |
|
#include <string.h> |
|
+#include <sys/ioctl.h> |
|
|
|
#include <math.h> |
|
|
|
@@ -330,6 +331,9 @@ |
|
/* Reset the buffer. */ |
|
data->pos_write = data->pos_read; |
data->pos_write = data->pos_read; |
|
data->filled = 0; |
|
|
+ /* flush pending sound data so we don't have to wait */ |
+ /* flush pending sound data so we don't have to wait */ |
+ fs_core_reset( data->core ); |
+ fs_core_reset( data->core ); |
Line 19 diff -u -r1.13 ifusionsoundstream.c
|
Line 11 diff -u -r1.13 ifusionsoundstream.c
|
pthread_mutex_unlock( &data->lock ); |
pthread_mutex_unlock( &data->lock ); |
|
|
return DFB_OK; |
return DFB_OK; |
diff -u -r1.21 core_sound.c |
diff -u -u -r1.29 core_sound.c |
--- src/core/core_sound.c 3 Feb 2004 17:38:33 -0000 1.21 |
--- src/core/core_sound.c 5 May 2004 09:32:49 -0000 1.29 |
+++ src/core/core_sound.c 5 Feb 2004 15:55:32 -0000 |
+++ src/core/core_sound.c 18 May 2004 19:40:45 -0000 |
@@ -286,6 +286,12 @@ |
@@ -366,6 +366,12 @@ |
return DFB_OK; |
return DFB_OK; |
} |
} |
|
|
Line 35 diff -u -r1.21 core_sound.c
|
Line 27 diff -u -r1.21 core_sound.c
|
int |
int |
fs_core_output_delay( CoreSound *core ) |
fs_core_output_delay( CoreSound *core ) |
{ |
{ |
@@ -313,6 +319,12 @@ |
@@ -394,6 +400,12 @@ |
|
|
bool empty = true; |
bool empty = true; |
|
|
Line 48 diff -u -r1.21 core_sound.c
|
Line 40 diff -u -r1.21 core_sound.c
|
|
|
while (true) { |
while (true) { |
int i; |
int i; |
diff -u -r1.3 core_sound.h |
diff -u -u -r1.5 core_sound.h |
--- src/core/core_sound.h 16 Jan 2004 16:31:38 -0000 1.3 |
--- src/core/core_sound.h 30 Mar 2004 18:57:44 -0000 1.5 |
+++ src/core/core_sound.h 5 Feb 2004 15:55:32 -0000 |
+++ src/core/core_sound.h 18 May 2004 19:40:45 -0000 |
@@ -57,5 +57,10 @@ |
@@ -62,5 +62,10 @@ |
*/ |
*/ |
int fs_core_output_delay( CoreSound *core ); |
int fs_core_output_delay( CoreSound *core ); |
|
|