Browse Source

Fix build without audio file support

Closes #962

Signed-off-by: falkTX <falktx@falktx.com>
tags/v2.1-rc1
falkTX 5 years ago
parent
commit
c0af83748f
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
4 changed files with 9 additions and 2 deletions
  1. +1
    -2
      source/includes/CarlaNativePrograms.hpp
  2. +4
    -0
      source/native-plugins/audio-file.cpp
  3. +2
    -0
      source/plugin/carla-lv2.cpp
  4. +2
    -0
      source/plugin/carla-vst.cpp

+ 1
- 2
source/includes/CarlaNativePrograms.hpp View File

@@ -54,10 +54,9 @@ struct NativePluginPresetManager {
NativePluginPresetManager(const char* const paths, const char* const wildcard) NativePluginPresetManager(const char* const paths, const char* const wildcard)
: filenames() : filenames()
{ {
CARLA_SAFE_ASSERT_RETURN(paths != nullptr,);
CARLA_SAFE_ASSERT_RETURN(wildcard != nullptr,); CARLA_SAFE_ASSERT_RETURN(wildcard != nullptr,);


if (paths[0] == '\0' || wildcard[0] == '\0')
if (paths == nullptr || paths[0] == '\0' || wildcard[0] == '\0')
return; return;


const StringArray splitPaths(StringArray::fromTokens(paths, CARLA_OS_SPLIT_STR, "")); const StringArray splitPaths(StringArray::fromTokens(paths, CARLA_OS_SPLIT_STR, ""));


+ 4
- 0
source/native-plugins/audio-file.cpp View File

@@ -31,6 +31,10 @@ static const char* const audiofilesWildcard =
"*.flac;*.oga;*.ogg;*.w64;*.wav;" "*.flac;*.oga;*.ogg;*.w64;*.wav;"
# endif # endif
#endif #endif
#if !defined(HAVE_SNDFILE) && !defined(HAVE_FFMPEG)
# warning sndfile and ffmpeg libraries missing, no audio file support will be available
""
#endif
; ;


// ----------------------------------------------------------------------- // -----------------------------------------------------------------------


+ 2
- 0
source/plugin/carla-lv2.cpp View File

@@ -784,6 +784,8 @@ protected:
case NATIVE_HOST_OPCODE_HOST_IDLE: case NATIVE_HOST_OPCODE_HOST_IDLE:
case NATIVE_HOST_OPCODE_INTERNAL_PLUGIN: case NATIVE_HOST_OPCODE_INTERNAL_PLUGIN:
case NATIVE_HOST_OPCODE_QUEUE_INLINE_DISPLAY: case NATIVE_HOST_OPCODE_QUEUE_INLINE_DISPLAY:
case NATIVE_HOST_OPCODE_REQUEST_IDLE:
case NATIVE_HOST_OPCODE_GET_FILE_PATH:
// nothing // nothing
break; break;




+ 2
- 0
source/plugin/carla-vst.cpp View File

@@ -772,6 +772,8 @@ protected:
case NATIVE_HOST_OPCODE_UI_UNAVAILABLE: case NATIVE_HOST_OPCODE_UI_UNAVAILABLE:
case NATIVE_HOST_OPCODE_INTERNAL_PLUGIN: case NATIVE_HOST_OPCODE_INTERNAL_PLUGIN:
case NATIVE_HOST_OPCODE_QUEUE_INLINE_DISPLAY: case NATIVE_HOST_OPCODE_QUEUE_INLINE_DISPLAY:
case NATIVE_HOST_OPCODE_REQUEST_IDLE:
case NATIVE_HOST_OPCODE_GET_FILE_PATH:
// nothing // nothing
break; break;




Loading…
Cancel
Save