Only check for rstudio graphics device

hadley · hadley · commit a994685681c3 · 2014-04-23T07:25:10.000-05:00
diff --git a/R/animate.r b/R/animate.r
@@ -48,8 +48,8 @@ animate <- function(data, tour_path = grand_tour(), display = display_xy(), star
     to_stop()
   }
   plat <- find_platform()
-  if (plat$iface == "rstudio" && fps > 19) {
-    warning("Rstudio supports maximum fps of 19", call. = FALSE)
+  if (rstudio_gd() && fps > 19) {
+    warning("Rstudio graphics device supports maximum fps of 19", call. = FALSE)
     fps <- 19
   }
 
@@ -101,4 +101,4 @@ animate <- function(data, tour_path = grand_tour(), display = display_xy(), star
   invisible(bases[, , seq_len(b)])
 }
 
-
+rstudio_gd <- function() identical(names(dev.cur()), "RStudioGD")

Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,8 @@ animate <- function(data, tour_path = grand_tour(), display = display_xy(), star`
`48`	`48`	`to_stop()`
`49`	`49`	`}`
`50`	`50`	`plat <- find_platform()`
`51`		`- if (plat$iface == "rstudio" && fps > 19) {`
`52`		`- warning("Rstudio supports maximum fps of 19", call. = FALSE)`
	`51`	`+ if (rstudio_gd() && fps > 19) {`
	`52`	`+ warning("Rstudio graphics device supports maximum fps of 19", call. = FALSE)`
`53`	`53`	`fps <- 19`
`54`	`54`	`}`
`55`	`55`
`@@ -101,4 +101,4 @@ animate <- function(data, tour_path = grand_tour(), display = display_xy(), star`
`101`	`101`	`invisible(bases[, , seq_len(b)])`
`102`	`102`	`}`
`103`	`103`
`104`		`-`
	`104`	`+rstudio_gd <- function() identical(names(dev.cur()), "RStudioGD")`