aboutsummaryrefslogtreecommitdiffstats
path: root/src/output
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-02-16 01:38:09 +0100
committerMax Kellermann <max@duempel.org>2009-02-16 01:38:09 +0100
commit67da4cfe3c4c2ffc1e7fc98a6ea164b860f788cb (patch)
tree43d14e954b9d8effd8d6fa0bab4b7800ec63c3ca /src/output
parent80702fa3a22b156aceb74156dc187ae916219e41 (diff)
downloadmpd-67da4cfe3c4c2ffc1e7fc98a6ea164b860f788cb.tar.gz
mpd-67da4cfe3c4c2ffc1e7fc98a6ea164b860f788cb.tar.xz
mpd-67da4cfe3c4c2ffc1e7fc98a6ea164b860f788cb.zip
output_plugin: reorder method declarations
Initialization and deinitialization first, then tag functions, then play/cancel/pause.
Diffstat (limited to '')
-rw-r--r--src/output_plugin.h34
1 files changed, 17 insertions, 17 deletions
diff --git a/src/output_plugin.h b/src/output_plugin.h
index 8e5ed2b6a..925982a9c 100644
--- a/src/output_plugin.h
+++ b/src/output_plugin.h
@@ -71,11 +71,28 @@ struct audio_output_plugin {
bool (*open)(void *data, struct audio_format *audio_format);
/**
+ * Close the device.
+ */
+ void (*close)(void *data);
+
+ /**
+ * Display metadata for the next chunk. Optional method,
+ * because not all devices can display metadata.
+ */
+ void (*send_tag)(void *data, const struct tag *tag);
+
+ /**
* Play a chunk of audio data.
*/
bool (*play)(void *data, const char *playChunk, size_t size);
/**
+ * Try to cancel data which may still be in the device's
+ * buffers.
+ */
+ void (*cancel)(void *data);
+
+ /**
* Pause the device. If supported, it may perform a special
* action, which keeps the device open, but does not play
* anything. Output plugins like "shout" might want to play
@@ -89,27 +106,10 @@ struct audio_output_plugin {
bool (*pause)(void *data);
/**
- * Try to cancel data which may still be in the device's
- * buffers.
- */
- void (*cancel)(void *data);
-
- /**
- * Close the device.
- */
- void (*close)(void *data);
-
- /**
* Control the device. Usualy used for implementing
* set and get mixer levels
*/
bool (*control)(void *data, int cmd, void *arg);
-
- /**
- * Display metadata for the next chunk. Optional method,
- * because not all devices can display metadata.
- */
- void (*send_tag)(void *data, const struct tag *tag);
};
#endif