Merge tag 'branchpoint-5.1' into release

[disorder] / lib / uaudio.h

diff --git a/lib/uaudio.h b/lib/uaudio.h
index 37e0ae4ba69f7448ab6dac8da96aa00250c930e4..709979ec544acc80bffc9f2af6739128710f6bc6 100644 (file)
--- a/lib/uaudio.h
+++ b/lib/uaudio.h
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder.
 /*
  * This file is part of DisOrder.

- * Copyright (C) 2009 Richard Kettlewell
+ * Copyright (C) 2009, 2013 Richard Kettlewell

  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by


@@ -28,6 +28,7 @@ extern int uaudio_bits;
 extern int uaudio_channels;
 extern int uaudio_signed;
 extern size_t uaudio_sample_size;
 extern int uaudio_channels;
 extern int uaudio_signed;
 extern size_t uaudio_sample_size;

+extern int uaudio_buffer;

 
 /** @brief Callback to get audio data
  * @param buffer Where to put audio data
 
 /** @brief Callback to get audio data
  * @param buffer Where to put audio data


@@ -165,7 +166,7 @@ void uaudio_thread_stop(void);
 void uaudio_thread_activate(void);
 void uaudio_thread_deactivate(void);
 uint32_t uaudio_schedule_sync(void);
 void uaudio_thread_activate(void);
 void uaudio_thread_deactivate(void);
 uint32_t uaudio_schedule_sync(void);

-void uaudio_schedule_sent(size_t nsamples);
+void uaudio_schedule_sent(size_t nsamples_sent);

 void uaudio_schedule_init(void);
 const struct uaudio *uaudio_find(const char *name);
 
 void uaudio_schedule_init(void);
 const struct uaudio *uaudio_find(const char *name);