Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

praatcon.exe no longer available tmp fix #2

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

praatcon.exe no longer available tmp fix #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0083d0
added git & RStudio project files
raphywink Jun 15, 2016
67938fe
as praatcon.exe doesn't exist any more use praat.exe instead
raphywink Jun 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .Rbuildignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
^.*\.Rproj$
^\.Rproj\.user$
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.Rproj.user
.Rhistory
.RData
.Ruserdata
17 changes: 17 additions & 0 deletions PraatR.Rproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
Version: 1.0

RestoreWorkspace: Default
SaveWorkspace: Default
AlwaysSaveHistory: Default

EnableCodeIndexing: Yes
UseSpacesForTab: Yes
NumSpacesForTab: 2
Encoding: UTF-8

RnwWeave: knitr
LaTeX: pdfLaTeX

BuildType: Package
PackageUseDevtools: Yes
PackageInstallArgs: --no-multiarch --with-keep.source
2 changes: 1 addition & 1 deletion R/praat.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ SystemName = Sys.info()["sysname"] # "Windows", "Linux", or "Darwin" (=Mac)
if( OSType=="windows" & SystemName=="Windows" ){
UserOS = "Windows" # For later down below in the code
# Make list of possible file paths and find which ones exist
PossiblePraatPaths = paste(LibraryDirectories,InterveningSlashes,"PraatR/praatcon.exe",sep="")
PossiblePraatPaths = paste(LibraryDirectories,InterveningSlashes,"PraatR/praat.exe",sep="")
ExistingPraatPaths = file.exists(PossiblePraatPaths)
# If praatcon.exe can't be found anywhere, issue an error message and stop computation
if( sum(ExistingPraatPaths)==0 ){ stop("Could not find praatcon.exe. Make sure PraatR is properly installed.") }
Expand Down