Merge branch 'efuhgeh' of git://github.com/neheb/MPD

3 files changed, 14 insertions, 14 deletions

diff --git a/src/decoder/plugins/HybridDsdDecoderPlugin.cxx b/src/decoder/plugins/HybridDsdDecoderPlugin.cxx
index 2eece030d..0132cffdc 100644
--- a/src/decoder/plugins/HybridDsdDecoderPlugin.cxx
+++ b/src/decoder/plugins/HybridDsdDecoderPlugin.cxx
@@ -32,7 +32,7 @@ static constexpr Domain hybrid_dsd_domain("hybrid_dsd");
 
 namespace {
 
-static bool
+bool
 InitHybridDsdDecoder(const ConfigBlock &block)
 {
 	/* this plugin is disabled by default because for people
diff --git a/src/decoder/plugins/OpusDecoderPlugin.cxx b/src/decoder/plugins/OpusDecoderPlugin.cxx
index 733bf61a8..861a60e4f 100644
--- a/src/decoder/plugins/OpusDecoderPlugin.cxx
+++ b/src/decoder/plugins/OpusDecoderPlugin.cxx
@@ -41,29 +41,29 @@
 
 namespace {
 
-static constexpr opus_int32 opus_sample_rate = 48000;
+constexpr opus_int32 opus_sample_rate = 48000;
 
 /**
  * Allocate an output buffer for 16 bit PCM samples big enough to hold
  * a quarter second, larger than 120ms required by libopus.
  */
-static constexpr unsigned opus_output_buffer_frames = opus_sample_rate / 4;
+constexpr unsigned opus_output_buffer_frames = opus_sample_rate / 4;
 
 gcc_pure
-static bool
+bool
 IsOpusHead(const ogg_packet &packet) noexcept
 {
 	return packet.bytes >= 8 && memcmp(packet.packet, "OpusHead", 8) == 0;
 }
 
 gcc_pure
-static bool
+bool
 IsOpusTags(const ogg_packet &packet) noexcept
 {
 	return packet.bytes >= 8 && memcmp(packet.packet, "OpusTags", 8) == 0;
 }
 
-static bool
+bool
 mpd_opus_init(gcc_unused const ConfigBlock &block)
 {
 	LogDebug(opus_domain, opus_get_version_string());
@@ -266,7 +266,7 @@ MPDOpusDecoder::Seek(uint64_t where_frame)
 	}
 }
 
-static void
+void
 mpd_opus_stream_decode(DecoderClient &client,
 		       InputStream &input_stream)
 {
@@ -300,7 +300,7 @@ mpd_opus_stream_decode(DecoderClient &client,
 	}
 }
 
-static bool
+bool
 ReadAndParseOpusHead(OggSyncState &sync, OggStreamState &stream,
 		     unsigned &channels)
 {
@@ -312,7 +312,7 @@ ReadAndParseOpusHead(OggSyncState &sync, OggStreamState &stream,
 		audio_valid_channel_count(channels);
 }
 
-static bool
+bool
 ReadAndVisitOpusTags(OggSyncState &sync, OggStreamState &stream,
 		     TagHandler &handler)
 {
@@ -325,7 +325,7 @@ ReadAndVisitOpusTags(OggSyncState &sync, OggStreamState &stream,
 			     handler);
 }
 
-static void
+void
 VisitOpusDuration(InputStream &is, OggSyncState &sync, OggStreamState &stream,
 		  TagHandler &handler)
 {
@@ -339,7 +339,7 @@ VisitOpusDuration(InputStream &is, OggSyncState &sync, OggStreamState &stream,
 	}
 }
 
-static bool
+bool
 mpd_opus_scan_stream(InputStream &is, TagHandler &handler) noexcept
 {
 	InputStreamReader reader(is);
@@ -363,14 +363,14 @@ mpd_opus_scan_stream(InputStream &is, TagHandler &handler) noexcept
 	return true;
 }
 
-static const char *const opus_suffixes[] = {
+const char *const opus_suffixes[] = {
 	"opus",
 	"ogg",
 	"oga",
 	nullptr
 };
 
-static const char *const opus_mime_types[] = {
+const char *const opus_mime_types[] = {
 	/* the official MIME type (RFC 5334) */
 	"audio/ogg",
 
diff --git a/src/encoder/plugins/OpusEncoderPlugin.cxx b/src/encoder/plugins/OpusEncoderPlugin.cxx
index ae693ea33..fcfdced7e 100644
--- a/src/encoder/plugins/OpusEncoderPlugin.cxx
+++ b/src/encoder/plugins/OpusEncoderPlugin.cxx
@@ -120,7 +120,7 @@ PreparedOpusEncoder::PreparedOpusEncoder(const ConfigBlock &block)
 		throw std::runtime_error("Invalid signal");
 }
 
-static PreparedEncoder *
+PreparedEncoder *
 opus_encoder_init(const ConfigBlock &block)
 {
 	return new PreparedOpusEncoder(block);