mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2024-11-19 11:10:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issue defining FFMPEG_ENABLED that resulted in some formats not being recognized on some platforms.

Browse Source
This commit is contained in:
casey langen 2020-01-12 13:22:56 -08:00
parent f45d302c38
commit dbf64775cc
5 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clean-nix.sh
View File

@ -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
find . -name CMakeFiles -type d -exec rm -rf "{}" \; 2> /dev/null

2
src/plugins/stockencoders/CMakeLists.txt
View File

@ -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")

6
src/plugins/stockencoders/main.cpp
View File

@ -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"; }

2
src/plugins/taglib_plugin/CMakeLists.txt
View File

@ -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})

4
src/plugins/taglib_plugin/taglib_plugin.cpp
View File

@ -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"; }