Rename project

mosmeh · mosmeh · commit dc5abf85ea19 · 2018-07-11T02:31:38.000+09:00
diff --git a/README.md b/README.md
@@ -1,10 +1,10 @@
-# primasynth
+# primesynth
 SoundFont-powered MIDI synthesizer
 
 ## Usage
 ```
-$ primasynth --help
-usage: primasynth [options] ... [soundfonts] ...
+$ primesynth --help
+usage: primesynth [options] ... [soundfonts] ...
 options:
   -i, --in            input MIDI device ID (unsigned int [=0])
   -o, --out           output audio device ID (unsigned int [=0])
@@ -19,6 +19,6 @@ options:
 ```
 
 ## Installation
-Currently primasynth is only for Windows.
+Currently primesynth is only for Windows.
 
 Visual Studio supporting C++14 or later is required.
diff --git a/primesynth.sln b/primesynth.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27703.2026
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "primasynth", "primasynth\primasynth.vcxproj", "{4741E648-BCB4-4936-8025-E35396041706}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "primesynth", "primesynth\primesynth.vcxproj", "{4741E648-BCB4-4936-8025-E35396041706}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/primesynth/.clang-format b/primesynth/.clang-format
diff --git a/primesynth/include/audio_output.h b/primesynth/include/audio_output.h
@@ -4,7 +4,7 @@
 #include "third_party/portaudio.h"
 #include <atomic>
 
