remove ari dependency

Author: maRce10

DESCRIPTION

@@ -4,7 +4,7 @@ Title: Dynamic Spectrogram Visualizations
 Version: 1.0.4
 Description: A set of tools to generate dynamic spectrogram visualizations in video format.
 License: GPL (>= 2)
-Imports: utils, grDevices, graphics, seewave, tuneR, grid, png, ggplot2, viridis, scales, ari, gganimate, warbleR
+Imports: utils, grDevices, graphics, seewave, tuneR, grid, png, ggplot2, viridis, scales, gganimate, warbleR
 Depends: R (>= 3.2.1)
 LazyData: TRUE
 SystemRequirements: ffmpeg

NEWS.md

@@ -2,6 +2,7 @@
 * Fixed destFolder parameter in prep_static_ggspectro() and paged_spectro()
 * Should have more expected results for file save locations outside the working directory
 * Fixed issue where extra page sometimes created with paged_spectro()
+* Remove 'ari' package dependency
 
 # *dynaSpec 1.0.3*
 

R/dynaSpec-package.R

@@ -10,7 +10,6 @@
 #' @importFrom png readPNG
 #' @importFrom warbleR pblapply_wrblr_int
 #' @importFrom scales modulus_trans
-#' @importFrom ari have_ffmpeg_exec ffmpeg_exec
 #' @importFrom png readPN
 #' @importFrom grid grid.raster
 #' @importFrom parallel makePSOCKcluster

R/internal_functions.R

@@ -11,4 +11,25 @@ warning2 <- function (...)
   warning(..., call. = FALSE)
 }
 
+# functions adopted from ari to check if ffmpeg is installed
+ffmpeg_exec2 <- function(quote = FALSE) {
+  candidates <- c(Sys.getenv("ffmpeg"), Sys.which("ffmpeg"))
+  ffmpeg <- candidates[nchar(candidates) > 0][1]
+  if (is.na(ffmpeg)) {
+    stop("Could not find ffmpeg")
+  }
+  if (!ffmpeg %in% c("ffmpeg", "ffmpeg.exe")) {
+    ffmpeg = normalizePath(ffmpeg, winslash = "/")
+  }
+  if (quote) {
+    ffmpeg = shQuote(ffmpeg)
+  }
+  return(ffmpeg)
+}
 
+have_ffmpeg_exec2 <- function(){
+  exec = try({
+    ffmpeg_exec2()
+  }, silent = TRUE)
+  !inherits(exec, "try-error")
+}

R/paged_spectro.R

@@ -66,11 +66,14 @@ paged_spectro <- function(specParams,
 {
   xmin <- ymin <- xmax <- ymax <- NULL
   #This ^^ suppresses note about "no visible binding for global variable ‘xmax’"
-  if (!ari::have_ffmpeg_exec()) {
+  if (!have_ffmpeg_exec2()) {
     cat("\n*****This script needs ffmpeg to work*****\n")
     cat("If you have a mac, with HomeBrew installed, you can fix this easily
       in terminal with:\n")
     cat("\n>\tbrew install ffmpeg\n")
+    cat("If you have are on a linux computer:\n")
+    cat("\n>\tsudo apt install ffmpeg\n")
+    
     cat("\nIf not, download and install it from ffmpeg.org")
   } else{
     if (is.null(destFolder)) {
@@ -330,7 +333,7 @@ paged_spectro <- function(specParams,
       #slight stutter for continuous sounds across segments, but the alternative step below doesn't work quite right, so good enough
       system(
         paste0(
-          ari::ffmpeg_exec(),
+          ffmpeg_exec2(),
           ' -f concat -ss 00:00:00.000 -safe 0 -i "',
           fs::path(tempdir, "mp4Segments.txt"),
           '" -codec copy -y "',
@@ -343,11 +346,11 @@ paged_spectro <- function(specParams,
       #Concat Step 2
       #Add audio track back in (couldn't figure how to combine these steps)
       #THIS STEP CURRENTLY DOESN'T WORK WELL (DROPS LAST FEW FRAMES B/C MISMATCH IN A/V LENGTHS)
-      # system(paste0(ari::ffmpeg_exec(),' -ss 0 -i "',paste0(tempdir,"deleteme.mp4"),'" -i "',newWavOut,'"  -c:v libx264 -map 0:v:0 -map 1:a:0 -c:a aac -ac 1 -b:a 192k -y -vsync 1 -t ',cropFileDur3,' "',vidName,'"'))
+      # system(paste0(ffmpeg_exec2(),' -ss 0 -i "',paste0(tempdir,"deleteme.mp4"),'" -i "',newWavOut,'"  -c:v libx264 -map 0:v:0 -map 1:a:0 -c:a aac -ac 1 -b:a 192k -y -vsync 1 -t ',cropFileDur3,' "',vidName,'"'))
 
 
       #Old Concat Step 1 (when step 2 is implemented); results in deleteme.mp4 intermediate
-      # system(paste0(ari::ffmpeg_exec(),' -f concat -safe 0 -i "',paste0(tempdir,"mp4Segments.txt"),'" -codec copy -y "',paste0(tempdir,"deleteme.mp4"),'"'))
+      # system(paste0(ffmpeg_exec2(),' -f concat -safe 0 -i "',paste0(tempdir,"mp4Segments.txt"),'" -codec copy -y "',paste0(tempdir,"deleteme.mp4"),'"'))
 
 
     }

dynaSpec.Rproj

@@ -1,5 +1,5 @@
 Version: 1.0
-ProjectId: 22075ac6-f94b-45d1-b337-4bfd98a13a4f
+ProjectId: b11678cd-19a3-4ba7-b4b3-3ec4cf6295df
 
 RestoreWorkspace: Default
 SaveWorkspace: Default