Bug 851149 - Fix cubeb_sndio build after switchable-backends landing. r=kinetik
authorLandry Breuil <landry@openbsd.org>
Fri, 15 Mar 2013 16:28:07 +1300
changeset 124869 37f55a0c903a77173acf9c0854fc812e31ae1a94
parent 124868 8e0441770277688342281aab429f06eb211a559c
child 124870 9965ed3759c87cf3d744ed13e6a364407bd32ab2
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewerskinetik
bugs851149
milestone22.0a1
Bug 851149 - Fix cubeb_sndio build after switchable-backends landing. r=kinetik
media/libcubeb/README_MOZILLA
media/libcubeb/src/cubeb_sndio.c
--- a/media/libcubeb/README_MOZILLA
+++ b/media/libcubeb/README_MOZILLA
@@ -1,8 +1,8 @@
 The source from this directory was copied from the cubeb 
 git repository using the update.sh script.  The only changes
 made were those applied by update.sh and the addition of
 Makefile.in build files for the Mozilla build system.
 
 The cubeb git repository is: git://github.com/kinetiknz/cubeb.git
 
-The git commit ID used was 0c7d97523096a7d4ae363974393d06f77c4592c9.
+The git commit ID used was c9c97571980ca77c990a763802c11682a332cbd6.
--- a/media/libcubeb/src/cubeb_sndio.c
+++ b/media/libcubeb/src/cubeb_sndio.c
@@ -212,17 +212,17 @@ sndio_stream_init(cubeb *context,
   if (rpar.bits != wpar.bits || rpar.le != wpar.le ||
       rpar.sig != wpar.sig || rpar.rate != wpar.rate ||
       rpar.pchan != wpar.pchan) {
     sio_close(s->hdl);
     free(s);
     DPR("sndio_stream_init() unsupported params\n");
     return CUBEB_ERROR_INVALID_FORMAT;
   }
-  sio_onmove(s->hdl, cubeb_onmove, s);
+  sio_onmove(s->hdl, sndio_onmove, s);
   s->active = 0;
   s->nfr = rpar.round;
   s->bpf = rpar.bps * rpar.pchan;
   s->pchan = rpar.pchan;
   s->data_cb = data_callback;
   s->state_cb = state_callback;
   s->arg = user_ptr;
   s->mtx = PTHREAD_MUTEX_INITIALIZER;
@@ -257,17 +257,17 @@ sndio_stream_destroy(cubeb_stream *s)
 
 static int
 sndio_stream_start(cubeb_stream *s)
 {
   int err;
 
   DPR("sndio_stream_start()\n");
   s->active = 1;
-  err = pthread_create(&s->th, NULL, cubeb_mainloop, s);
+  err = pthread_create(&s->th, NULL, sndio_mainloop, s);
   if (err) {
     s->active = 0;
     return CUBEB_ERROR;
   }
   return CUBEB_OK;
 }
 
 static int