aboutsummaryrefslogtreecommitdiff
path: root/src/output_all.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/output_all.h')
-rw-r--r--src/output_all.h17
1 files changed, 6 insertions, 11 deletions
diff --git a/src/output_all.h b/src/output_all.h
index 4eeb94f1..17b5a9b7 100644
--- a/src/output_all.h
+++ b/src/output_all.h
@@ -30,7 +30,6 @@
#include <stddef.h>
struct audio_format;
-struct music_buffer;
struct music_chunk;
struct player_control;
@@ -78,13 +77,10 @@ audio_output_all_enable_disable(void);
*
* @param audio_format the preferred audio format, or NULL to reuse
* the previous format
- * @param buffer the #music_buffer where consumed #music_chunk objects
* should be returned
* @return true on success, false on failure
*/
-bool
-audio_output_all_open(const struct audio_format *audio_format,
- struct music_buffer *buffer);
+bool audio_output_all_open(const struct audio_format *audio_format);
/**
* Closes all audio outputs.
@@ -112,20 +108,19 @@ audio_output_all_play(struct music_chunk *chunk);
/**
* Checks if the output devices have drained their music pipe, and
- * returns the consumed music chunks to the #music_buffer.
+ * frees the consumed music chunks.
*
- * @return the number of chunks to play left in the #music_pipe
+ * @return the number of samples to play left in the #music_pipe
*/
-unsigned
-audio_output_all_check(void);
+unsigned audio_output_all_check(void);
/**
* Checks if the size of the #music_pipe is below the #threshold. If
* not, it attempts to synchronize with all output threads, and waits
* until another #music_chunk is finished.
*
- * @param threshold the maximum number of chunks in the pipe
- * @return true if there are less than #threshold chunks in the pipe
+ * @param threshold the maximum number of samples in the pipe
+ * @return true if there are less than #threshold samples in the pipe
*/
bool
audio_output_all_wait(struct player_control *pc, unsigned threshold);