From dbf64775ccee19f60bb78f75dcf90793f2e12312 Mon Sep 17 00:00:00 2001
From: casey langen <casey.langen@gmail.com>
Date: Sun, 12 Jan 2020 13:22:56 -0800
Subject: [PATCH] Fixed issue defining `FFMPEG_ENABLED` that resulted in some
 formats not being recognized on some platforms.

---
 clean-nix.sh                                | 2 +-
 src/plugins/stockencoders/CMakeLists.txt    | 2 +-
 src/plugins/stockencoders/main.cpp          | 6 +++++-
 src/plugins/taglib_plugin/CMakeLists.txt    | 2 +-
 src/plugins/taglib_plugin/taglib_plugin.cpp | 4 ++++
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/clean-nix.sh b/clean-nix.sh
index f951ee3bb..374ccfeab 100755
--- a/clean-nix.sh
+++ b/clean-nix.sh
@@ -2,4 +2,4 @@
 make clean 2> /dev/null
 rm -rf bin
 find . -name CMakeCache.txt -delete
-find . -name CMakeFiles -type d -exec rm -r "{}" \; 2> /dev/null
\ No newline at end of file
+find . -name CMakeFiles -type d -exec rm -rf "{}" \; 2> /dev/null
diff --git a/src/plugins/stockencoders/CMakeLists.txt b/src/plugins/stockencoders/CMakeLists.txt
index bb505aa2f..78e74d59f 100644
--- a/src/plugins/stockencoders/CMakeLists.txt
+++ b/src/plugins/stockencoders/CMakeLists.txt
@@ -10,7 +10,7 @@ if (${FFMPEG_ENABLED} MATCHES "false")
   message(STATUS "[stockencoders] *not* defining FFMPEG_ENABLED")
 else()
   message(STATUS "[stockencoders] defining FFMPEG_ENABLED")
-  add_definitions(-FFMPEG_ENABLED)
+  add_definitions(-DFFMPEG_ENABLED)
   # fedora (and probably other RPM-based distros) put ffmpeg includes here...
   include_directories("/usr/include/ffmpeg")
   include_directories("/usr/local/include/ffmpeg")
diff --git a/src/plugins/stockencoders/main.cpp b/src/plugins/stockencoders/main.cpp
index c213001d6..091b77004 100644
--- a/src/plugins/stockencoders/main.cpp
+++ b/src/plugins/stockencoders/main.cpp
@@ -86,7 +86,11 @@ static class Plugin : public IPlugin {
         }
 
         virtual void Release() { }
-        virtual const char* Name() { return "Stock Encoders (MP3, OGG)"; }
+#if defined(FFMPEG_ENABLED) || defined(WIN32)
+        virtual const char* Name() { return "Stock Encoders (MP3 + ffmpeg)"; }
+#else
+        virtual const char* Name() { return "Stock Encoders (MP3)"; }
+#endif
         virtual const char* Version() { return "0.7.0"; }
         virtual const char* Author() { return "clangen"; }
         virtual const char* Guid() { return "d4d13803-a285-4481-ad1e-106131e0d523"; }
diff --git a/src/plugins/taglib_plugin/CMakeLists.txt b/src/plugins/taglib_plugin/CMakeLists.txt
index 39ea08bec..4a6a404d6 100644
--- a/src/plugins/taglib_plugin/CMakeLists.txt
+++ b/src/plugins/taglib_plugin/CMakeLists.txt
@@ -8,7 +8,7 @@ if (${FFMPEG_ENABLED} MATCHES "false")
   message(STATUS "[taglibmetadatareader] *not* defining FFMPEG_ENABLED")
 else()
   message(STATUS "[taglibmetadatareader] defining FFMPEG_ENABLED")
-  add_definitions(-FFMPEG_ENABLED)
+  add_definitions(-DFFMPEG_ENABLED)
 endif()
 
 add_library(taglibreader SHARED ${taglibreader_SOURCES})
diff --git a/src/plugins/taglib_plugin/taglib_plugin.cpp b/src/plugins/taglib_plugin/taglib_plugin.cpp
index 20cfc1f45..cb83df6fa 100644
--- a/src/plugins/taglib_plugin/taglib_plugin.cpp
+++ b/src/plugins/taglib_plugin/taglib_plugin.cpp
@@ -52,7 +52,11 @@
 class TaglibPlugin : public musik::core::sdk::IPlugin {
     public:
         virtual void Release() { delete this; }
+#if defined(FFMPEG_ENABLED) || defined(WIN32)
+        virtual const char* Name() { return "Taglib 1.11 ITagReader (+ffmpeg)"; }
+#else
         virtual const char* Name() { return "Taglib 1.11 ITagReader"; }
+#endif
         virtual const char* Version() { return "0.6.0"; }
         virtual const char* Author() { return "Daniel Önnerby, clangen"; }
         virtual const char* Guid() { return "c77ea7a4-5d57-4f17-8521-aba8eeadeda7"; }