-namespace primasynth {
+namespace primesynth {
 class AudioOutput {
 public:
     AudioOutput(Synthesizer& synth, std::size_t bufferSize, int deviceID = getDefaultDeviceID(),
diff --git a/primesynth/include/channel.h b/primesynth/include/channel.h
@@ -3,7 +3,7 @@
 #include "voice.h"
 #include <mutex>
 
-namespace primasynth {
+namespace primesynth {
 class Channel {
 public:
     explicit Channel(double outputRate);
diff --git a/primesynth/include/conversion.h b/primesynth/include/conversion.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <cstdint>
 
-namespace primasynth {
+namespace primesynth {
 namespace conv {
 void initialize();
 
diff --git a/primesynth/include/envelope.h b/primesynth/include/envelope.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <array>
 
-namespace primasynth {
+namespace primesynth {
 class Envelope {
 public:
     enum class Phase { Delay, Attack, Hold, Decay, Sustain, Release, Finished };
diff --git a/primesynth/include/fixed_point.h b/primesynth/include/fixed_point.h
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace primasynth {
+namespace primesynth {
 // 64 bit fixed-point number
 // higher 32 bit for integer part and lower 32 bit for fractional part
 class FixedPoint {
diff --git a/primesynth/include/lfo.h b/primesynth/include/lfo.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "conversion.h"
 
-namespace primasynth {
+namespace primesynth {
 class LFO {
 public:
     LFO(double outputRate, unsigned int interval)
diff --git a/primesynth/include/midi.h b/primesynth/include/midi.h
@@ -2,7 +2,7 @@
 #include <cstddef>
 #include <cstdint>
 
-namespace primasynth {
+namespace primesynth {
 namespace midi {
 static constexpr std::uint8_t PERCUSSION_CHANNEL = 9;
 static constexpr std::size_t NUM_CONTROLLERS = 128;
diff --git a/primesynth/include/midi_input.h b/primesynth/include/midi_input.h
@@ -4,7 +4,7 @@
 #define NOMINMAX
 #include <Windows.h>
 
-namespace primasynth {
+namespace primesynth {
 class MIDIInput {
 public:
     struct SharedParam {
diff --git a/primesynth/include/modulator.h b/primesynth/include/modulator.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "soundfont_spec.h"
 
-namespace primasynth {
+namespace primesynth {
 class Modulator {
 public:
     explicit Modulator(const sf::ModList& param);
diff --git a/primesynth/include/ring_buffer.h b/primesynth/include/ring_buffer.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <vector>
 
-namespace primasynth {
+namespace primesynth {
 class RingBuffer {
 public:
     explicit RingBuffer(std::size_t size) : size_(size), data_(size) {}
diff --git a/primesynth/include/soundfont.h b/primesynth/include/soundfont.h
@@ -3,7 +3,7 @@
 #include <array>
 #include <vector>
 
-namespace primasynth {
+namespace primesynth {
 static constexpr std::size_t NUM_GENERATORS = static_cast<std::size_t>(sf::Generator::Last);
 static constexpr std::uint16_t PERCUSSION_BANK = 128;
 
diff --git a/primesynth/include/soundfont_spec.h b/primesynth/include/soundfont_spec.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <cstdint>
 
-namespace primasynth {
+namespace primesynth {
 namespace sf {
 enum class SampleLink : std::uint16_t {
     MonoSample = 1,
diff --git a/primesynth/include/stdafx.h b/primesynth/include/stdafx.h
diff --git a/primesynth/include/stereo_value.h b/primesynth/include/stereo_value.h
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace primasynth {
+namespace primesynth {
 struct StereoValue {
     double left, right;
 
diff --git a/primesynth/include/synthesizer.h b/primesynth/include/synthesizer.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "channel.h"
 
-namespace primasynth {
+namespace primesynth {
 class Synthesizer {
 public:
     Synthesizer(double outputRate = 44100, std::size_t numChannels = 16);
diff --git a/primesynth/include/third_party/cmdline.h b/primesynth/include/third_party/cmdline.h
diff --git a/primesynth/include/third_party/portaudio.h b/primesynth/include/third_party/portaudio.h
diff --git a/primesynth/include/voice.h b/primesynth/include/voice.h
@@ -6,7 +6,7 @@
 #include "soundfont.h"
 #include "stereo_value.h"
 
-namespace primasynth {
+namespace primesynth {
 class Voice {
 public:
     enum class State { Playing, Sustained, Released, Finished };
diff --git a/primesynth/lib/portaudio_x64.dll b/primesynth/lib/portaudio_x64.dll
diff --git a/primesynth/lib/portaudio_x64.lib b/primesynth/lib/portaudio_x64.lib
diff --git a/primesynth/lib/portaudio_x64d.dll b/primesynth/lib/portaudio_x64d.dll
diff --git a/primesynth/lib/portaudio_x86.dll b/primesynth/lib/portaudio_x86.dll
diff --git a/primesynth/lib/portaudio_x86.lib b/primesynth/lib/portaudio_x86.lib
diff --git a/primesynth/lib/portaudio_x86d.dll b/primesynth/lib/portaudio_x86d.dll
diff --git a/primesynth/primesynth.vcxproj b/primesynth/primesynth.vcxproj
@@ -60,7 +60,7 @@
     <VCProjectVersion>15.0</VCProjectVersion>
     <ProjectGuid>{4741E648-BCB4-4936-8025-E35396041706}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <RootNamespace>primasynth</RootNamespace>
+    <RootNamespace>primesynth</RootNamespace>
     <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
diff --git a/primesynth/primesynth.vcxproj.filters b/primesynth/primesynth.vcxproj.filters
diff --git a/primesynth/src/audio_output.cpp b/primesynth/src/audio_output.cpp
@@ -3,7 +3,7 @@
 #define NOMINMAX
 #include <Windows.h>
 
-namespace primasynth {
+namespace primesynth {
 int streamCallback(const void*, void* output, unsigned long frameCount, const PaStreamCallbackTimeInfo*,
                    PaStreamCallbackFlags, void* userData) {
     const auto out = static_cast<float*>(output);
diff --git a/primesynth/src/channel.cpp b/primesynth/src/channel.cpp
@@ -1,6 +1,6 @@
 #include "channel.h"
 
-namespace primasynth {
+namespace primesynth {
 Channel::Channel(double outputRate)
     : outputRate_(outputRate),
       controllers_(),
diff --git a/primesynth/src/conversion.cpp b/primesynth/src/conversion.cpp
@@ -1,7 +1,7 @@
 #include "conversion.h"
 #include <array>
 
-namespace primasynth {
+namespace primesynth {
 namespace conv {
 std::array<double, 1441> attenToAmpTable;
 std::array<double, 1200> centToHertzTable;
diff --git a/primesynth/src/envelope.cpp b/primesynth/src/envelope.cpp
@@ -1,7 +1,7 @@
 #include "conversion.h"
 #include "envelope.h"
 
-namespace primasynth {
+namespace primesynth {
 Envelope::Envelope(double outputRate, unsigned int interval)
     : effectiveOutputRate_(outputRate / interval), params_(), phase_(Phase::Delay), phaseSteps_(0), value_(1.0) {}
 
diff --git a/primesynth/src/main.cpp b/primesynth/src/main.cpp
@@ -5,10 +5,10 @@
 
 int main(int argc, char** argv) {
     try {
-        using namespace primasynth;
+        using namespace primesynth;
 
         cmdline::parser argparser;
-        argparser.set_program_name("primasynth");
+        argparser.set_program_name("primesynth");
         argparser.add<unsigned int>("in", 'i', "input MIDI device ID", false, 0);
         argparser.add<unsigned int>("out", 'o', "output audio device ID", false);
         argparser.add<double>("volume", 'v', "volume (1 = 100%)", false, 1.0);
diff --git a/primesynth/src/midi.cpp b/primesynth/src/midi.cpp
@@ -1,6 +1,6 @@
 #include "midi.h"
 
-namespace primasynth {
+namespace primesynth {
 namespace midi {
 std::uint16_t joinBytes(std::uint8_t msb, std::uint8_t lsb) {
     return (static_cast<std::uint16_t>(msb) << 7) + static_cast<std::uint16_t>(lsb);
diff --git a/primesynth/src/midi_input.cpp b/primesynth/src/midi_input.cpp
@@ -3,7 +3,7 @@
 #include <iostream>
 #include <sstream>
 
-namespace primasynth {
+namespace primesynth {
 void checkMMResult(MMRESULT result) {
     if (result != MMSYSERR_NOERROR) {
         char msg[MAXERRORLENGTH];
diff --git a/primesynth/src/modulator.cpp b/primesynth/src/modulator.cpp
@@ -2,7 +2,7 @@
 #include "modulator.h"
 #include <stdexcept>
 
-namespace primasynth {
+namespace primesynth {
 Modulator::Modulator(const sf::ModList& param) : param_(param), source_(0.0), amountSource_(1.0), value_(0.0) {}
 
 sf::Generator Modulator::getDestination() const {
diff --git a/primesynth/src/soundfont.cpp b/primesynth/src/soundfont.cpp
@@ -2,7 +2,7 @@
 #include "soundfont.h"
 #include <fstream>
 
-namespace primasynth {
+namespace primesynth {
 std::string achToString(const char ach[20]) {
     return {ach, strnlen(ach, 20)};
 }
diff --git a/primesynth/src/stdafx.cpp b/primesynth/src/stdafx.cpp
diff --git a/primesynth/src/stereo_value.cpp b/primesynth/src/stereo_value.cpp
@@ -1,6 +1,6 @@
 #include "stereo_value.h"
 
-namespace primasynth {
+namespace primesynth {
 StereoValue StereoValue::operator*(double b) const {
     return {left * b, right * b};
 }
diff --git a/primesynth/src/synthesizer.cpp b/primesynth/src/synthesizer.cpp
@@ -1,6 +1,6 @@
 #include "synthesizer.h"
 
-namespace primasynth {
+namespace primesynth {
 Synthesizer::Synthesizer(double outputRate, std::size_t numChannels)
     : volume_(1.0), midiStd_(midi::Standard::GM), defaultMIDIStd_(midi::Standard::GM), stdFixed_(false) {
     conv::initialize();
diff --git a/primesynth/src/voice.cpp b/primesynth/src/voice.cpp
@@ -1,6 +1,6 @@
 #include "voice.h"
 
-namespace primasynth {
+namespace primesynth {
 static constexpr unsigned int CALC_INTERVAL = 64;
 
 // for compatibility

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`#include "soundfont.h"`
`3`	`3`	`#include <fstream>`
`4`	`4`
`5`		`-namespace primasynth {`
	`5`	`+namespace primesynth {`
`6`	`6`	`std::string achToString(const char ach[20]) {`
`7`	`7`	`return {ach, strnlen(ach, 20)};`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#include "stereo_value.h"`
`2`	`2`
`3`		`-namespace primasynth {`
	`3`	`+namespace primesynth {`
`4`	`4`	`StereoValue StereoValue::operator*(double b) const {`
`5`	`5`	`return {left * b, right * b};`
`6`	`6`	`}`