summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Kellermann <max@musicpd.org>2019-07-03 22:10:26 +0200
committerMax Kellermann <max@musicpd.org>2019-07-03 22:10:26 +0200
commit412b04be584ed2f4e259b6d5ed8b084d69f76a81 (patch)
tree5bce6979471eddc0c55dc6db96e120f2c26f0a6f
parent510e6841a01ff1a43c4eac452d3cf2710032fa81 (diff)
output: allow throwing any exception
-rw-r--r--src/output/Control.hxx4
-rw-r--r--src/output/Filtered.hxx8
-rw-r--r--src/output/Interface.hxx6
-rw-r--r--src/output/OutputPlugin.hxx2
-rw-r--r--src/output/Source.hxx2
-rw-r--r--src/output/plugins/AlsaOutputPlugin.cxx2
-rw-r--r--src/output/plugins/JackOutputPlugin.cxx6
-rw-r--r--src/output/plugins/OpenALOutputPlugin.cxx2
-rw-r--r--src/output/plugins/OssOutputPlugin.cxx6
-rw-r--r--src/output/plugins/PulseOutputPlugin.cxx12
-rw-r--r--src/output/plugins/RecorderOutputPlugin.cxx2
-rw-r--r--src/output/plugins/httpd/HttpdInternal.hxx4
12 files changed, 28 insertions, 28 deletions
diff --git a/src/output/Control.hxx b/src/output/Control.hxx
index 2b2ab8d0c..ca89a6db0 100644
--- a/src/output/Control.hxx
+++ b/src/output/Control.hxx
@@ -232,7 +232,7 @@ public:
AudioOutputControl &operator=(const AudioOutputControl &) = delete;
/**
- * Throws #std::runtime_error on error.
+ * Throws on error.
*/
void Configure(const ConfigBlock &block);
@@ -383,7 +383,7 @@ public:
/**
* Caller must lock the mutex.
*
- * Throws #std::runtime_error on error.
+ * Throws on error.
*/
void InternalOpen2(AudioFormat in_audio_format);
diff --git a/src/output/Filtered.hxx b/src/output/Filtered.hxx
index 7113776ee..43aa11bf8 100644
--- a/src/output/Filtered.hxx
+++ b/src/output/Filtered.hxx
@@ -125,7 +125,7 @@ public:
FilterObserver convert_filter;
/**
- * Throws #std::runtime_error on error.
+ * Throws on error.
*/
FilteredAudioOutput(const char *_plugin_name,
std::unique_ptr<AudioOutput> &&_output,
@@ -176,7 +176,7 @@ public:
void SetAttribute(std::string &&name, std::string &&value);
/**
- * Throws #std::runtime_error on error.
+ * Throws on error.
*/
void Enable();
@@ -195,7 +195,7 @@ public:
* Invoke OutputPlugin::open() and configure the
* #ConvertFilter.
*
- * Throws #std::runtime_error on error.
+ * Throws on error.
*
* Caller must not lock the mutex.
*/
@@ -236,7 +236,7 @@ public:
};
/**
- * Throws #std::runtime_error on error.
+ * Throws on error.
*/
std::unique_ptr<FilteredAudioOutput>
audio_output_new(EventLoop &event_loop,
diff --git a/src/output/Interface.hxx b/src/output/Interface.hxx
index f9aafd2f3..36767a4d7 100644
--- a/src/output/Interface.hxx
+++ b/src/output/Interface.hxx
@@ -80,7 +80,7 @@ public:
* Enable the device. This may allocate resources, preparing
* for the device to be opened.
*
- * Throws #std::runtime_error on error.
+ * Throws on error.
*/
virtual void Enable() {}
@@ -93,7 +93,7 @@ public:
/**
* Really open the device.
*
- * Throws #std::runtime_error on error.
+ * Throws on error.
*
* @param audio_format the audio format in which data is going
* to be delivered; may be modified by the plugin
@@ -150,7 +150,7 @@ public:
* Play a chunk of audio data. The method blocks until at
* least one audio frame is consumed.
*
- * Throws #std::runtime_error on error.
+ * Throws on error.
*
* @return the number of bytes played (must be a multiple of
* the frame size)
diff --git a/src/output/OutputPlugin.hxx b/src/output/OutputPlugin.hxx
index 2d80bd530..4b425f695 100644
--- a/src/output/OutputPlugin.hxx
+++ b/src/output/OutputPlugin.hxx
@@ -52,7 +52,7 @@ struct AudioOutputPlugin {
* Configure and initialize the device, but do not open it
* yet.
*
- * Throws #std::runtime_error on error.
+ * Throws on error.
*
* @param param the configuration section, or nullptr if there is
* no configuration
diff --git a/src/output/Source.hxx b/src/output/Source.hxx
index 517616c6d..5e8766520 100644
--- a/src/output/Source.hxx
+++ b/src/output/Source.hxx
@@ -147,7 +147,7 @@ public:
/**
* Ensure that ReadTag() or PeekData() return any input.
*
- * Throws std::runtime_error on error
+ * Throws on error
*
* @param mutex the #Mutex which protects the
* #SharedPipeConsumer; it is locked by the caller, and may be
diff --git a/src/output/plugins/AlsaOutputPlugin.cxx b/src/output/plugins/AlsaOutputPlugin.cxx
index 61ccbf098..a4d45c43d 100644
--- a/src/output/plugins/AlsaOutputPlugin.cxx
+++ b/src/output/plugins/AlsaOutputPlugin.cxx
@@ -248,7 +248,7 @@ private:
* Set up the snd_pcm_t object which was opened by the caller.
* Set up the configured settings and the audio format.
*
- * Throws #std::runtime_error on error.
+ * Throws on error.
*/
void Setup(AudioFormat &audio_format, PcmExport::Params &params);
diff --git a/src/output/plugins/JackOutputPlugin.cxx b/src/output/plugins/JackOutputPlugin.cxx
index b6c14a949..fef0af713 100644
--- a/src/output/plugins/JackOutputPlugin.cxx
+++ b/src/output/plugins/JackOutputPlugin.cxx
@@ -83,7 +83,7 @@ struct JackOutput final : AudioOutput {
* Connect the JACK client and performs some basic setup
* (e.g. register callbacks).
*
- * Throws #std::runtime_error on error.
+ * Throws on error.
*/
void Connect();
@@ -97,7 +97,7 @@ struct JackOutput final : AudioOutput {
}
/**
- * Throws #std::runtime_error on error.
+ * Throws on error.
*/
void Start();
void Stop() noexcept;
@@ -141,7 +141,7 @@ struct JackOutput final : AudioOutput {
static constexpr Domain jack_output_domain("jack_output");
/**
- * Throws #std::runtime_error on error.
+ * Throws on error.
*/
static unsigned
parse_port_list(const char *source, std::string dest[])
diff --git a/src/output/plugins/OpenALOutputPlugin.cxx b/src/output/plugins/OpenALOutputPlugin.cxx
index 9aa19c20c..f4c0d46b3 100644
--- a/src/output/plugins/OpenALOutputPlugin.cxx
+++ b/src/output/plugins/OpenALOutputPlugin.cxx
@@ -89,7 +89,7 @@ private:
}
/**
- * Throws #std::runtime_error on error.
+ * Throws on error.
*/
void SetupContext();
};
diff --git a/src/output/plugins/OssOutputPlugin.cxx b/src/output/plugins/OssOutputPlugin.cxx
index dee0a1e71..21f906969 100644
--- a/src/output/plugins/OssOutputPlugin.cxx
+++ b/src/output/plugins/OssOutputPlugin.cxx
@@ -120,7 +120,7 @@ private:
/**
* Reopen the device with the saved audio_format, without any probing.
*
- * Throws #std::runtime_error on error.
+ * Throws on error.
*/
void Reopen();
@@ -284,7 +284,7 @@ oss_try_ioctl(FileDescriptor fd, unsigned long request, int value,
* Set up the channel number, and attempts to find alternatives if the
* specified number is not supported.
*
- * Throws #std::runtime_error on error.
+ * Throws on error.
*/
static void
oss_setup_channels(FileDescriptor fd, AudioFormat &audio_format)
@@ -333,7 +333,7 @@ oss_setup_channels(FileDescriptor fd, AudioFormat &audio_format)
* Set up the sample rate, and attempts to find alternatives if the
* specified sample rate is not supported.
*
- * Throws #std::runtime_error on error.
+ * Throws on error.
*/
static void
oss_setup_sample_rate(FileDescriptor fd, AudioFormat &audio_format)
diff --git a/src/output/plugins/PulseOutputPlugin.cxx b/src/output/plugins/PulseOutputPlugin.cxx
index b7207f91a..6cb92fdec 100644
--- a/src/output/plugins/PulseOutputPlugin.cxx
+++ b/src/output/plugins/PulseOutputPlugin.cxx
@@ -109,7 +109,7 @@ private:
/**
* Attempt to connect asynchronously to the PulseAudio server.
*
- * Throws #std::runtime_error on error.
+ * Throws on error.
*/
void Connect();
@@ -118,7 +118,7 @@ private:
*
* Caller must lock the main loop.
*
- * Throws #std::runtime_error on error.
+ * Throws on error.
*/
void SetupContext();
@@ -140,7 +140,7 @@ private:
*
* Caller must lock the main loop.
*
- * Throws #std::runtime_error on error.
+ * Throws on error.
*/
void WaitConnection();
@@ -149,7 +149,7 @@ private:
*
* Caller must lock the main loop.
*
- * Throws #std::runtime_error on error.
+ * Throws on error.
*/
void SetupStream(const pa_sample_spec &ss);
@@ -163,14 +163,14 @@ private:
* not. The mainloop must be locked before calling this
* function.
*
- * Throws #std::runtime_error on error.
+ * Throws on error.
*/
void WaitStream();
/**
* Sets cork mode on the stream.
*
- * Throws #std::runtime_error on error.
+ * Throws on error.
*/
void StreamPause(bool pause);
};
diff --git a/src/output/plugins/RecorderOutputPlugin.cxx b/src/output/plugins/RecorderOutputPlugin.cxx
index 21e2b1aa5..62dc5d91c 100644
--- a/src/output/plugins/RecorderOutputPlugin.cxx
+++ b/src/output/plugins/RecorderOutputPlugin.cxx
@@ -97,7 +97,7 @@ private:
/**
* Finish the encoder and commit the file.
*
- * Throws #std::runtime_error on error.
+ * Throws on error.
*/
void Commit();
diff --git a/src/output/plugins/httpd/HttpdInternal.hxx b/src/output/plugins/httpd/HttpdInternal.hxx
index 0f26bf79c..09ca893ae 100644
--- a/src/output/plugins/httpd/HttpdInternal.hxx
+++ b/src/output/plugins/httpd/HttpdInternal.hxx
@@ -175,7 +175,7 @@ public:
/**
* Caller must lock the mutex.
*
- * Throws #std::runtime_error on error.
+ * Throws on error.
*/
void OpenEncoder(AudioFormat &audio_format);
@@ -252,7 +252,7 @@ public:
/**
* Mutext must not be locked.
*
- * Throws #std::runtime_error on error.
+ * Throws on error.
*/
void EncodeAndPlay(const void *chunk, size_t size);