diff --git a/CMakeLists.txt b/CMakeLists.txt index ef5c2b2..d287005 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.2) -include(appInfo.cmake) +include(app-info.cmake) project(${appName}) @@ -8,9 +8,9 @@ project(${appName}) add_subdirectory(rhubarb) # Build and install extras -add_subdirectory("extras/AdobeAfterEffects") -add_subdirectory("extras/MagixVegas") -add_subdirectory("extras/EsotericSoftwareSpine") +add_subdirectory("extras/adobe-after-effects") +add_subdirectory("extras/magix-vegas") +add_subdirectory("extras/esoteric-software-spine") # Install misc. files install(FILES README.adoc LICENSE.md CHANGELOG.md DESTINATION .) diff --git a/README.adoc b/README.adoc index e66bca0..e459dd3 100644 --- a/README.adoc +++ b/README.adoc @@ -40,7 +40,7 @@ https://www.youtube.com/watch?v=zzdPSFJRlEo[image:http://img.youtube.com/vi/zzdP [[afterEffects]] === Adobe After Effects -You can use Rhubarb Lip Sync to animate dialog right from Adobe After Effects. For more information, <> or see the directory `extras/AdobeAfterEffects`. +You can use Rhubarb Lip Sync to animate dialog right from Adobe After Effects. For more information, <> or see the directory `extras/adobe-after-effects`. image:img/after-effects.png[] @@ -54,14 +54,14 @@ image:img/moho.png[] [[spine]] === Spine by Esoteric Software -Rhubarb Lip Sync for Spine is a graphical tool that allows you to import a Spine project, perform automatic lip sync, then re-import the result into Spine. For more information, <> or see the directory `extras/EsotericSoftwareSpine` of the download. +Rhubarb Lip Sync for Spine is a graphical tool that allows you to import a Spine project, perform automatic lip sync, then re-import the result into Spine. For more information, <> or see the directory `extras/esoteric-software-spine` of the download. image:img/spine.png[] [[vegas]] === Vegas Pro by Magix -Rhubarb Lip Sync also comes with two plugin scripts for Vegas Pro (previously Sony Vegas). For more information, <> or see the directory `extras/MagixVegas` of the download. +Rhubarb Lip Sync also comes with two plugin scripts for Vegas Pro (previously Sony Vegas). For more information, <> or see the directory `extras/magix-vegas` of the download. image:img/vegas.png[] diff --git a/appInfo.cmake b/app-info.cmake similarity index 100% rename from appInfo.cmake rename to app-info.cmake diff --git a/extras/AdobeAfterEffects/CMakeLists.txt b/extras/adobe-after-effects/CMakeLists.txt similarity index 56% rename from extras/AdobeAfterEffects/CMakeLists.txt rename to extras/adobe-after-effects/CMakeLists.txt index 44121a1..e74b9fa 100644 --- a/extras/AdobeAfterEffects/CMakeLists.txt +++ b/extras/adobe-after-effects/CMakeLists.txt @@ -2,4 +2,4 @@ cmake_minimum_required(VERSION 3.2) set(afterEffectsFiles "Rhubarb Lip Sync.jsx" "README.adoc") -install(FILES ${afterEffectsFiles} DESTINATION "extras/AdobeAfterEffects") +install(FILES ${afterEffectsFiles} DESTINATION "extras/adobe-after-effects") diff --git a/extras/AdobeAfterEffects/README.adoc b/extras/adobe-after-effects/README.adoc similarity index 100% rename from extras/AdobeAfterEffects/README.adoc rename to extras/adobe-after-effects/README.adoc diff --git a/extras/AdobeAfterEffects/Rhubarb Lip Sync.jsx b/extras/adobe-after-effects/Rhubarb Lip Sync.jsx similarity index 100% rename from extras/AdobeAfterEffects/Rhubarb Lip Sync.jsx rename to extras/adobe-after-effects/Rhubarb Lip Sync.jsx diff --git a/extras/EsotericSoftwareSpine/.gitignore b/extras/esoteric-software-spine/.gitignore similarity index 100% rename from extras/EsotericSoftwareSpine/.gitignore rename to extras/esoteric-software-spine/.gitignore diff --git a/extras/EsotericSoftwareSpine/CMakeLists.txt b/extras/esoteric-software-spine/CMakeLists.txt similarity index 59% rename from extras/EsotericSoftwareSpine/CMakeLists.txt rename to extras/esoteric-software-spine/CMakeLists.txt index d1f432d..33d8b9c 100644 --- a/extras/EsotericSoftwareSpine/CMakeLists.txt +++ b/extras/esoteric-software-spine/CMakeLists.txt @@ -8,6 +8,6 @@ add_custom_target( COMMENT "Building Rhubarb for Spine through Gradle." ) -install(DIRECTORY "build/libs/" DESTINATION "extras/EsotericSoftwareSpine") +install(DIRECTORY "build/libs/" DESTINATION "extras/esoteric-software-spine") -install(FILES README.adoc DESTINATION "extras/EsotericSoftwareSpine") +install(FILES README.adoc DESTINATION "extras/esoteric-software-spine") diff --git a/extras/EsotericSoftwareSpine/README.adoc b/extras/esoteric-software-spine/README.adoc similarity index 98% rename from extras/EsotericSoftwareSpine/README.adoc rename to extras/esoteric-software-spine/README.adoc index 080012c..6c27861 100644 --- a/extras/EsotericSoftwareSpine/README.adoc +++ b/extras/esoteric-software-spine/README.adoc @@ -6,7 +6,7 @@ image:../../img/spine.png[image] == Installation -https://github.com/DanielSWolf/rhubarb-lip-sync/releases[Download Rhubarb Lip Sync] for your platform, then extract the archive file in a directory on your computer. You’ll find Rhubarb Lip Sync for Spine in the directory `extras/EsotericSoftwareSpine`. +https://github.com/DanielSWolf/rhubarb-lip-sync/releases[Download Rhubarb Lip Sync] for your platform, then extract the archive file in a directory on your computer. You’ll find Rhubarb Lip Sync for Spine in the directory `extras/esoteric-software-spine`. To create lip sync animation, you’ll need Spine 3.7 or better. diff --git a/extras/EsotericSoftwareSpine/build.gradle.kts b/extras/esoteric-software-spine/build.gradle.kts similarity index 95% rename from extras/EsotericSoftwareSpine/build.gradle.kts rename to extras/esoteric-software-spine/build.gradle.kts index dcfe621..41fad7b 100644 --- a/extras/EsotericSoftwareSpine/build.gradle.kts +++ b/extras/esoteric-software-spine/build.gradle.kts @@ -8,7 +8,7 @@ plugins { fun getVersion(): String { // Dynamically read version from CMake file - val file = File(rootDir.parentFile.parentFile, "appInfo.cmake") + val file = File(rootDir.parentFile.parentFile, "app-info.cmake") val text = file.readText() val major = Regex("""appVersionMajor\s+(\d+)""").find(text)!!.groupValues[1] val minor = Regex("""appVersionMinor\s+(\d+)""").find(text)!!.groupValues[1] diff --git a/extras/EsotericSoftwareSpine/gradle/wrapper/gradle-wrapper.jar b/extras/esoteric-software-spine/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from extras/EsotericSoftwareSpine/gradle/wrapper/gradle-wrapper.jar rename to extras/esoteric-software-spine/gradle/wrapper/gradle-wrapper.jar diff --git a/extras/EsotericSoftwareSpine/gradle/wrapper/gradle-wrapper.properties b/extras/esoteric-software-spine/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from extras/EsotericSoftwareSpine/gradle/wrapper/gradle-wrapper.properties rename to extras/esoteric-software-spine/gradle/wrapper/gradle-wrapper.properties diff --git a/extras/EsotericSoftwareSpine/gradlew b/extras/esoteric-software-spine/gradlew similarity index 100% rename from extras/EsotericSoftwareSpine/gradlew rename to extras/esoteric-software-spine/gradlew diff --git a/extras/EsotericSoftwareSpine/gradlew.bat b/extras/esoteric-software-spine/gradlew.bat similarity index 100% rename from extras/EsotericSoftwareSpine/gradlew.bat rename to extras/esoteric-software-spine/gradlew.bat diff --git a/extras/EsotericSoftwareSpine/settings.gradle.kts b/extras/esoteric-software-spine/settings.gradle.kts similarity index 100% rename from extras/EsotericSoftwareSpine/settings.gradle.kts rename to extras/esoteric-software-spine/settings.gradle.kts diff --git a/extras/EsotericSoftwareSpine/src/main/kotlin/AnimationFileModel.kt b/extras/esoteric-software-spine/src/main/kotlin/animation-file-model.kt similarity index 100% rename from extras/EsotericSoftwareSpine/src/main/kotlin/AnimationFileModel.kt rename to extras/esoteric-software-spine/src/main/kotlin/animation-file-model.kt diff --git a/extras/EsotericSoftwareSpine/src/main/kotlin/AudioFileModel.kt b/extras/esoteric-software-spine/src/main/kotlin/audio-file-model.kt similarity index 100% rename from extras/EsotericSoftwareSpine/src/main/kotlin/AudioFileModel.kt rename to extras/esoteric-software-spine/src/main/kotlin/audio-file-model.kt diff --git a/extras/EsotericSoftwareSpine/src/main/kotlin/classLocation.kt b/extras/esoteric-software-spine/src/main/kotlin/class-location.kt similarity index 100% rename from extras/EsotericSoftwareSpine/src/main/kotlin/classLocation.kt rename to extras/esoteric-software-spine/src/main/kotlin/class-location.kt diff --git a/extras/EsotericSoftwareSpine/src/main/kotlin/EndUserException.kt b/extras/esoteric-software-spine/src/main/kotlin/end-user-exception.kt similarity index 100% rename from extras/EsotericSoftwareSpine/src/main/kotlin/EndUserException.kt rename to extras/esoteric-software-spine/src/main/kotlin/end-user-exception.kt diff --git a/extras/EsotericSoftwareSpine/src/main/kotlin/ErrorProperty.kt b/extras/esoteric-software-spine/src/main/kotlin/error-property.kt similarity index 100% rename from extras/EsotericSoftwareSpine/src/main/kotlin/ErrorProperty.kt rename to extras/esoteric-software-spine/src/main/kotlin/error-property.kt diff --git a/extras/EsotericSoftwareSpine/src/main/kotlin/MainApp.kt b/extras/esoteric-software-spine/src/main/kotlin/main-app.kt similarity index 100% rename from extras/EsotericSoftwareSpine/src/main/kotlin/MainApp.kt rename to extras/esoteric-software-spine/src/main/kotlin/main-app.kt diff --git a/extras/EsotericSoftwareSpine/src/main/kotlin/MainModel.kt b/extras/esoteric-software-spine/src/main/kotlin/main-model.kt similarity index 100% rename from extras/EsotericSoftwareSpine/src/main/kotlin/MainModel.kt rename to extras/esoteric-software-spine/src/main/kotlin/main-model.kt diff --git a/extras/EsotericSoftwareSpine/src/main/kotlin/MainView.kt b/extras/esoteric-software-spine/src/main/kotlin/main-view.kt similarity index 100% rename from extras/EsotericSoftwareSpine/src/main/kotlin/MainView.kt rename to extras/esoteric-software-spine/src/main/kotlin/main-view.kt diff --git a/extras/EsotericSoftwareSpine/src/main/kotlin/main.kt b/extras/esoteric-software-spine/src/main/kotlin/main.kt similarity index 100% rename from extras/EsotericSoftwareSpine/src/main/kotlin/main.kt rename to extras/esoteric-software-spine/src/main/kotlin/main.kt diff --git a/extras/EsotericSoftwareSpine/src/main/kotlin/MouthCue.kt b/extras/esoteric-software-spine/src/main/kotlin/mouth-cue.kt similarity index 100% rename from extras/EsotericSoftwareSpine/src/main/kotlin/MouthCue.kt rename to extras/esoteric-software-spine/src/main/kotlin/mouth-cue.kt diff --git a/extras/EsotericSoftwareSpine/src/main/kotlin/MouthNaming.kt b/extras/esoteric-software-spine/src/main/kotlin/mouth-naming.kt similarity index 100% rename from extras/EsotericSoftwareSpine/src/main/kotlin/MouthNaming.kt rename to extras/esoteric-software-spine/src/main/kotlin/mouth-naming.kt diff --git a/extras/EsotericSoftwareSpine/src/main/kotlin/MouthShape.kt b/extras/esoteric-software-spine/src/main/kotlin/mouth-shape.kt similarity index 100% rename from extras/EsotericSoftwareSpine/src/main/kotlin/MouthShape.kt rename to extras/esoteric-software-spine/src/main/kotlin/mouth-shape.kt diff --git a/extras/EsotericSoftwareSpine/src/main/kotlin/RhubarbTask.kt b/extras/esoteric-software-spine/src/main/kotlin/rhubarb-task.kt similarity index 100% rename from extras/EsotericSoftwareSpine/src/main/kotlin/RhubarbTask.kt rename to extras/esoteric-software-spine/src/main/kotlin/rhubarb-task.kt diff --git a/extras/EsotericSoftwareSpine/src/main/kotlin/SpineJson.kt b/extras/esoteric-software-spine/src/main/kotlin/spine-json.kt similarity index 100% rename from extras/EsotericSoftwareSpine/src/main/kotlin/SpineJson.kt rename to extras/esoteric-software-spine/src/main/kotlin/spine-json.kt diff --git a/extras/EsotericSoftwareSpine/src/main/kotlin/tools.kt b/extras/esoteric-software-spine/src/main/kotlin/tools.kt similarity index 100% rename from extras/EsotericSoftwareSpine/src/main/kotlin/tools.kt rename to extras/esoteric-software-spine/src/main/kotlin/tools.kt diff --git a/extras/EsotericSoftwareSpine/src/main/resources/icon-16.png b/extras/esoteric-software-spine/src/main/resources/icon-16.png similarity index 100% rename from extras/EsotericSoftwareSpine/src/main/resources/icon-16.png rename to extras/esoteric-software-spine/src/main/resources/icon-16.png diff --git a/extras/EsotericSoftwareSpine/src/main/resources/icon-256.png b/extras/esoteric-software-spine/src/main/resources/icon-256.png similarity index 100% rename from extras/EsotericSoftwareSpine/src/main/resources/icon-256.png rename to extras/esoteric-software-spine/src/main/resources/icon-256.png diff --git a/extras/EsotericSoftwareSpine/src/main/resources/icon-32.png b/extras/esoteric-software-spine/src/main/resources/icon-32.png similarity index 100% rename from extras/EsotericSoftwareSpine/src/main/resources/icon-32.png rename to extras/esoteric-software-spine/src/main/resources/icon-32.png diff --git a/extras/EsotericSoftwareSpine/src/main/resources/icon-48.png b/extras/esoteric-software-spine/src/main/resources/icon-48.png similarity index 100% rename from extras/EsotericSoftwareSpine/src/main/resources/icon-48.png rename to extras/esoteric-software-spine/src/main/resources/icon-48.png diff --git a/extras/EsotericSoftwareSpine/src/test/data/jsonFiles/audio/.gitkeep b/extras/esoteric-software-spine/src/test/data/jsonFiles/audio/.gitkeep similarity index 100% rename from extras/EsotericSoftwareSpine/src/test/data/jsonFiles/audio/.gitkeep rename to extras/esoteric-software-spine/src/test/data/jsonFiles/audio/.gitkeep diff --git a/extras/EsotericSoftwareSpine/src/test/data/jsonFiles/images/.gitkeep b/extras/esoteric-software-spine/src/test/data/jsonFiles/images/.gitkeep similarity index 100% rename from extras/EsotericSoftwareSpine/src/test/data/jsonFiles/images/.gitkeep rename to extras/esoteric-software-spine/src/test/data/jsonFiles/images/.gitkeep diff --git a/extras/EsotericSoftwareSpine/src/test/data/jsonFiles/matt-3.7-essential.json b/extras/esoteric-software-spine/src/test/data/jsonFiles/matt-3.7-essential.json similarity index 100% rename from extras/EsotericSoftwareSpine/src/test/data/jsonFiles/matt-3.7-essential.json rename to extras/esoteric-software-spine/src/test/data/jsonFiles/matt-3.7-essential.json diff --git a/extras/EsotericSoftwareSpine/src/test/data/jsonFiles/matt-3.7.json b/extras/esoteric-software-spine/src/test/data/jsonFiles/matt-3.7.json similarity index 100% rename from extras/EsotericSoftwareSpine/src/test/data/jsonFiles/matt-3.7.json rename to extras/esoteric-software-spine/src/test/data/jsonFiles/matt-3.7.json diff --git a/extras/EsotericSoftwareSpine/src/test/data/jsonFiles/matt-3.8-essential.json b/extras/esoteric-software-spine/src/test/data/jsonFiles/matt-3.8-essential.json similarity index 100% rename from extras/EsotericSoftwareSpine/src/test/data/jsonFiles/matt-3.8-essential.json rename to extras/esoteric-software-spine/src/test/data/jsonFiles/matt-3.8-essential.json diff --git a/extras/EsotericSoftwareSpine/src/test/data/jsonFiles/matt-3.8.json b/extras/esoteric-software-spine/src/test/data/jsonFiles/matt-3.8.json similarity index 100% rename from extras/EsotericSoftwareSpine/src/test/data/jsonFiles/matt-3.8.json rename to extras/esoteric-software-spine/src/test/data/jsonFiles/matt-3.8.json diff --git a/extras/EsotericSoftwareSpine/src/test/kotlin/SpineJsonTest.kt b/extras/esoteric-software-spine/src/test/kotlin/SpineJsonTest.kt similarity index 100% rename from extras/EsotericSoftwareSpine/src/test/kotlin/SpineJsonTest.kt rename to extras/esoteric-software-spine/src/test/kotlin/SpineJsonTest.kt diff --git a/extras/EsotericSoftwareSpine/src/test/resources/junit-platform.properties b/extras/esoteric-software-spine/src/test/resources/junit-platform.properties similarity index 100% rename from extras/EsotericSoftwareSpine/src/test/resources/junit-platform.properties rename to extras/esoteric-software-spine/src/test/resources/junit-platform.properties diff --git a/extras/MagixVegas/.gitignore b/extras/magix-vegas/.gitignore similarity index 100% rename from extras/MagixVegas/.gitignore rename to extras/magix-vegas/.gitignore diff --git a/extras/MagixVegas/CMakeLists.txt b/extras/magix-vegas/CMakeLists.txt similarity index 74% rename from extras/MagixVegas/CMakeLists.txt rename to extras/magix-vegas/CMakeLists.txt index eadf7c3..c796b4b 100644 --- a/extras/MagixVegas/CMakeLists.txt +++ b/extras/magix-vegas/CMakeLists.txt @@ -8,4 +8,4 @@ set(vegasFiles "README.adoc" ) -install(FILES ${vegasFiles} DESTINATION "extras/MagixVegas") +install(FILES ${vegasFiles} DESTINATION "extras/magix-vegas") diff --git a/extras/MagixVegas/Debug Rhubarb.cs b/extras/magix-vegas/Debug Rhubarb.cs similarity index 100% rename from extras/MagixVegas/Debug Rhubarb.cs rename to extras/magix-vegas/Debug Rhubarb.cs diff --git a/extras/MagixVegas/Debug Rhubarb.cs.config b/extras/magix-vegas/Debug Rhubarb.cs.config similarity index 100% rename from extras/MagixVegas/Debug Rhubarb.cs.config rename to extras/magix-vegas/Debug Rhubarb.cs.config diff --git a/extras/MagixVegas/Import Rhubarb.cs b/extras/magix-vegas/Import Rhubarb.cs similarity index 100% rename from extras/MagixVegas/Import Rhubarb.cs rename to extras/magix-vegas/Import Rhubarb.cs diff --git a/extras/MagixVegas/Import Rhubarb.cs.config b/extras/magix-vegas/Import Rhubarb.cs.config similarity index 100% rename from extras/MagixVegas/Import Rhubarb.cs.config rename to extras/magix-vegas/Import Rhubarb.cs.config diff --git a/extras/MagixVegas/README.adoc b/extras/magix-vegas/README.adoc similarity index 100% rename from extras/MagixVegas/README.adoc rename to extras/magix-vegas/README.adoc diff --git a/rhubarb/CMakeLists.txt b/rhubarb/CMakeLists.txt index 1d0885e..69cc6dd 100644 --- a/rhubarb/CMakeLists.txt +++ b/rhubarb/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.10) -include("../appInfo.cmake") +include("../app-info.cmake") # Support legacy OS X versions set(CMAKE_OSX_DEPLOYMENT_TARGET "10.10" CACHE STRING "Minimum OS X deployment version") @@ -268,23 +268,23 @@ include_directories("src") # ... rhubarb-animation add_library( rhubarb-animation - src/animation/animationRules.cpp - src/animation/animationRules.h - src/animation/mouthAnimation.cpp - src/animation/mouthAnimation.h - src/animation/pauseAnimation.cpp - src/animation/pauseAnimation.h - src/animation/roughAnimation.cpp - src/animation/roughAnimation.h - src/animation/ShapeRule.cpp - src/animation/ShapeRule.h - src/animation/shapeShorthands.h - src/animation/staticSegments.cpp - src/animation/staticSegments.h - src/animation/targetShapeSet.cpp - src/animation/targetShapeSet.h - src/animation/timingOptimization.cpp - src/animation/timingOptimization.h + src/animation/animation-rules.cpp + src/animation/animation-rules.h + src/animation/mouth-animation.cpp + src/animation/mouth-animation.h + src/animation/pause-animation.cpp + src/animation/pause-animation.h + src/animation/rough-animation.cpp + src/animation/rough-animation.h + src/animation/shape-rule.cpp + src/animation/shape-rule.h + src/animation/shape-shorthands.h + src/animation/static-segments.cpp + src/animation/static-segments.h + src/animation/target-shape-set.cpp + src/animation/target-shape-set.h + src/animation/timing-optimization.cpp + src/animation/timing-optimization.h src/animation/tweening.cpp src/animation/tweening.h ) @@ -294,27 +294,27 @@ target_link_libraries(rhubarb-animation rhubarb-core rhubarb-logging rhubarb-tim # ... rhubarb-audio add_library( rhubarb-audio - src/audio/AudioClip.cpp - src/audio/AudioClip.h - src/audio/audioFileReading.cpp - src/audio/audioFileReading.h - src/audio/AudioSegment.cpp - src/audio/AudioSegment.h - src/audio/DcOffset.cpp - src/audio/DcOffset.h - src/audio/ioTools.h - src/audio/OggVorbisFileReader.cpp - src/audio/OggVorbisFileReader.h + src/audio/audio-clip.cpp + src/audio/audio-clip.h + src/audio/audio-file-reading.cpp + src/audio/audio-file-reading.h + src/audio/audio-segment.cpp + src/audio/audio-segment.h + src/audio/dc-offset.cpp + src/audio/dc-offset.h + src/audio/io-tools.h + src/audio/ogg-vorbis-file-reader.cpp + src/audio/ogg-vorbis-file-reader.h src/audio/processing.cpp src/audio/processing.h - src/audio/SampleRateConverter.cpp - src/audio/SampleRateConverter.h - src/audio/voiceActivityDetection.cpp - src/audio/voiceActivityDetection.h - src/audio/WaveFileReader.cpp - src/audio/WaveFileReader.h - src/audio/waveFileWriting.cpp - src/audio/waveFileWriting.h + src/audio/sample-rate-converter.cpp + src/audio/sample-rate-converter.h + src/audio/voice-activity-detection.cpp + src/audio/voice-activity-detection.h + src/audio/wave-file-reader.cpp + src/audio/wave-file-reader.h + src/audio/wave-file-writing.cpp + src/audio/wave-file-writing.h ) target_include_directories(rhubarb-audio PRIVATE "src/audio") target_link_libraries( @@ -327,15 +327,15 @@ target_link_libraries( ) # ... rhubarb-core -configure_file(src/core/appInfo.cpp.in appInfo.cpp ESCAPE_QUOTES) +configure_file(src/core/app-info.cpp.in app-info.cpp ESCAPE_QUOTES) add_library( rhubarb-core - ${CMAKE_CURRENT_BINARY_DIR}/appInfo.cpp - src/core/appInfo.h - src/core/Phone.cpp - src/core/Phone.h - src/core/Shape.cpp - src/core/Shape.h + ${CMAKE_CURRENT_BINARY_DIR}/app-info.cpp + src/core/app-info.h + src/core/phone.cpp + src/core/phone.h + src/core/shape.cpp + src/core/shape.h ) target_include_directories(rhubarb-core PRIVATE "src/core") target_link_libraries(rhubarb-core rhubarb-tools) @@ -343,23 +343,23 @@ target_link_libraries(rhubarb-core rhubarb-tools) # ... rhubarb-exporters add_library( rhubarb-exporters - src/exporters/DatExporter.cpp - src/exporters/DatExporter.h - src/exporters/Exporter.h - src/exporters/exporterTools.cpp - src/exporters/exporterTools.h - src/exporters/JsonExporter.cpp - src/exporters/JsonExporter.h - src/exporters/TsvExporter.cpp - src/exporters/TsvExporter.h - src/exporters/XmlExporter.cpp - src/exporters/XmlExporter.h + src/exporters/dat-exporter.cpp + src/exporters/dat-exporter.h + src/exporters/exporter.h + src/exporters/exporter-tools.cpp + src/exporters/exporter-tools.h + src/exporters/json-exporter.cpp + src/exporters/json-exporter.h + src/exporters/tsv-exporter.cpp + src/exporters/tsv-exporter.h + src/exporters/xml-exporter.cpp + src/exporters/xml-exporter.h ) target_include_directories(rhubarb-exporters PRIVATE "src/exporters") target_link_libraries(rhubarb-exporters rhubarb-animation rhubarb-core rhubarb-time) # ... rhubarb-lib -add_library(rhubarb-lib src/lib/rhubarbLib.cpp src/lib/rhubarbLib.h) +add_library(rhubarb-lib src/lib/rhubarb-lib.cpp src/lib/rhubarb-lib.h) target_include_directories(rhubarb-lib PRIVATE "src/lib") target_link_libraries( rhubarb-lib @@ -374,16 +374,16 @@ target_link_libraries( # ... rhubarb-logging add_library( rhubarb-logging - src/logging/Entry.cpp - src/logging/Entry.h - src/logging/Formatter.h + src/logging/entry.cpp + src/logging/entry.h + src/logging/formatter.h src/logging/formatters.cpp src/logging/formatters.h - src/logging/Level.cpp - src/logging/Level.h + src/logging/level.cpp + src/logging/level.h src/logging/logging.cpp src/logging/logging.h - src/logging/Sink.h + src/logging/sink.h src/logging/sinks.cpp src/logging/sinks.h ) @@ -395,15 +395,15 @@ add_library( rhubarb-recognition src/recognition/g2p.cpp src/recognition/g2p.h - src/recognition/languageModels.cpp - src/recognition/languageModels.h - src/recognition/PhoneticRecognizer.cpp - src/recognition/PhoneticRecognizer.h - src/recognition/PocketSphinxRecognizer.cpp - src/recognition/PocketSphinxRecognizer.h - src/recognition/pocketSphinxTools.cpp - src/recognition/pocketSphinxTools.h - src/recognition/Recognizer.h + src/recognition/language-models.cpp + src/recognition/language-models.h + src/recognition/phonetic-recognizer.cpp + src/recognition/phonetic-recognizer.h + src/recognition/pocket-sphinx-recognizer.cpp + src/recognition/pocket-sphinx-recognizer.h + src/recognition/pocket-sphinx-tools.cpp + src/recognition/pocket-sphinx-tools.h + src/recognition/recognizer.h src/recognition/tokenization.cpp src/recognition/tokenization.h ) @@ -420,15 +420,15 @@ target_link_libraries( # ... rhubarb-time add_library( rhubarb-time - src/time/BoundedTimeline.h + src/time/bounded-timeline.h src/time/centiseconds.cpp src/time/centiseconds.h - src/time/ContinuousTimeline.h - src/time/Timed.h - src/time/timedLogging.h - src/time/Timeline.h - src/time/TimeRange.cpp - src/time/TimeRange.h + src/time/continuous-timeline.h + src/time/timed.h + src/time/timed-logging.h + src/time/timeline.h + src/time/time-range.cpp + src/time/time-range.h ) target_include_directories(rhubarb-time PRIVATE "src/time") target_link_libraries(rhubarb-time cppFormat rhubarb-logging) @@ -437,33 +437,33 @@ target_link_libraries(rhubarb-time cppFormat rhubarb-logging) add_library( rhubarb-tools src/tools/array.h - src/tools/EnumConverter.h + src/tools/enum-converter.h src/tools/exceptions.cpp src/tools/exceptions.h - src/tools/fileTools.cpp - src/tools/fileTools.h - src/tools/Lazy.h - src/tools/nextCombination.h - src/tools/NiceCmdLineOutput.cpp - src/tools/NiceCmdLineOutput.h - src/tools/ObjectPool.h + src/tools/file-tools.cpp + src/tools/file-tools.h + src/tools/lazy.h + src/tools/next-combination.h + src/tools/nice-cmd-line-output.cpp + src/tools/nice-cmd-line-output.h + src/tools/object-pool.h src/tools/pairs.h src/tools/parallel.h - src/tools/platformTools.cpp - src/tools/platformTools.h + src/tools/platform-tools.cpp + src/tools/platform-tools.h src/tools/progress.cpp src/tools/progress.h - src/tools/ProgressBar.cpp - src/tools/ProgressBar.h - src/tools/stringTools.cpp - src/tools/stringTools.h - src/tools/TablePrinter.cpp - src/tools/TablePrinter.h - src/tools/textFiles.cpp - src/tools/textFiles.h + src/tools/progress-bar.cpp + src/tools/progress-bar.h + src/tools/string-tools.cpp + src/tools/string-tools.h + src/tools/table-printer.cpp + src/tools/table-printer.h + src/tools/text-files.cpp + src/tools/text-files.h src/tools/tools.cpp src/tools/tools.h - src/tools/tupleHash.h + src/tools/tuple-hash.h ) target_include_directories(rhubarb-tools PRIVATE "src/tools") target_link_libraries(rhubarb-tools cppFormat whereami utfcpp utf8proc) @@ -472,12 +472,12 @@ target_link_libraries(rhubarb-tools cppFormat whereami utfcpp utf8proc) add_executable( rhubarb src/rhubarb/main.cpp - src/rhubarb/ExportFormat.cpp - src/rhubarb/ExportFormat.h - src/rhubarb/RecognizerType.cpp - src/rhubarb/RecognizerType.h - src/rhubarb/semanticEntries.cpp - src/rhubarb/semanticEntries.h + src/rhubarb/export-format.cpp + src/rhubarb/export-format.h + src/rhubarb/recognizer-type.cpp + src/rhubarb/recognizer-type.h + src/rhubarb/semantic-entries.cpp + src/rhubarb/semantic-entries.h src/rhubarb/sinks.cpp src/rhubarb/sinks.h ) @@ -488,15 +488,15 @@ target_compile_options(rhubarb PUBLIC ${enableWarningsFlags}) # Define test project #include_directories("${gtest_SOURCE_DIR}/include") set(TEST_FILES - tests/stringToolsTests.cpp - tests/TimelineTests.cpp - tests/BoundedTimelineTests.cpp - tests/ContinuousTimelineTests.cpp - tests/pairsTests.cpp - tests/tokenizationTests.cpp - tests/g2pTests.cpp - tests/LazyTests.cpp - tests/WaveFileReaderTests.cpp + tests/string-tools-tests.cpp + tests/timeline-tests.cpp + tests/bounded-timeline-tests.cpp + tests/continuous-timeline-tests.cpp + tests/pairs-tests.cpp + tests/tokenization-tests.cpp + tests/g2p-tests.cpp + tests/lazy-tests.cpp + tests/wave-file-reader-tests.cpp ) add_executable(runTests ${TEST_FILES}) target_link_libraries( diff --git a/rhubarb/src/animation/animationRules.cpp b/rhubarb/src/animation/animation-rules.cpp similarity index 98% rename from rhubarb/src/animation/animationRules.cpp rename to rhubarb/src/animation/animation-rules.cpp index 7a2697e..5eb5fd5 100644 --- a/rhubarb/src/animation/animationRules.cpp +++ b/rhubarb/src/animation/animation-rules.cpp @@ -1,9 +1,9 @@ -#include "animationRules.h" +#include "animation-rules.h" #include -#include "shapeShorthands.h" -#include "time/ContinuousTimeline.h" +#include "shape-shorthands.h" +#include "time/continuous-timeline.h" #include "tools/array.h" using boost::optional; diff --git a/rhubarb/src/animation/animationRules.h b/rhubarb/src/animation/animation-rules.h similarity index 94% rename from rhubarb/src/animation/animationRules.h rename to rhubarb/src/animation/animation-rules.h index 3ed395e..51a492c 100644 --- a/rhubarb/src/animation/animationRules.h +++ b/rhubarb/src/animation/animation-rules.h @@ -2,9 +2,9 @@ #include -#include "core/Phone.h" -#include "core/Shape.h" -#include "time/Timeline.h" +#include "core/phone.h" +#include "core/shape.h" +#include "time/timeline.h" // Returns the basic shape (A-F) that most closely resembles the specified shape. Shape getBasicShape(Shape shape); diff --git a/rhubarb/src/animation/mouthAnimation.cpp b/rhubarb/src/animation/mouth-animation.cpp similarity index 83% rename from rhubarb/src/animation/mouthAnimation.cpp rename to rhubarb/src/animation/mouth-animation.cpp index 89b7139..fdc1bf4 100644 --- a/rhubarb/src/animation/mouthAnimation.cpp +++ b/rhubarb/src/animation/mouth-animation.cpp @@ -1,12 +1,12 @@ -#include "mouthAnimation.h" +#include "mouth-animation.h" -#include "pauseAnimation.h" -#include "roughAnimation.h" -#include "ShapeRule.h" -#include "staticSegments.h" -#include "targetShapeSet.h" -#include "time/timedLogging.h" -#include "timingOptimization.h" +#include "pause-animation.h" +#include "rough-animation.h" +#include "shape-rule.h" +#include "static-segments.h" +#include "target-shape-set.h" +#include "time/timed-logging.h" +#include "timing-optimization.h" #include "tweening.h" JoiningContinuousTimeline animate( diff --git a/rhubarb/src/animation/mouthAnimation.h b/rhubarb/src/animation/mouth-animation.h similarity index 53% rename from rhubarb/src/animation/mouthAnimation.h rename to rhubarb/src/animation/mouth-animation.h index 32f370f..013ed21 100644 --- a/rhubarb/src/animation/mouthAnimation.h +++ b/rhubarb/src/animation/mouth-animation.h @@ -1,9 +1,9 @@ #pragma once -#include "core/Phone.h" -#include "core/Shape.h" -#include "targetShapeSet.h" -#include "time/ContinuousTimeline.h" +#include "core/phone.h" +#include "core/shape.h" +#include "target-shape-set.h" +#include "time/continuous-timeline.h" JoiningContinuousTimeline animate( const BoundedTimeline& phones, const ShapeSet& targetShapeSet diff --git a/rhubarb/src/animation/pauseAnimation.cpp b/rhubarb/src/animation/pause-animation.cpp similarity index 96% rename from rhubarb/src/animation/pauseAnimation.cpp rename to rhubarb/src/animation/pause-animation.cpp index 40cdccc..28e5677 100644 --- a/rhubarb/src/animation/pauseAnimation.cpp +++ b/rhubarb/src/animation/pause-animation.cpp @@ -1,6 +1,6 @@ -#include "pauseAnimation.h" +#include "pause-animation.h" -#include "animationRules.h" +#include "animation-rules.h" Shape getPauseShape(Shape previous, Shape next, centiseconds duration) { // For very short pauses: Just hold the previous shape diff --git a/rhubarb/src/animation/pauseAnimation.h b/rhubarb/src/animation/pause-animation.h similarity index 75% rename from rhubarb/src/animation/pauseAnimation.h rename to rhubarb/src/animation/pause-animation.h index 9fd6066..9569db4 100644 --- a/rhubarb/src/animation/pauseAnimation.h +++ b/rhubarb/src/animation/pause-animation.h @@ -1,7 +1,7 @@ #pragma once -#include "core/Shape.h" -#include "time/ContinuousTimeline.h" +#include "core/shape.h" +#include "time/continuous-timeline.h" // Takes an existing animation and modifies the pauses (X shapes) to look better. JoiningContinuousTimeline animatePauses(const JoiningContinuousTimeline& animation); diff --git a/rhubarb/src/animation/roughAnimation.cpp b/rhubarb/src/animation/rough-animation.cpp similarity index 99% rename from rhubarb/src/animation/roughAnimation.cpp rename to rhubarb/src/animation/rough-animation.cpp index 9b34bc6..057100e 100644 --- a/rhubarb/src/animation/roughAnimation.cpp +++ b/rhubarb/src/animation/rough-animation.cpp @@ -1,4 +1,4 @@ -#include "roughAnimation.h" +#include "rough-animation.h" #include diff --git a/rhubarb/src/animation/roughAnimation.h b/rhubarb/src/animation/rough-animation.h similarity index 90% rename from rhubarb/src/animation/roughAnimation.h rename to rhubarb/src/animation/rough-animation.h index cb009e6..102cd33 100644 --- a/rhubarb/src/animation/roughAnimation.h +++ b/rhubarb/src/animation/rough-animation.h @@ -1,6 +1,6 @@ #pragma once -#include "ShapeRule.h" +#include "shape-rule.h" // Does a rough animation (no tweening, special pause animation, etc.) using a bidirectional // algorithm. diff --git a/rhubarb/src/animation/ShapeRule.cpp b/rhubarb/src/animation/shape-rule.cpp similarity index 97% rename from rhubarb/src/animation/ShapeRule.cpp rename to rhubarb/src/animation/shape-rule.cpp index 0ab3359..dead972 100644 --- a/rhubarb/src/animation/ShapeRule.cpp +++ b/rhubarb/src/animation/shape-rule.cpp @@ -1,9 +1,9 @@ -#include "ShapeRule.h" +#include "shape-rule.h" #include #include -#include "time/ContinuousTimeline.h" +#include "time/continuous-timeline.h" using boost::optional; using boost::adaptors::transformed; diff --git a/rhubarb/src/animation/ShapeRule.h b/rhubarb/src/animation/shape-rule.h similarity index 77% rename from rhubarb/src/animation/ShapeRule.h rename to rhubarb/src/animation/shape-rule.h index 41d7a85..470916f 100644 --- a/rhubarb/src/animation/ShapeRule.h +++ b/rhubarb/src/animation/shape-rule.h @@ -1,10 +1,10 @@ #pragma once -#include "animationRules.h" -#include "core/Phone.h" -#include "time/BoundedTimeline.h" -#include "time/ContinuousTimeline.h" -#include "time/TimeRange.h" +#include "animation-rules.h" +#include "core/phone.h" +#include "time/bounded-timeline.h" +#include "time/continuous-timeline.h" +#include "time/time-range.h" struct ShapeRule { ShapeSet shapeSet; diff --git a/rhubarb/src/animation/shapeShorthands.h b/rhubarb/src/animation/shape-shorthands.h similarity index 92% rename from rhubarb/src/animation/shapeShorthands.h rename to rhubarb/src/animation/shape-shorthands.h index 3ebd08c..5937966 100644 --- a/rhubarb/src/animation/shapeShorthands.h +++ b/rhubarb/src/animation/shape-shorthands.h @@ -1,6 +1,6 @@ #pragma once -#include "core/Shape.h" +#include "core/shape.h" constexpr Shape A = Shape::A; constexpr Shape B = Shape::B; diff --git a/rhubarb/src/animation/staticSegments.cpp b/rhubarb/src/animation/static-segments.cpp similarity index 99% rename from rhubarb/src/animation/staticSegments.cpp rename to rhubarb/src/animation/static-segments.cpp index 3ad8787..784ce91 100644 --- a/rhubarb/src/animation/staticSegments.cpp +++ b/rhubarb/src/animation/static-segments.cpp @@ -1,9 +1,9 @@ -#include "staticSegments.h" +#include "static-segments.h" #include #include -#include "tools/nextCombination.h" +#include "tools/next-combination.h" using std::vector; diff --git a/rhubarb/src/animation/staticSegments.h b/rhubarb/src/animation/static-segments.h similarity index 88% rename from rhubarb/src/animation/staticSegments.h rename to rhubarb/src/animation/static-segments.h index a4cc002..864f53e 100644 --- a/rhubarb/src/animation/staticSegments.h +++ b/rhubarb/src/animation/static-segments.h @@ -2,9 +2,9 @@ #include -#include "core/Shape.h" -#include "ShapeRule.h" -#include "time/ContinuousTimeline.h" +#include "core/shape.h" +#include "shape-rule.h" +#include "time/continuous-timeline.h" using AnimationFunction = std::function(const ContinuousTimeline&)>; diff --git a/rhubarb/src/animation/targetShapeSet.cpp b/rhubarb/src/animation/target-shape-set.cpp similarity index 98% rename from rhubarb/src/animation/targetShapeSet.cpp rename to rhubarb/src/animation/target-shape-set.cpp index 77070a9..37d12d0 100644 --- a/rhubarb/src/animation/targetShapeSet.cpp +++ b/rhubarb/src/animation/target-shape-set.cpp @@ -1,4 +1,4 @@ -#include "targetShapeSet.h" +#include "target-shape-set.h" Shape convertToTargetShapeSet(Shape shape, const ShapeSet& targetShapeSet) { if (targetShapeSet.find(shape) != targetShapeSet.end()) { diff --git a/rhubarb/src/animation/targetShapeSet.h b/rhubarb/src/animation/target-shape-set.h similarity index 94% rename from rhubarb/src/animation/targetShapeSet.h rename to rhubarb/src/animation/target-shape-set.h index af01cf5..2fbc413 100644 --- a/rhubarb/src/animation/targetShapeSet.h +++ b/rhubarb/src/animation/target-shape-set.h @@ -1,7 +1,7 @@ #pragma once -#include "core/Shape.h" -#include "ShapeRule.h" +#include "core/shape.h" +#include "shape-rule.h" // Returns the closest shape to the specified one that occurs in the target shape set. Shape convertToTargetShapeSet(Shape shape, const ShapeSet& targetShapeSet); diff --git a/rhubarb/src/animation/timingOptimization.cpp b/rhubarb/src/animation/timing-optimization.cpp similarity index 99% rename from rhubarb/src/animation/timingOptimization.cpp rename to rhubarb/src/animation/timing-optimization.cpp index 4eb4606..df69fee 100644 --- a/rhubarb/src/animation/timingOptimization.cpp +++ b/rhubarb/src/animation/timing-optimization.cpp @@ -1,11 +1,11 @@ -#include "timingOptimization.h" +#include "timing-optimization.h" #include #include #include -#include "ShapeRule.h" -#include "time/timedLogging.h" +#include "shape-rule.h" +#include "time/timed-logging.h" using std::map; using std::string; diff --git a/rhubarb/src/animation/timingOptimization.h b/rhubarb/src/animation/timing-optimization.h similarity index 81% rename from rhubarb/src/animation/timingOptimization.h rename to rhubarb/src/animation/timing-optimization.h index 27de323..9fb654c 100644 --- a/rhubarb/src/animation/timingOptimization.h +++ b/rhubarb/src/animation/timing-optimization.h @@ -1,7 +1,7 @@ #pragma once -#include "core/Shape.h" -#include "time/ContinuousTimeline.h" +#include "core/shape.h" +#include "time/continuous-timeline.h" // Changes the timing of an existing animation to reduce jitter and to make sure all shapes register // visually. diff --git a/rhubarb/src/animation/tweening.cpp b/rhubarb/src/animation/tweening.cpp index 1b24bbe..c6efa4b 100644 --- a/rhubarb/src/animation/tweening.cpp +++ b/rhubarb/src/animation/tweening.cpp @@ -1,6 +1,6 @@ #include "tweening.h" -#include "animationRules.h" +#include "animation-rules.h" JoiningContinuousTimeline insertTweens(const JoiningContinuousTimeline& animation) { const centiseconds minTweenDuration = 4_cs; diff --git a/rhubarb/src/animation/tweening.h b/rhubarb/src/animation/tweening.h index 0e597f7..d0e1f37 100644 --- a/rhubarb/src/animation/tweening.h +++ b/rhubarb/src/animation/tweening.h @@ -1,7 +1,7 @@ #pragma once -#include "core/Shape.h" -#include "time/ContinuousTimeline.h" +#include "core/shape.h" +#include "time/continuous-timeline.h" // Takes an existing animation and inserts inbetween shapes for smoother results. JoiningContinuousTimeline insertTweens(const JoiningContinuousTimeline& animation); diff --git a/rhubarb/src/audio/AudioClip.cpp b/rhubarb/src/audio/audio-clip.cpp similarity index 98% rename from rhubarb/src/audio/AudioClip.cpp rename to rhubarb/src/audio/audio-clip.cpp index aa485c1..cf93eab 100644 --- a/rhubarb/src/audio/AudioClip.cpp +++ b/rhubarb/src/audio/audio-clip.cpp @@ -1,4 +1,4 @@ -#include "AudioClip.h" +#include "audio-clip.h" #include diff --git a/rhubarb/src/audio/AudioClip.h b/rhubarb/src/audio/audio-clip.h similarity index 98% rename from rhubarb/src/audio/AudioClip.h rename to rhubarb/src/audio/audio-clip.h index f542c7f..f2ef6ab 100644 --- a/rhubarb/src/audio/AudioClip.h +++ b/rhubarb/src/audio/audio-clip.h @@ -3,8 +3,8 @@ #include #include -#include "time/TimeRange.h" -#include "tools/Lazy.h" +#include "time/time-range.h" +#include "tools/lazy.h" class AudioClip; class SampleIterator; diff --git a/rhubarb/src/audio/audioFileReading.cpp b/rhubarb/src/audio/audio-file-reading.cpp similarity index 89% rename from rhubarb/src/audio/audioFileReading.cpp rename to rhubarb/src/audio/audio-file-reading.cpp index 4da04db..8976030 100644 --- a/rhubarb/src/audio/audioFileReading.cpp +++ b/rhubarb/src/audio/audio-file-reading.cpp @@ -1,11 +1,11 @@ -#include "audioFileReading.h" +#include "audio-file-reading.h" #include #include -#include "OggVorbisFileReader.h" -#include "WaveFileReader.h" +#include "ogg-vorbis-file-reader.h" +#include "wave-file-reader.h" using fmt::format; using std::runtime_error; diff --git a/rhubarb/src/audio/audioFileReading.h b/rhubarb/src/audio/audio-file-reading.h similarity index 85% rename from rhubarb/src/audio/audioFileReading.h rename to rhubarb/src/audio/audio-file-reading.h index ba5fb37..c5e16e1 100644 --- a/rhubarb/src/audio/audioFileReading.h +++ b/rhubarb/src/audio/audio-file-reading.h @@ -3,6 +3,6 @@ #include #include -#include "AudioClip.h" +#include "audio-clip.h" std::unique_ptr createAudioFileClip(std::filesystem::path filePath); diff --git a/rhubarb/src/audio/AudioSegment.cpp b/rhubarb/src/audio/audio-segment.cpp similarity index 97% rename from rhubarb/src/audio/AudioSegment.cpp rename to rhubarb/src/audio/audio-segment.cpp index c87a4a9..8e494f3 100644 --- a/rhubarb/src/audio/AudioSegment.cpp +++ b/rhubarb/src/audio/audio-segment.cpp @@ -1,4 +1,4 @@ -#include "AudioSegment.h" +#include "audio-segment.h" using std::make_unique; using std::unique_ptr; diff --git a/rhubarb/src/audio/AudioSegment.h b/rhubarb/src/audio/audio-segment.h similarity index 96% rename from rhubarb/src/audio/AudioSegment.h rename to rhubarb/src/audio/audio-segment.h index 3f19e87..59e498a 100644 --- a/rhubarb/src/audio/AudioSegment.h +++ b/rhubarb/src/audio/audio-segment.h @@ -1,6 +1,6 @@ #pragma once -#include "AudioClip.h" +#include "audio-clip.h" class AudioSegment : public AudioClip { public: diff --git a/rhubarb/src/audio/DcOffset.cpp b/rhubarb/src/audio/dc-offset.cpp similarity index 98% rename from rhubarb/src/audio/DcOffset.cpp rename to rhubarb/src/audio/dc-offset.cpp index d76ddfe..ba93be6 100644 --- a/rhubarb/src/audio/DcOffset.cpp +++ b/rhubarb/src/audio/dc-offset.cpp @@ -1,4 +1,4 @@ -#include "DcOffset.h" +#include "dc-offset.h" #include diff --git a/rhubarb/src/audio/DcOffset.h b/rhubarb/src/audio/dc-offset.h similarity index 97% rename from rhubarb/src/audio/DcOffset.h rename to rhubarb/src/audio/dc-offset.h index c46fcb8..7624c70 100644 --- a/rhubarb/src/audio/DcOffset.h +++ b/rhubarb/src/audio/dc-offset.h @@ -1,6 +1,6 @@ #pragma once -#include "AudioClip.h" +#include "audio-clip.h" // Applies a constant DC offset to an audio clip and reduces its amplitude // to prevent clipping diff --git a/rhubarb/src/audio/ioTools.h b/rhubarb/src/audio/io-tools.h similarity index 100% rename from rhubarb/src/audio/ioTools.h rename to rhubarb/src/audio/io-tools.h diff --git a/rhubarb/src/audio/OggVorbisFileReader.cpp b/rhubarb/src/audio/ogg-vorbis-file-reader.cpp similarity index 98% rename from rhubarb/src/audio/OggVorbisFileReader.cpp rename to rhubarb/src/audio/ogg-vorbis-file-reader.cpp index 0035741..0dd20a2 100644 --- a/rhubarb/src/audio/OggVorbisFileReader.cpp +++ b/rhubarb/src/audio/ogg-vorbis-file-reader.cpp @@ -1,8 +1,8 @@ -#include "OggVorbisFileReader.h" +#include "ogg-vorbis-file-reader.h" #include -#include "tools/fileTools.h" +#include "tools/file-tools.h" #include "tools/tools.h" #include "vorbis/codec.h" #include "vorbis/vorbisfile.h" diff --git a/rhubarb/src/audio/OggVorbisFileReader.h b/rhubarb/src/audio/ogg-vorbis-file-reader.h similarity index 95% rename from rhubarb/src/audio/OggVorbisFileReader.h rename to rhubarb/src/audio/ogg-vorbis-file-reader.h index cb2c85f..4701ff1 100644 --- a/rhubarb/src/audio/OggVorbisFileReader.h +++ b/rhubarb/src/audio/ogg-vorbis-file-reader.h @@ -2,7 +2,7 @@ #include -#include "AudioClip.h" +#include "audio-clip.h" class OggVorbisFileReader : public AudioClip { public: diff --git a/rhubarb/src/audio/processing.h b/rhubarb/src/audio/processing.h index 30da988..30dd8cb 100644 --- a/rhubarb/src/audio/processing.h +++ b/rhubarb/src/audio/processing.h @@ -3,7 +3,7 @@ #include #include -#include "AudioClip.h" +#include "audio-clip.h" #include "tools/progress.h" void process16bitAudioClip( diff --git a/rhubarb/src/audio/SampleRateConverter.cpp b/rhubarb/src/audio/sample-rate-converter.cpp similarity index 98% rename from rhubarb/src/audio/SampleRateConverter.cpp rename to rhubarb/src/audio/sample-rate-converter.cpp index 9a52b80..772df06 100644 --- a/rhubarb/src/audio/SampleRateConverter.cpp +++ b/rhubarb/src/audio/sample-rate-converter.cpp @@ -1,4 +1,4 @@ -#include "SampleRateConverter.h" +#include "sample-rate-converter.h" #include diff --git a/rhubarb/src/audio/SampleRateConverter.h b/rhubarb/src/audio/sample-rate-converter.h similarity index 96% rename from rhubarb/src/audio/SampleRateConverter.h rename to rhubarb/src/audio/sample-rate-converter.h index 06d6732..2cbb844 100644 --- a/rhubarb/src/audio/SampleRateConverter.h +++ b/rhubarb/src/audio/sample-rate-converter.h @@ -2,7 +2,7 @@ #include -#include "AudioClip.h" +#include "audio-clip.h" class SampleRateConverter : public AudioClip { public: diff --git a/rhubarb/src/audio/voiceActivityDetection.cpp b/rhubarb/src/audio/voice-activity-detection.cpp similarity index 97% rename from rhubarb/src/audio/voiceActivityDetection.cpp rename to rhubarb/src/audio/voice-activity-detection.cpp index abc1a35..536caf9 100644 --- a/rhubarb/src/audio/voiceActivityDetection.cpp +++ b/rhubarb/src/audio/voice-activity-detection.cpp @@ -1,4 +1,4 @@ -#include "voiceActivityDetection.h" +#include "voice-activity-detection.h" #include #include @@ -6,10 +6,10 @@ #include -#include "DcOffset.h" +#include "dc-offset.h" #include "logging/logging.h" #include "processing.h" -#include "SampleRateConverter.h" +#include "sample-rate-converter.h" #include "tools/pairs.h" #include "tools/parallel.h" diff --git a/rhubarb/src/audio/voiceActivityDetection.h b/rhubarb/src/audio/voice-activity-detection.h similarity index 72% rename from rhubarb/src/audio/voiceActivityDetection.h rename to rhubarb/src/audio/voice-activity-detection.h index 2b2337b..a347b91 100644 --- a/rhubarb/src/audio/voiceActivityDetection.h +++ b/rhubarb/src/audio/voice-activity-detection.h @@ -1,6 +1,6 @@ #pragma once -#include "AudioClip.h" -#include "time/BoundedTimeline.h" +#include "audio-clip.h" +#include "time/bounded-timeline.h" #include "tools/progress.h" JoiningBoundedTimeline detectVoiceActivity( diff --git a/rhubarb/src/audio/WaveFileReader.cpp b/rhubarb/src/audio/wave-file-reader.cpp similarity index 99% rename from rhubarb/src/audio/WaveFileReader.cpp rename to rhubarb/src/audio/wave-file-reader.cpp index 72e32f1..7683116 100644 --- a/rhubarb/src/audio/WaveFileReader.cpp +++ b/rhubarb/src/audio/wave-file-reader.cpp @@ -1,12 +1,12 @@ -#include "WaveFileReader.h" +#include "wave-file-reader.h" #include #include -#include "ioTools.h" -#include "tools/fileTools.h" -#include "tools/platformTools.h" +#include "io-tools.h" +#include "tools/file-tools.h" +#include "tools/platform-tools.h" using fmt::format; using std::runtime_error; diff --git a/rhubarb/src/audio/WaveFileReader.h b/rhubarb/src/audio/wave-file-reader.h similarity index 97% rename from rhubarb/src/audio/WaveFileReader.h rename to rhubarb/src/audio/wave-file-reader.h index c412e33..9333506 100644 --- a/rhubarb/src/audio/WaveFileReader.h +++ b/rhubarb/src/audio/wave-file-reader.h @@ -2,7 +2,7 @@ #include -#include "AudioClip.h" +#include "audio-clip.h" enum class SampleFormat { UInt8, Int16, Int24, Int32, Float32, Float64 }; diff --git a/rhubarb/src/audio/waveFileWriting.cpp b/rhubarb/src/audio/wave-file-writing.cpp similarity index 96% rename from rhubarb/src/audio/waveFileWriting.cpp rename to rhubarb/src/audio/wave-file-writing.cpp index de552ff..4a1ad45 100644 --- a/rhubarb/src/audio/waveFileWriting.cpp +++ b/rhubarb/src/audio/wave-file-writing.cpp @@ -1,8 +1,8 @@ -#include "waveFileWriting.h" +#include "wave-file-writing.h" #include -#include "ioTools.h" +#include "io-tools.h" using namespace little_endian; diff --git a/rhubarb/src/audio/waveFileWriting.h b/rhubarb/src/audio/wave-file-writing.h similarity index 78% rename from rhubarb/src/audio/waveFileWriting.h rename to rhubarb/src/audio/wave-file-writing.h index 1e7db6d..06e240f 100644 --- a/rhubarb/src/audio/waveFileWriting.h +++ b/rhubarb/src/audio/wave-file-writing.h @@ -1,5 +1,5 @@ #pragma once -#include "AudioClip.h" +#include "audio-clip.h" void createWaveFile(const AudioClip& audioClip, std::string fileName); diff --git a/rhubarb/src/core/app-info.cpp.in b/rhubarb/src/core/app-info.cpp.in new file mode 100644 index 0000000..1636728 --- /dev/null +++ b/rhubarb/src/core/app-info.cpp.in @@ -0,0 +1,4 @@ +#include "app-info.h" + +const std::string appName = "@appName@"; +const std::string appVersion = "@appVersion@"; diff --git a/rhubarb/src/core/appInfo.h b/rhubarb/src/core/app-info.h similarity index 100% rename from rhubarb/src/core/appInfo.h rename to rhubarb/src/core/app-info.h diff --git a/rhubarb/src/core/appInfo.cpp.in b/rhubarb/src/core/appInfo.cpp.in deleted file mode 100644 index bb7a242..0000000 --- a/rhubarb/src/core/appInfo.cpp.in +++ /dev/null @@ -1,4 +0,0 @@ -#include "appInfo.h" - -const std::string appName = "@appName@"; -const std::string appVersion = "@appVersion@"; \ No newline at end of file diff --git a/rhubarb/src/core/Phone.cpp b/rhubarb/src/core/phone.cpp similarity index 99% rename from rhubarb/src/core/Phone.cpp rename to rhubarb/src/core/phone.cpp index 8ff5632..1ab07ee 100644 --- a/rhubarb/src/core/Phone.cpp +++ b/rhubarb/src/core/phone.cpp @@ -1,4 +1,4 @@ -#include "Phone.h" +#include "phone.h" using boost::optional; using std::string; diff --git a/rhubarb/src/core/Phone.h b/rhubarb/src/core/phone.h similarity index 98% rename from rhubarb/src/core/Phone.h rename to rhubarb/src/core/phone.h index a59fb38..4ac659e 100644 --- a/rhubarb/src/core/Phone.h +++ b/rhubarb/src/core/phone.h @@ -1,6 +1,6 @@ #pragma once -#include "tools/EnumConverter.h" +#include "tools/enum-converter.h" // Defines a subset of the Arpabet enum class Phone { diff --git a/rhubarb/src/core/Shape.cpp b/rhubarb/src/core/shape.cpp similarity index 98% rename from rhubarb/src/core/Shape.cpp rename to rhubarb/src/core/shape.cpp index 8b5a218..cbc111b 100644 --- a/rhubarb/src/core/Shape.cpp +++ b/rhubarb/src/core/shape.cpp @@ -1,4 +1,4 @@ -#include "Shape.h" +#include "shape.h" using std::set; using std::string; diff --git a/rhubarb/src/core/Shape.h b/rhubarb/src/core/shape.h similarity index 97% rename from rhubarb/src/core/Shape.h rename to rhubarb/src/core/shape.h index 5f70eab..9e0e718 100644 --- a/rhubarb/src/core/Shape.h +++ b/rhubarb/src/core/shape.h @@ -2,7 +2,7 @@ #include -#include "tools/EnumConverter.h" +#include "tools/enum-converter.h" // The classic Hanna-Barbera mouth shapes A-F plus the common supplements G-H // For reference, see http://sunewatts.dk/lipsync/lipsync/article_02.php diff --git a/rhubarb/src/exporters/DatExporter.cpp b/rhubarb/src/exporters/dat-exporter.cpp similarity index 97% rename from rhubarb/src/exporters/DatExporter.cpp rename to rhubarb/src/exporters/dat-exporter.cpp index 4c22abc..f73a813 100644 --- a/rhubarb/src/exporters/DatExporter.cpp +++ b/rhubarb/src/exporters/dat-exporter.cpp @@ -1,8 +1,8 @@ -#include "DatExporter.h" +#include "dat-exporter.h" #include -#include "animation/targetShapeSet.h" +#include "animation/target-shape-set.h" using std::string; using std::chrono::duration; diff --git a/rhubarb/src/exporters/DatExporter.h b/rhubarb/src/exporters/dat-exporter.h similarity index 92% rename from rhubarb/src/exporters/DatExporter.h rename to rhubarb/src/exporters/dat-exporter.h index b7f1474..4bdc50d 100644 --- a/rhubarb/src/exporters/DatExporter.h +++ b/rhubarb/src/exporters/dat-exporter.h @@ -3,8 +3,8 @@ #include #include -#include "core/Shape.h" -#include "Exporter.h" +#include "core/shape.h" +#include "exporter.h" // Exporter for Moho's switch data file format class DatExporter : public Exporter { diff --git a/rhubarb/src/exporters/exporterTools.cpp b/rhubarb/src/exporters/exporter-tools.cpp similarity index 87% rename from rhubarb/src/exporters/exporterTools.cpp rename to rhubarb/src/exporters/exporter-tools.cpp index 61667c2..ade4926 100644 --- a/rhubarb/src/exporters/exporterTools.cpp +++ b/rhubarb/src/exporters/exporter-tools.cpp @@ -1,6 +1,6 @@ -#include "exporterTools.h" +#include "exporter-tools.h" -#include "animation/targetShapeSet.h" +#include "animation/target-shape-set.h" // Makes sure there is at least one mouth shape std::vector> dummyShapeIfEmpty( diff --git a/rhubarb/src/exporters/exporterTools.h b/rhubarb/src/exporters/exporter-tools.h similarity index 78% rename from rhubarb/src/exporters/exporterTools.h rename to rhubarb/src/exporters/exporter-tools.h index 534666b..fcc11a4 100644 --- a/rhubarb/src/exporters/exporterTools.h +++ b/rhubarb/src/exporters/exporter-tools.h @@ -1,7 +1,7 @@ #pragma once -#include "core/Shape.h" -#include "time/Timeline.h" +#include "core/shape.h" +#include "time/timeline.h" // Makes sure there is at least one mouth shape std::vector> dummyShapeIfEmpty( diff --git a/rhubarb/src/exporters/Exporter.h b/rhubarb/src/exporters/exporter.h similarity index 91% rename from rhubarb/src/exporters/Exporter.h rename to rhubarb/src/exporters/exporter.h index 4bc09a6..e03de07 100644 --- a/rhubarb/src/exporters/Exporter.h +++ b/rhubarb/src/exporters/exporter.h @@ -2,8 +2,8 @@ #include -#include "core/Shape.h" -#include "time/ContinuousTimeline.h" +#include "core/shape.h" +#include "time/continuous-timeline.h" class ExporterInput { public: diff --git a/rhubarb/src/exporters/JsonExporter.cpp b/rhubarb/src/exporters/json-exporter.cpp similarity index 93% rename from rhubarb/src/exporters/JsonExporter.cpp rename to rhubarb/src/exporters/json-exporter.cpp index c44fb4b..6e8bfa1 100644 --- a/rhubarb/src/exporters/JsonExporter.cpp +++ b/rhubarb/src/exporters/json-exporter.cpp @@ -1,7 +1,7 @@ -#include "JsonExporter.h" +#include "json-exporter.h" -#include "exporterTools.h" -#include "tools/stringTools.h" +#include "exporter-tools.h" +#include "tools/string-tools.h" using std::string; diff --git a/rhubarb/src/exporters/JsonExporter.h b/rhubarb/src/exporters/json-exporter.h similarity index 87% rename from rhubarb/src/exporters/JsonExporter.h rename to rhubarb/src/exporters/json-exporter.h index b7d71d9..2bfed39 100644 --- a/rhubarb/src/exporters/JsonExporter.h +++ b/rhubarb/src/exporters/json-exporter.h @@ -1,6 +1,6 @@ #pragma once -#include "Exporter.h" +#include "exporter.h" class JsonExporter : public Exporter { public: diff --git a/rhubarb/src/exporters/TsvExporter.cpp b/rhubarb/src/exporters/tsv-exporter.cpp similarity index 88% rename from rhubarb/src/exporters/TsvExporter.cpp rename to rhubarb/src/exporters/tsv-exporter.cpp index 94c366f..850bd15 100644 --- a/rhubarb/src/exporters/TsvExporter.cpp +++ b/rhubarb/src/exporters/tsv-exporter.cpp @@ -1,6 +1,6 @@ -#include "TsvExporter.h" +#include "tsv-exporter.h" -#include "animation/targetShapeSet.h" +#include "animation/target-shape-set.h" void TsvExporter::exportAnimation(const ExporterInput& input, std::ostream& outputStream) { // Output shapes with start times diff --git a/rhubarb/src/exporters/TsvExporter.h b/rhubarb/src/exporters/tsv-exporter.h similarity index 87% rename from rhubarb/src/exporters/TsvExporter.h rename to rhubarb/src/exporters/tsv-exporter.h index 795bec5..e32711a 100644 --- a/rhubarb/src/exporters/TsvExporter.h +++ b/rhubarb/src/exporters/tsv-exporter.h @@ -1,6 +1,6 @@ #pragma once -#include "Exporter.h" +#include "exporter.h" class TsvExporter : public Exporter { public: diff --git a/rhubarb/src/exporters/XmlExporter.cpp b/rhubarb/src/exporters/xml-exporter.cpp similarity index 95% rename from rhubarb/src/exporters/XmlExporter.cpp rename to rhubarb/src/exporters/xml-exporter.cpp index 2b04c92..aa58091 100644 --- a/rhubarb/src/exporters/XmlExporter.cpp +++ b/rhubarb/src/exporters/xml-exporter.cpp @@ -1,10 +1,10 @@ -#include "XmlExporter.h" +#include "xml-exporter.h" #include #include #include -#include "exporterTools.h" +#include "exporter-tools.h" using boost::property_tree::ptree; using std::string; diff --git a/rhubarb/src/exporters/XmlExporter.h b/rhubarb/src/exporters/xml-exporter.h similarity index 87% rename from rhubarb/src/exporters/XmlExporter.h rename to rhubarb/src/exporters/xml-exporter.h index 4fa4a16..77203ed 100644 --- a/rhubarb/src/exporters/XmlExporter.h +++ b/rhubarb/src/exporters/xml-exporter.h @@ -1,6 +1,6 @@ #pragma once -#include "Exporter.h" +#include "exporter.h" class XmlExporter : public Exporter { public: diff --git a/rhubarb/src/lib/rhubarbLib.cpp b/rhubarb/src/lib/rhubarb-lib.cpp similarity index 86% rename from rhubarb/src/lib/rhubarbLib.cpp rename to rhubarb/src/lib/rhubarb-lib.cpp index 4ed0ab2..01ff8fd 100644 --- a/rhubarb/src/lib/rhubarbLib.cpp +++ b/rhubarb/src/lib/rhubarb-lib.cpp @@ -1,9 +1,9 @@ -#include "rhubarbLib.h" +#include "rhubarb-lib.h" -#include "animation/mouthAnimation.h" -#include "audio/audioFileReading.h" -#include "core/Phone.h" -#include "tools/textFiles.h" +#include "animation/mouth-animation.h" +#include "audio/audio-file-reading.h" +#include "core/phone.h" +#include "tools/text-files.h" using boost::optional; using std::string; diff --git a/rhubarb/src/lib/rhubarbLib.h b/rhubarb/src/lib/rhubarb-lib.h similarity index 77% rename from rhubarb/src/lib/rhubarbLib.h rename to rhubarb/src/lib/rhubarb-lib.h index b310f95..c94ff99 100644 --- a/rhubarb/src/lib/rhubarbLib.h +++ b/rhubarb/src/lib/rhubarb-lib.h @@ -2,11 +2,11 @@ #include -#include "animation/targetShapeSet.h" -#include "audio/AudioClip.h" -#include "core/Shape.h" -#include "recognition/Recognizer.h" -#include "time/ContinuousTimeline.h" +#include "animation/target-shape-set.h" +#include "audio/audio-clip.h" +#include "core/shape.h" +#include "recognition/recognizer.h" +#include "time/continuous-timeline.h" #include "tools/progress.h" JoiningContinuousTimeline animateAudioClip( diff --git a/rhubarb/src/logging/Entry.cpp b/rhubarb/src/logging/entry.cpp similarity index 98% rename from rhubarb/src/logging/Entry.cpp rename to rhubarb/src/logging/entry.cpp index 626f0e8..1fabc43 100644 --- a/rhubarb/src/logging/Entry.cpp +++ b/rhubarb/src/logging/entry.cpp @@ -1,4 +1,4 @@ -#include "Entry.h" +#include "entry.h" #include #include diff --git a/rhubarb/src/logging/Entry.h b/rhubarb/src/logging/entry.h similarity index 92% rename from rhubarb/src/logging/Entry.h rename to rhubarb/src/logging/entry.h index aef398c..4c6af69 100644 --- a/rhubarb/src/logging/Entry.h +++ b/rhubarb/src/logging/entry.h @@ -1,6 +1,6 @@ #pragma once -#include "Level.h" +#include "level.h" namespace logging { diff --git a/rhubarb/src/logging/Formatter.h b/rhubarb/src/logging/formatter.h similarity index 91% rename from rhubarb/src/logging/Formatter.h rename to rhubarb/src/logging/formatter.h index 29127b6..2be9928 100644 --- a/rhubarb/src/logging/Formatter.h +++ b/rhubarb/src/logging/formatter.h @@ -2,7 +2,7 @@ #include -#include "Entry.h" +#include "entry.h" namespace logging { diff --git a/rhubarb/src/logging/formatters.cpp b/rhubarb/src/logging/formatters.cpp index 4a9c073..a49c78a 100644 --- a/rhubarb/src/logging/formatters.cpp +++ b/rhubarb/src/logging/formatters.cpp @@ -2,7 +2,7 @@ #include -#include "Entry.h" +#include "entry.h" #include "tools/tools.h" using std::string; diff --git a/rhubarb/src/logging/formatters.h b/rhubarb/src/logging/formatters.h index dfda01f..c3296d3 100644 --- a/rhubarb/src/logging/formatters.h +++ b/rhubarb/src/logging/formatters.h @@ -1,6 +1,6 @@ #pragma once -#include "Formatter.h" +#include "formatter.h" namespace logging { diff --git a/rhubarb/src/logging/Level.cpp b/rhubarb/src/logging/level.cpp similarity index 97% rename from rhubarb/src/logging/Level.cpp rename to rhubarb/src/logging/level.cpp index baf817b..39fdd39 100644 --- a/rhubarb/src/logging/Level.cpp +++ b/rhubarb/src/logging/level.cpp @@ -1,4 +1,4 @@ -#include "Level.h" +#include "level.h" using std::string; diff --git a/rhubarb/src/logging/Level.h b/rhubarb/src/logging/level.h similarity index 93% rename from rhubarb/src/logging/Level.h rename to rhubarb/src/logging/level.h index 0854488..f5a8b2c 100644 --- a/rhubarb/src/logging/Level.h +++ b/rhubarb/src/logging/level.h @@ -1,6 +1,6 @@ #pragma once -#include "tools/EnumConverter.h" +#include "tools/enum-converter.h" namespace logging { diff --git a/rhubarb/src/logging/logging.cpp b/rhubarb/src/logging/logging.cpp index 0e92366..67f0bf2 100644 --- a/rhubarb/src/logging/logging.cpp +++ b/rhubarb/src/logging/logging.cpp @@ -2,7 +2,7 @@ #include -#include "Entry.h" +#include "entry.h" #include "tools/tools.h" using namespace logging; diff --git a/rhubarb/src/logging/logging.h b/rhubarb/src/logging/logging.h index d921e52..0171f9d 100644 --- a/rhubarb/src/logging/logging.h +++ b/rhubarb/src/logging/logging.h @@ -1,8 +1,8 @@ #pragma once -#include "Level.h" -#include "Sink.h" -#include "tools/EnumConverter.h" +#include "level.h" +#include "sink.h" +#include "tools/enum-converter.h" namespace logging { diff --git a/rhubarb/src/logging/Sink.h b/rhubarb/src/logging/sink.h similarity index 89% rename from rhubarb/src/logging/Sink.h rename to rhubarb/src/logging/sink.h index e1e517a..9452402 100644 --- a/rhubarb/src/logging/Sink.h +++ b/rhubarb/src/logging/sink.h @@ -1,6 +1,6 @@ #pragma once -#include "Entry.h" +#include "entry.h" namespace logging { diff --git a/rhubarb/src/logging/sinks.cpp b/rhubarb/src/logging/sinks.cpp index 2dddf9f..bc8f1bb 100644 --- a/rhubarb/src/logging/sinks.cpp +++ b/rhubarb/src/logging/sinks.cpp @@ -2,7 +2,7 @@ #include -#include "Entry.h" +#include "entry.h" using std::shared_ptr; using std::string; diff --git a/rhubarb/src/logging/sinks.h b/rhubarb/src/logging/sinks.h index 62c82ee..7c2dca2 100644 --- a/rhubarb/src/logging/sinks.h +++ b/rhubarb/src/logging/sinks.h @@ -2,8 +2,8 @@ #include -#include "Formatter.h" -#include "Sink.h" +#include "formatter.h" +#include "sink.h" namespace logging { enum class Level; diff --git a/rhubarb/src/recognition/g2pRules.cpp b/rhubarb/src/recognition/g2p-rules.cpp similarity index 99% rename from rhubarb/src/recognition/g2pRules.cpp rename to rhubarb/src/recognition/g2p-rules.cpp index 7a41ebc..487366b 100644 --- a/rhubarb/src/recognition/g2pRules.cpp +++ b/rhubarb/src/recognition/g2p-rules.cpp @@ -1,4 +1,4 @@ -// Generated by g2pRules.rb; don't modify by hand! +// Generated by g2p-rules.rb; don't modify by hand! // // Rules diff --git a/rhubarb/src/recognition/g2pRules.rb b/rhubarb/src/recognition/g2p-rules.rb similarity index 98% rename from rhubarb/src/recognition/g2pRules.rb rename to rhubarb/src/recognition/g2p-rules.rb index 5c6f7a2..e322098 100644 --- a/rhubarb/src/recognition/g2pRules.rb +++ b/rhubarb/src/recognition/g2p-rules.rb @@ -99,7 +99,7 @@ lines.each_with_index do |line, index| end # Parse rules and convert them to C++ -File.open('g2pRules.cpp', 'w:UTF-8') do |file| +File.open('g2p-rules.cpp', 'w:UTF-8') do |file| file.print "// Generated by #{__FILE__}; don't modify by hand!\n\n" lines.drop(characterClassLineCount).each do |line| # Handle comments diff --git a/rhubarb/src/recognition/g2p.cpp b/rhubarb/src/recognition/g2p.cpp index 2702a7d..b50fc8d 100644 --- a/rhubarb/src/recognition/g2p.cpp +++ b/rhubarb/src/recognition/g2p.cpp @@ -3,7 +3,7 @@ #include #include "logging/logging.h" -#include "tools/stringTools.h" +#include "tools/string-tools.h" using std::invalid_argument; using std::pair; @@ -14,7 +14,7 @@ using std::wstring; const vector>& getReplacementRules() { static vector> rules{ -#include "g2pRules.cpp" +#include "g2p-rules.cpp" // Turn bigrams into unigrams for easier conversion {wregex(L"ôw"), L"Ω"}, diff --git a/rhubarb/src/recognition/g2p.h b/rhubarb/src/recognition/g2p.h index cb50d7d..0bca09e 100644 --- a/rhubarb/src/recognition/g2p.h +++ b/rhubarb/src/recognition/g2p.h @@ -2,6 +2,6 @@ #include -#include "core/Phone.h" +#include "core/phone.h" std::vector wordToPhones(const std::string& word); diff --git a/rhubarb/src/recognition/languageModels.cpp b/rhubarb/src/recognition/language-models.cpp similarity index 98% rename from rhubarb/src/recognition/languageModels.cpp rename to rhubarb/src/recognition/language-models.cpp index 427371d..46bdd19 100644 --- a/rhubarb/src/recognition/languageModels.cpp +++ b/rhubarb/src/recognition/language-models.cpp @@ -1,4 +1,4 @@ -#include "languageModels.h" +#include "language-models.h" #include @@ -10,8 +10,8 @@ #include #include -#include "core/appInfo.h" -#include "tools/platformTools.h" +#include "core/app-info.h" +#include "tools/platform-tools.h" using std::endl; using std::get; diff --git a/rhubarb/src/recognition/languageModels.h b/rhubarb/src/recognition/language-models.h similarity index 100% rename from rhubarb/src/recognition/languageModels.h rename to rhubarb/src/recognition/language-models.h diff --git a/rhubarb/src/recognition/PhoneticRecognizer.cpp b/rhubarb/src/recognition/phonetic-recognizer.cpp similarity index 96% rename from rhubarb/src/recognition/PhoneticRecognizer.cpp rename to rhubarb/src/recognition/phonetic-recognizer.cpp index 81a9b6c..377bf17 100644 --- a/rhubarb/src/recognition/PhoneticRecognizer.cpp +++ b/rhubarb/src/recognition/phonetic-recognizer.cpp @@ -1,10 +1,10 @@ -#include "PhoneticRecognizer.h" +#include "phonetic-recognizer.h" -#include "audio/AudioSegment.h" +#include "audio/audio-segment.h" #include "audio/processing.h" -#include "audio/SampleRateConverter.h" -#include "time/timedLogging.h" -#include "time/Timeline.h" +#include "audio/sample-rate-converter.h" +#include "time/timed-logging.h" +#include "time/timeline.h" using boost::optional; using std::runtime_error; diff --git a/rhubarb/src/recognition/PhoneticRecognizer.h b/rhubarb/src/recognition/phonetic-recognizer.h similarity index 83% rename from rhubarb/src/recognition/PhoneticRecognizer.h rename to rhubarb/src/recognition/phonetic-recognizer.h index 2b19013..2b9bc98 100644 --- a/rhubarb/src/recognition/PhoneticRecognizer.h +++ b/rhubarb/src/recognition/phonetic-recognizer.h @@ -1,7 +1,7 @@ #pragma once -#include "pocketSphinxTools.h" -#include "Recognizer.h" +#include "pocket-sphinx-tools.h" +#include "recognizer.h" class PhoneticRecognizer : public Recognizer { public: diff --git a/rhubarb/src/recognition/PocketSphinxRecognizer.cpp b/rhubarb/src/recognition/pocket-sphinx-recognizer.cpp similarity index 98% rename from rhubarb/src/recognition/PocketSphinxRecognizer.cpp rename to rhubarb/src/recognition/pocket-sphinx-recognizer.cpp index 8f78dd2..548e7b2 100644 --- a/rhubarb/src/recognition/PocketSphinxRecognizer.cpp +++ b/rhubarb/src/recognition/pocket-sphinx-recognizer.cpp @@ -1,16 +1,16 @@ -#include "PocketSphinxRecognizer.h" +#include "pocket-sphinx-recognizer.h" #include #include -#include "audio/AudioSegment.h" +#include "audio/audio-segment.h" #include "audio/processing.h" -#include "audio/SampleRateConverter.h" +#include "audio/sample-rate-converter.h" #include "g2p.h" -#include "languageModels.h" -#include "time/ContinuousTimeline.h" -#include "time/timedLogging.h" +#include "language-models.h" +#include "time/continuous-timeline.h" +#include "time/timed-logging.h" #include "tokenization.h" extern "C" { diff --git a/rhubarb/src/recognition/PocketSphinxRecognizer.h b/rhubarb/src/recognition/pocket-sphinx-recognizer.h similarity index 83% rename from rhubarb/src/recognition/PocketSphinxRecognizer.h rename to rhubarb/src/recognition/pocket-sphinx-recognizer.h index f25b6da..b3b223f 100644 --- a/rhubarb/src/recognition/PocketSphinxRecognizer.h +++ b/rhubarb/src/recognition/pocket-sphinx-recognizer.h @@ -1,7 +1,7 @@ #pragma once -#include "pocketSphinxTools.h" -#include "Recognizer.h" +#include "pocket-sphinx-tools.h" +#include "recognizer.h" class PocketSphinxRecognizer : public Recognizer { public: diff --git a/rhubarb/src/recognition/pocketSphinxTools.cpp b/rhubarb/src/recognition/pocket-sphinx-tools.cpp similarity index 97% rename from rhubarb/src/recognition/pocketSphinxTools.cpp rename to rhubarb/src/recognition/pocket-sphinx-tools.cpp index 9d9469a..44b61af 100644 --- a/rhubarb/src/recognition/pocketSphinxTools.cpp +++ b/rhubarb/src/recognition/pocket-sphinx-tools.cpp @@ -1,13 +1,13 @@ -#include "pocketSphinxTools.h" +#include "pocket-sphinx-tools.h" #include -#include "audio/DcOffset.h" -#include "audio/voiceActivityDetection.h" -#include "time/timedLogging.h" -#include "tools/ObjectPool.h" +#include "audio/dc-offset.h" +#include "audio/voice-activity-detection.h" +#include "time/timed-logging.h" +#include "tools/object-pool.h" #include "tools/parallel.h" -#include "tools/platformTools.h" +#include "tools/platform-tools.h" extern "C" { #include diff --git a/rhubarb/src/recognition/pocketSphinxTools.h b/rhubarb/src/recognition/pocket-sphinx-tools.h similarity index 91% rename from rhubarb/src/recognition/pocketSphinxTools.h rename to rhubarb/src/recognition/pocket-sphinx-tools.h index ed8ec1e..d989565 100644 --- a/rhubarb/src/recognition/pocketSphinxTools.h +++ b/rhubarb/src/recognition/pocket-sphinx-tools.h @@ -2,9 +2,9 @@ #include -#include "audio/AudioClip.h" -#include "core/Phone.h" -#include "time/BoundedTimeline.h" +#include "audio/audio-clip.h" +#include "core/phone.h" +#include "time/bounded-timeline.h" #include "tools/progress.h" extern "C" { diff --git a/rhubarb/src/recognition/Recognizer.h b/rhubarb/src/recognition/recognizer.h similarity index 78% rename from rhubarb/src/recognition/Recognizer.h rename to rhubarb/src/recognition/recognizer.h index 6b1fce7..5dea299 100644 --- a/rhubarb/src/recognition/Recognizer.h +++ b/rhubarb/src/recognition/recognizer.h @@ -1,8 +1,8 @@ #pragma once -#include "audio/AudioClip.h" -#include "core/Phone.h" -#include "time/BoundedTimeline.h" +#include "audio/audio-clip.h" +#include "core/phone.h" +#include "time/bounded-timeline.h" #include "tools/progress.h" class Recognizer { diff --git a/rhubarb/src/recognition/tokenization.cpp b/rhubarb/src/recognition/tokenization.cpp index e075dbc..8569c0b 100644 --- a/rhubarb/src/recognition/tokenization.cpp +++ b/rhubarb/src/recognition/tokenization.cpp @@ -3,7 +3,7 @@ #include #include -#include "tools/stringTools.h" +#include "tools/string-tools.h" #include "tools/tools.h" extern "C" { diff --git a/rhubarb/src/rhubarb/ExportFormat.cpp b/rhubarb/src/rhubarb/export-format.cpp similarity index 96% rename from rhubarb/src/rhubarb/ExportFormat.cpp rename to rhubarb/src/rhubarb/export-format.cpp index a37030e..19191f8 100644 --- a/rhubarb/src/rhubarb/ExportFormat.cpp +++ b/rhubarb/src/rhubarb/export-format.cpp @@ -1,4 +1,4 @@ -#include "ExportFormat.h" +#include "export-format.h" using std::string; diff --git a/rhubarb/src/rhubarb/ExportFormat.h b/rhubarb/src/rhubarb/export-format.h similarity index 92% rename from rhubarb/src/rhubarb/ExportFormat.h rename to rhubarb/src/rhubarb/export-format.h index 87d79b7..a8a3ff0 100644 --- a/rhubarb/src/rhubarb/ExportFormat.h +++ b/rhubarb/src/rhubarb/export-format.h @@ -1,6 +1,6 @@ #pragma once -#include "tools/EnumConverter.h" +#include "tools/enum-converter.h" enum class ExportFormat { Dat, Tsv, Xml, Json }; diff --git a/rhubarb/src/rhubarb/main.cpp b/rhubarb/src/rhubarb/main.cpp index c045553..8c7f252 100644 --- a/rhubarb/src/rhubarb/main.cpp +++ b/rhubarb/src/rhubarb/main.cpp @@ -7,30 +7,30 @@ #include #include -#include "animation/targetShapeSet.h" -#include "core/appInfo.h" -#include "exporters/DatExporter.h" -#include "exporters/Exporter.h" -#include "exporters/JsonExporter.h" -#include "exporters/TsvExporter.h" -#include "exporters/XmlExporter.h" -#include "ExportFormat.h" -#include "lib/rhubarbLib.h" +#include "animation/target-shape-set.h" +#include "core/app-info.h" +#include "export-format.h" +#include "exporters/dat-exporter.h" +#include "exporters/exporter.h" +#include "exporters/json-exporter.h" +#include "exporters/tsv-exporter.h" +#include "exporters/xml-exporter.h" +#include "lib/rhubarb-lib.h" #include "logging/formatters.h" #include "logging/logging.h" #include "logging/sinks.h" -#include "recognition/PhoneticRecognizer.h" -#include "recognition/PocketSphinxRecognizer.h" -#include "RecognizerType.h" -#include "semanticEntries.h" +#include "recognition/phonetic-recognizer.h" +#include "recognition/pocket-sphinx-recognizer.h" +#include "recognizer-type.h" +#include "semantic-entries.h" #include "sinks.h" -#include "time/ContinuousTimeline.h" +#include "time/continuous-timeline.h" #include "tools/exceptions.h" -#include "tools/NiceCmdLineOutput.h" +#include "tools/nice-cmd-line-output.h" #include "tools/parallel.h" -#include "tools/platformTools.h" -#include "tools/stringTools.h" -#include "tools/textFiles.h" +#include "tools/platform-tools.h" +#include "tools/string-tools.h" +#include "tools/text-files.h" using boost::optional; using boost::adaptors::transformed; diff --git a/rhubarb/src/rhubarb/RecognizerType.cpp b/rhubarb/src/rhubarb/recognizer-type.cpp similarity index 96% rename from rhubarb/src/rhubarb/RecognizerType.cpp rename to rhubarb/src/rhubarb/recognizer-type.cpp index e52dc13..1f0c739 100644 --- a/rhubarb/src/rhubarb/RecognizerType.cpp +++ b/rhubarb/src/rhubarb/recognizer-type.cpp @@ -1,4 +1,4 @@ -#include "RecognizerType.h" +#include "recognizer-type.h" using std::string; diff --git a/rhubarb/src/rhubarb/RecognizerType.h b/rhubarb/src/rhubarb/recognizer-type.h similarity index 92% rename from rhubarb/src/rhubarb/RecognizerType.h rename to rhubarb/src/rhubarb/recognizer-type.h index b7601a6..4cc4d75 100644 --- a/rhubarb/src/rhubarb/RecognizerType.h +++ b/rhubarb/src/rhubarb/recognizer-type.h @@ -1,6 +1,6 @@ #pragma once -#include "tools/EnumConverter.h" +#include "tools/enum-converter.h" enum class RecognizerType { PocketSphinx, Phonetic }; diff --git a/rhubarb/src/rhubarb/semanticEntries.cpp b/rhubarb/src/rhubarb/semantic-entries.cpp similarity index 97% rename from rhubarb/src/rhubarb/semanticEntries.cpp rename to rhubarb/src/rhubarb/semantic-entries.cpp index ccaee6d..3efc1c6 100644 --- a/rhubarb/src/rhubarb/semanticEntries.cpp +++ b/rhubarb/src/rhubarb/semantic-entries.cpp @@ -1,4 +1,4 @@ -#include "semanticEntries.h" +#include "semantic-entries.h" using logging::Level; using std::string; diff --git a/rhubarb/src/rhubarb/semanticEntries.h b/rhubarb/src/rhubarb/semantic-entries.h similarity index 96% rename from rhubarb/src/rhubarb/semanticEntries.h rename to rhubarb/src/rhubarb/semantic-entries.h index 996a127..9417a20 100644 --- a/rhubarb/src/rhubarb/semanticEntries.h +++ b/rhubarb/src/rhubarb/semantic-entries.h @@ -1,7 +1,7 @@ #pragma once #include -#include "logging/Entry.h" +#include "logging/entry.h" // Marker class for semantic entries class SemanticEntry : public logging::Entry { diff --git a/rhubarb/src/rhubarb/sinks.cpp b/rhubarb/src/rhubarb/sinks.cpp index 4807b2f..d9088ef 100644 --- a/rhubarb/src/rhubarb/sinks.cpp +++ b/rhubarb/src/rhubarb/sinks.cpp @@ -2,11 +2,11 @@ #include -#include "core/appInfo.h" +#include "core/app-info.h" #include "logging/formatters.h" #include "logging/sinks.h" -#include "semanticEntries.h" -#include "tools/stringTools.h" +#include "semantic-entries.h" +#include "tools/string-tools.h" using boost::optional; using logging::Level; diff --git a/rhubarb/src/rhubarb/sinks.h b/rhubarb/src/rhubarb/sinks.h index c1d582c..f6925e9 100644 --- a/rhubarb/src/rhubarb/sinks.h +++ b/rhubarb/src/rhubarb/sinks.h @@ -2,9 +2,9 @@ #include -#include "logging/Entry.h" -#include "logging/Sink.h" -#include "tools/ProgressBar.h" +#include "logging/entry.h" +#include "logging/sink.h" +#include "tools/progress-bar.h" // Prints nicely formatted progress to stderr. // Non-semantic entries are only printed if their log level at least matches the specified minimum diff --git a/rhubarb/src/time/BoundedTimeline.h b/rhubarb/src/time/bounded-timeline.h similarity index 99% rename from rhubarb/src/time/BoundedTimeline.h rename to rhubarb/src/time/bounded-timeline.h index 9ab74ea..d830605 100644 --- a/rhubarb/src/time/BoundedTimeline.h +++ b/rhubarb/src/time/bounded-timeline.h @@ -1,6 +1,6 @@ #pragma once -#include "Timeline.h" +#include "timeline.h" template class BoundedTimeline : public Timeline { diff --git a/rhubarb/src/time/ContinuousTimeline.h b/rhubarb/src/time/continuous-timeline.h similarity index 98% rename from rhubarb/src/time/ContinuousTimeline.h rename to rhubarb/src/time/continuous-timeline.h index 1af6bc0..e998660 100644 --- a/rhubarb/src/time/ContinuousTimeline.h +++ b/rhubarb/src/time/continuous-timeline.h @@ -1,6 +1,6 @@ #pragma once -#include "BoundedTimeline.h" +#include "bounded-timeline.h" template class ContinuousTimeline : public BoundedTimeline { diff --git a/rhubarb/src/time/TimeRange.cpp b/rhubarb/src/time/time-range.cpp similarity index 98% rename from rhubarb/src/time/TimeRange.cpp rename to rhubarb/src/time/time-range.cpp index 628563d..137e236 100644 --- a/rhubarb/src/time/TimeRange.cpp +++ b/rhubarb/src/time/time-range.cpp @@ -1,4 +1,4 @@ -#include "TimeRange.h" +#include "time-range.h" #include diff --git a/rhubarb/src/time/TimeRange.h b/rhubarb/src/time/time-range.h similarity index 100% rename from rhubarb/src/time/TimeRange.h rename to rhubarb/src/time/time-range.h diff --git a/rhubarb/src/time/timedLogging.h b/rhubarb/src/time/timed-logging.h similarity index 94% rename from rhubarb/src/time/timedLogging.h rename to rhubarb/src/time/timed-logging.h index e178846..4cd781a 100644 --- a/rhubarb/src/time/timedLogging.h +++ b/rhubarb/src/time/timed-logging.h @@ -2,8 +2,8 @@ #include "centiseconds.h" #include "logging/logging.h" -#include "Timed.h" -#include "TimeRange.h" +#include "time-range.h" +#include "timed.h" template void logTimedEvent(const std::string& eventName, const Timed timedValue) { diff --git a/rhubarb/src/time/Timed.h b/rhubarb/src/time/timed.h similarity index 99% rename from rhubarb/src/time/Timed.h rename to rhubarb/src/time/timed.h index de0258f..3067908 100644 --- a/rhubarb/src/time/Timed.h +++ b/rhubarb/src/time/timed.h @@ -2,7 +2,7 @@ #include -#include "time/TimeRange.h" +#include "time/time-range.h" template class Timed { diff --git a/rhubarb/src/time/Timeline.h b/rhubarb/src/time/timeline.h similarity index 99% rename from rhubarb/src/time/Timeline.h rename to rhubarb/src/time/timeline.h index ea7f1c7..cab40f4 100644 --- a/rhubarb/src/time/Timeline.h +++ b/rhubarb/src/time/timeline.h @@ -3,7 +3,7 @@ #include #include -#include "Timed.h" +#include "timed.h" #include "tools/tools.h" enum class FindMode { SampleLeft, SampleRight, SearchLeft, SearchRight }; diff --git a/rhubarb/src/tools/EnumConverter.h b/rhubarb/src/tools/enum-converter.h similarity index 100% rename from rhubarb/src/tools/EnumConverter.h rename to rhubarb/src/tools/enum-converter.h diff --git a/rhubarb/src/tools/fileTools.cpp b/rhubarb/src/tools/file-tools.cpp similarity index 97% rename from rhubarb/src/tools/fileTools.cpp rename to rhubarb/src/tools/file-tools.cpp index 4df6702..beb5d9b 100644 --- a/rhubarb/src/tools/fileTools.cpp +++ b/rhubarb/src/tools/file-tools.cpp @@ -1,4 +1,4 @@ -#include "fileTools.h" +#include "file-tools.h" #include diff --git a/rhubarb/src/tools/fileTools.h b/rhubarb/src/tools/file-tools.h similarity index 85% rename from rhubarb/src/tools/fileTools.h rename to rhubarb/src/tools/file-tools.h index 6fe0c3a..7d1fdda 100644 --- a/rhubarb/src/tools/fileTools.h +++ b/rhubarb/src/tools/file-tools.h @@ -2,7 +2,7 @@ #include #include -#include "platformTools.h" +#include "platform-tools.h" std::ifstream openFile(std::filesystem::path filePath); diff --git a/rhubarb/src/tools/Lazy.h b/rhubarb/src/tools/lazy.h similarity index 100% rename from rhubarb/src/tools/Lazy.h rename to rhubarb/src/tools/lazy.h diff --git a/rhubarb/src/tools/nextCombination.h b/rhubarb/src/tools/next-combination.h similarity index 100% rename from rhubarb/src/tools/nextCombination.h rename to rhubarb/src/tools/next-combination.h diff --git a/rhubarb/src/tools/NiceCmdLineOutput.cpp b/rhubarb/src/tools/nice-cmd-line-output.cpp similarity index 96% rename from rhubarb/src/tools/NiceCmdLineOutput.cpp rename to rhubarb/src/tools/nice-cmd-line-output.cpp index fcb8278..dfcbefa 100644 --- a/rhubarb/src/tools/NiceCmdLineOutput.cpp +++ b/rhubarb/src/tools/nice-cmd-line-output.cpp @@ -1,8 +1,8 @@ -#include "NiceCmdLineOutput.h" +#include "nice-cmd-line-output.h" -#include "platformTools.h" +#include "platform-tools.h" #include "regex" -#include "TablePrinter.h" +#include "table-printer.h" using std::cout; using std::endl; diff --git a/rhubarb/src/tools/NiceCmdLineOutput.h b/rhubarb/src/tools/nice-cmd-line-output.h similarity index 100% rename from rhubarb/src/tools/NiceCmdLineOutput.h rename to rhubarb/src/tools/nice-cmd-line-output.h diff --git a/rhubarb/src/tools/ObjectPool.h b/rhubarb/src/tools/object-pool.h similarity index 100% rename from rhubarb/src/tools/ObjectPool.h rename to rhubarb/src/tools/object-pool.h diff --git a/rhubarb/src/tools/platformTools.cpp b/rhubarb/src/tools/platform-tools.cpp similarity index 99% rename from rhubarb/src/tools/platformTools.cpp rename to rhubarb/src/tools/platform-tools.cpp index 4cc67ef..6582869 100644 --- a/rhubarb/src/tools/platformTools.cpp +++ b/rhubarb/src/tools/platform-tools.cpp @@ -1,4 +1,4 @@ -#include "platformTools.h" +#include "platform-tools.h" #include #include diff --git a/rhubarb/src/tools/platformTools.h b/rhubarb/src/tools/platform-tools.h similarity index 100% rename from rhubarb/src/tools/platformTools.h rename to rhubarb/src/tools/platform-tools.h diff --git a/rhubarb/src/tools/ProgressBar.cpp b/rhubarb/src/tools/progress-bar.cpp similarity index 99% rename from rhubarb/src/tools/ProgressBar.cpp rename to rhubarb/src/tools/progress-bar.cpp index 8b2a371..2f6d195 100644 --- a/rhubarb/src/tools/ProgressBar.cpp +++ b/rhubarb/src/tools/progress-bar.cpp @@ -1,4 +1,4 @@ -#include "ProgressBar.h" +#include "progress-bar.h" #include diff --git a/rhubarb/src/tools/ProgressBar.h b/rhubarb/src/tools/progress-bar.h similarity index 100% rename from rhubarb/src/tools/ProgressBar.h rename to rhubarb/src/tools/progress-bar.h diff --git a/rhubarb/src/tools/stringTools.cpp b/rhubarb/src/tools/string-tools.cpp similarity index 99% rename from rhubarb/src/tools/stringTools.cpp rename to rhubarb/src/tools/string-tools.cpp index f2616ff..763101f 100644 --- a/rhubarb/src/tools/stringTools.cpp +++ b/rhubarb/src/tools/string-tools.cpp @@ -1,4 +1,4 @@ -#include "stringTools.h" +#include "string-tools.h" #include #include diff --git a/rhubarb/src/tools/stringTools.h b/rhubarb/src/tools/string-tools.h similarity index 100% rename from rhubarb/src/tools/stringTools.h rename to rhubarb/src/tools/string-tools.h diff --git a/rhubarb/src/tools/TablePrinter.cpp b/rhubarb/src/tools/table-printer.cpp similarity index 97% rename from rhubarb/src/tools/TablePrinter.cpp rename to rhubarb/src/tools/table-printer.cpp index d1eef70..5fc3446 100644 --- a/rhubarb/src/tools/TablePrinter.cpp +++ b/rhubarb/src/tools/table-printer.cpp @@ -1,10 +1,10 @@ -#include "TablePrinter.h" +#include "table-printer.h" #include #include #include -#include "stringTools.h" +#include "string-tools.h" using std::initializer_list; using std::invalid_argument; diff --git a/rhubarb/src/tools/TablePrinter.h b/rhubarb/src/tools/table-printer.h similarity index 100% rename from rhubarb/src/tools/TablePrinter.h rename to rhubarb/src/tools/table-printer.h diff --git a/rhubarb/src/tools/textFiles.cpp b/rhubarb/src/tools/text-files.cpp similarity index 94% rename from rhubarb/src/tools/textFiles.cpp rename to rhubarb/src/tools/text-files.cpp index 91294a6..054a5b6 100644 --- a/rhubarb/src/tools/textFiles.cpp +++ b/rhubarb/src/tools/text-files.cpp @@ -1,10 +1,10 @@ -#include "textFiles.h" +#include "text-files.h" #include #include -#include "stringTools.h" +#include "string-tools.h" using std::string; using std::filesystem::path; diff --git a/rhubarb/src/tools/textFiles.h b/rhubarb/src/tools/text-files.h similarity index 100% rename from rhubarb/src/tools/textFiles.h rename to rhubarb/src/tools/text-files.h diff --git a/rhubarb/src/tools/tools.cpp b/rhubarb/src/tools/tools.cpp index b95b40a..d7b987d 100644 --- a/rhubarb/src/tools/tools.cpp +++ b/rhubarb/src/tools/tools.cpp @@ -5,7 +5,7 @@ #include #include -#include "platformTools.h" +#include "platform-tools.h" using std::string; using std::chrono::duration; diff --git a/rhubarb/src/tools/tupleHash.h b/rhubarb/src/tools/tuple-hash.h similarity index 100% rename from rhubarb/src/tools/tupleHash.h rename to rhubarb/src/tools/tuple-hash.h diff --git a/rhubarb/tests/BoundedTimelineTests.cpp b/rhubarb/tests/bounded-timeline-tests.cpp similarity index 98% rename from rhubarb/tests/BoundedTimelineTests.cpp rename to rhubarb/tests/bounded-timeline-tests.cpp index a270006..6d25d8a 100644 --- a/rhubarb/tests/BoundedTimelineTests.cpp +++ b/rhubarb/tests/bounded-timeline-tests.cpp @@ -1,6 +1,6 @@ #include -#include "time/BoundedTimeline.h" +#include "time/bounded-timeline.h" using namespace testing; using boost::optional; diff --git a/rhubarb/tests/ContinuousTimelineTests.cpp b/rhubarb/tests/continuous-timeline-tests.cpp similarity index 98% rename from rhubarb/tests/ContinuousTimelineTests.cpp rename to rhubarb/tests/continuous-timeline-tests.cpp index 6c76c27..ae46272 100644 --- a/rhubarb/tests/ContinuousTimelineTests.cpp +++ b/rhubarb/tests/continuous-timeline-tests.cpp @@ -1,6 +1,6 @@ #include -#include "time/ContinuousTimeline.h" +#include "time/continuous-timeline.h" using namespace testing; using boost::optional; diff --git a/rhubarb/tests/g2pTests.cpp b/rhubarb/tests/g2p-tests.cpp similarity index 100% rename from rhubarb/tests/g2pTests.cpp rename to rhubarb/tests/g2p-tests.cpp diff --git a/rhubarb/tests/LazyTests.cpp b/rhubarb/tests/lazy-tests.cpp similarity index 98% rename from rhubarb/tests/LazyTests.cpp rename to rhubarb/tests/lazy-tests.cpp index 914b342..99043e8 100644 --- a/rhubarb/tests/LazyTests.cpp +++ b/rhubarb/tests/lazy-tests.cpp @@ -1,6 +1,6 @@ #include -#include "tools/Lazy.h" +#include "tools/lazy.h" using namespace testing; diff --git a/rhubarb/tests/pairsTests.cpp b/rhubarb/tests/pairs-tests.cpp similarity index 100% rename from rhubarb/tests/pairsTests.cpp rename to rhubarb/tests/pairs-tests.cpp diff --git a/rhubarb/tests/stringToolsTests.cpp b/rhubarb/tests/string-tools-tests.cpp similarity index 98% rename from rhubarb/tests/stringToolsTests.cpp rename to rhubarb/tests/string-tools-tests.cpp index d2feb5a..daaf7ab 100644 --- a/rhubarb/tests/stringToolsTests.cpp +++ b/rhubarb/tests/string-tools-tests.cpp @@ -1,6 +1,6 @@ -#include +#include -#include "tools/stringTools.h" +#include "tools/string-tools.h" using namespace testing; using std::string; diff --git a/rhubarb/tests/TimelineTests.cpp b/rhubarb/tests/timeline-tests.cpp similarity index 99% rename from rhubarb/tests/TimelineTests.cpp rename to rhubarb/tests/timeline-tests.cpp index b158de2..9733c05 100644 --- a/rhubarb/tests/TimelineTests.cpp +++ b/rhubarb/tests/timeline-tests.cpp @@ -3,7 +3,7 @@ #include #include -#include "time/Timeline.h" +#include "time/timeline.h" using namespace testing; using boost::none; diff --git a/rhubarb/tests/tokenizationTests.cpp b/rhubarb/tests/tokenization-tests.cpp similarity index 100% rename from rhubarb/tests/tokenizationTests.cpp rename to rhubarb/tests/tokenization-tests.cpp diff --git a/rhubarb/tests/WaveFileReaderTests.cpp b/rhubarb/tests/wave-file-reader-tests.cpp similarity index 99% rename from rhubarb/tests/WaveFileReaderTests.cpp rename to rhubarb/tests/wave-file-reader-tests.cpp index 5f506a4..fb56952 100644 --- a/rhubarb/tests/WaveFileReaderTests.cpp +++ b/rhubarb/tests/wave-file-reader-tests.cpp @@ -1,7 +1,7 @@ #include -#include "audio/WaveFileReader.h" -#include "tools/platformTools.h" +#include "audio/wave-file-reader.h" +#include "tools/platform-tools.h" using namespace testing;