aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMatthew Gregan <[email protected]>2012-06-06 15:33:12 +1200
committerMatthew Gregan <[email protected]>2012-06-06 15:33:12 +1200
commit582601f0fcebdf2d61cb636d935f3ba71a3a95e7 (patch)
tree1077ca928e369d2f548197a9b62e6fe660078884
parent21d9678eb9755761f7a9d26253189b926258de7c (diff)
downloadcubeb-582601f0fcebdf2d61cb636d935f3ba71a3a95e7.tar.gz
cubeb-582601f0fcebdf2d61cb636d935f3ba71a3a95e7.zip
Fix tests after changing state callback signature.
-rw-r--r--test/test_sanity.c6
-rw-r--r--test/test_tone.c6
2 files changed, 5 insertions, 7 deletions
diff --git a/test/test_sanity.c b/test/test_sanity.c
index cfbe88b..1f22efd 100644
--- a/test/test_sanity.c
+++ b/test/test_sanity.c
@@ -32,10 +32,9 @@ test_data_callback(cubeb_stream * stm, void * user_ptr, void * p, long nframes)
return nframes;
}
-int
+void
test_state_callback(cubeb_stream * stm, void * user_ptr, cubeb_state state)
{
- return CUBEB_OK;
}
static void
@@ -355,14 +354,13 @@ test_drain_data_callback(cubeb_stream * stm, void * user_ptr, void * p, long nfr
return nframes;
}
-int
+void
test_drain_state_callback(cubeb_stream * stm, void * user_ptr, cubeb_state state)
{
if (state == CUBEB_STATE_DRAINED) {
assert(!got_drain);
got_drain = 1;
}
- return CUBEB_OK;
}
static void
diff --git a/test/test_tone.c b/test/test_tone.c
index 5eebe7c..083abe4 100644
--- a/test/test_tone.c
+++ b/test/test_tone.c
@@ -49,12 +49,12 @@ long data_cb(cubeb_stream *stream, void *user, void *buffer, long nframes)
return nframes;
}
-int state_cb(cubeb_stream *stream, void *user, cubeb_state state)
+void state_cb(cubeb_stream *stream, void *user, cubeb_state state)
{
struct cb_user_data *u = (struct cb_user_data *)user;
if (stream == NULL || u == NULL)
- return CUBEB_ERROR;
+ return;
switch (state) {
case CUBEB_STATE_STARTED:
@@ -67,7 +67,7 @@ int state_cb(cubeb_stream *stream, void *user, cubeb_state state)
printf("unknown stream state %d\n", state);
}
- return CUBEB_OK;
+ return;
}
int main(int argc, char *argv[])