From 938079a75f07326a14da8007cfddea473c64070a Mon Sep 17 00:00:00 2001 From: Daniel Wolf Date: Wed, 21 Sep 2016 10:32:26 +0200 Subject: [PATCH] Renamed phoneExtraction to phoneRecognition --- CMakeLists.txt | 2 +- src/main.cpp | 4 ++-- src/{phoneExtraction.cpp => phoneRecognition.cpp} | 4 ++-- src/{phoneExtraction.h => phoneRecognition.h} | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) rename src/{phoneExtraction.cpp => phoneRecognition.cpp} (99%) rename src/{phoneExtraction.h => phoneRecognition.h} (85%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b9c906..4a4090d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -212,7 +212,7 @@ set(SOURCE_FILES src/EnumConverter.h src/Viseme.cpp src/Viseme.h src/mouthAnimation.cpp src/mouthAnimation.h - src/phoneExtraction.cpp src/phoneExtraction.h + src/phoneRecognition.cpp src/phoneRecognition.h src/platformTools.cpp src/platformTools.h src/tools.cpp src/tools.h src/audio/AudioClip.cpp src/audio/AudioClip.h diff --git a/src/main.cpp b/src/main.cpp index 0f7045a..c014f86 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3,7 +3,7 @@ #include #include #include "audio/WaveFileReader.h" -#include "phoneExtraction.h" +#include "phoneRecognition.h" #include "mouthAnimation.h" #include "appInfo.h" #include "NiceCmdLineOutput.h" @@ -153,7 +153,7 @@ int main(int argc, char *argv[]) { BoundedTimeline phones(TimeRange::zero()); { ProgressBar progressBar; - phones = detectPhones( + phones = recognizePhones( *createAudioClip(inputFileName.getValue()), dialogFile.isSet() ? readTextFile(path(dialogFile.getValue())) : boost::optional(), maxThreadCount.getValue(), diff --git a/src/phoneExtraction.cpp b/src/phoneRecognition.cpp similarity index 99% rename from src/phoneExtraction.cpp rename to src/phoneRecognition.cpp index c1a8c1c..d9e1225 100644 --- a/src/phoneExtraction.cpp +++ b/src/phoneRecognition.cpp @@ -1,5 +1,5 @@ #include -#include "phoneExtraction.h" +#include "phoneRecognition.h" #include "audio/SampleRateConverter.h" #include "platformTools.h" #include "tools.h" @@ -356,7 +356,7 @@ Timeline getUnknownSounds(const Timeline& utterances, const Timeline return unknownSounds; } -BoundedTimeline detectPhones( +BoundedTimeline recognizePhones( const AudioClip& inputAudioClip, optional dialog, int maxThreadCount, diff --git a/src/phoneExtraction.h b/src/phoneRecognition.h similarity index 85% rename from src/phoneExtraction.h rename to src/phoneRecognition.h index b0fea11..66fe39f 100644 --- a/src/phoneExtraction.h +++ b/src/phoneRecognition.h @@ -5,7 +5,7 @@ #include "ProgressBar.h" #include "BoundedTimeline.h" -BoundedTimeline detectPhones( +BoundedTimeline recognizePhones( const AudioClip& audioClip, boost::optional dialog, int maxThreadCount,