Revert "Revert "replace srconv with src_conv using new licence""

This reverts commit c5ed7db.
csound · Apr 12, 2018 · e9e192b · e9e192b
1 parent 7c2924d
commit e9e192b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 15 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -497,8 +497,10 @@ SET(BUILD_SHARED_LIBS ON)
 # First, required stuff
 if (MSVC)
   find_library(LIBSNDFILE_LIBRARY NAMES sndfile libsndfile-1 libsndfile)
+  find_library(LIBSAMPLERATE_LIBRARY NAMES samplerate libsamplerate-1 libsamplerate)
 else()
   find_library(LIBSNDFILE_LIBRARY sndfile libsndfile-1)
+  find_library(LIBSAMPLERATE_LIBRARY NAMES samplerate libsamplerate-1)
 endif()
 
 
@@ -1208,7 +1210,7 @@ if(EMSCRIPTEN)
   include_directories(emscripten/deps/libsndfile-1.0.25/src/)
 endif()
 
-set(libcsound_LIBS ${LIBSNDFILE_LIBRARY})
+set(libcsound_LIBS ${LIBSNDFILE_LIBRARY} ${LIBSAMPLERATE_LIBRARY})
 if(REQUIRE_PTHREADS AND PTHREAD_LIBRARY)
   list(APPEND libcsound_LIBS ${PTHREAD_LIBRARY})
 endif()

diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt
@@ -5,7 +5,7 @@ set(stdutil_SRCS
     het_export.c    het_import.c    hetro.c     lpanal.c
     lpc_export.c    lpc_import.c    mixer.c     pvanal.c
     pv_export.c     pv_import.c     pvlook.c    scale.c
-    sndinfo.c       srconv.c        std_util.c  xtrct.c
+    sndinfo.c       src_conv.c      std_util.c  xtrct.c
     SDIF/sdif.c)
 
 if(MSVC) 
@@ -18,7 +18,9 @@ else()
   make_plugin(stdutil "${stdutil_SRCS}" m ${LIBSNDFILE_LIBRARY})
 endif()
 
+find_library(LIBSAMPLERATE_LIBRARY NAMES samplerate libsamplerate-0)
 add_dependency_to_framework(stdutil ${LIBSNDFILE_LIBRARY})
+add_dependency_to_framework(stdutil ${LIBSAMPLERATE_LIBRARY})
 
 if(BUILD_UTILITIES)
     make_utility(atsa        atsa_main.c)
@@ -43,20 +45,20 @@ if(BUILD_UTILITIES)
     make_utility(pv_import   pvi_main.c)
     make_utility(scale       scale_main.c)
     make_utility(sndinfo     sndinfo_main.c)
-    make_utility(srconv      srconv_main.c)
+    make_utility(src_conv    src_conv_main.c)
 
 
     #find_library(LIBSNDFILE_LIBRARY sndfile libsndfile-1)
-    find_library(LIBSAMPLERATE_LIBRARY NAMES samplerate libsamplerate-0)
-
-    if(LIBSNDFILE_LIBRARY AND LIBSAMPLERATE_LIBRARY)
-        make_executable(src_conv new_srconv.c "${LIBSNDFILE_LIBRARY};${LIBSAMPLERATE_LIBRARY}")
-        if(MSVC)
-            target_link_libraries(src_conv ${LIBSNDFILE_SUPPORT_LIBS})
-        endif()
-    else()
-        message(STATUS "Not building src_conv (libsndfile or libsamplerate not found).")
-    endif()
+
+
+    # if(LIBSNDFILE_LIBRARY AND LIBSAMPLERATE_LIBRARY)
+    #     make_executable(src_conv new_srconv.c "${LIBSNDFILE_LIBRARY};${LIBSAMPLERATE_LIBRARY}")
+    #     if(MSVC)
+    #         target_link_libraries(src_conv ${LIBSNDFILE_SUPPORT_LIBS})
+    #     endif()
+    # else()
+    #     message(STATUS "Not building src_conv (libsndfile or libsamplerate not found).")
+    # endif()
 
 endif()
 add_subdirectory(SDIF)
diff --git a/util/std_util.c b/util/std_util.c
@@ -79,7 +79,7 @@ PUBLIC int32_t csoundModuleCreate(CSOUND *csound)
     err |= pvlook_init_(csound);
     err |= scale_init_(csound);
     err |= sndinfo_init_(csound);
-    err |= srconv_init_(csound);
+    err |= src_conv_init_(csound);
     return err;
 }
 

diff --git a/util/std_util.h b/util/std_util.h
@@ -42,7 +42,7 @@ extern int32_t pv_export_init_(CSOUND *);
 extern int32_t pv_import_init_(CSOUND *);
 extern int32_t scale_init_(CSOUND *);
 extern int32_t sndinfo_init_(CSOUND *);
-extern int32_t srconv_init_(CSOUND *);
+extern int32_t src_conv_init_(CSOUND *);
 extern int32_t xtrct_init_(CSOUND *);
 
 #endif  /* CSOUND_STD_UTIL_H */