Skip to content

Commit

Permalink
Rename project
Browse files Browse the repository at this point in the history
  • Loading branch information
mosmeh committed Jul 10, 2018
1 parent 574f92f commit dc5abf8
Show file tree
Hide file tree
Showing 42 changed files with 34 additions and 34 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -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])
Expand All @@ -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.
2 changes: 1 addition & 1 deletion primasynth.sln → primesynth.sln
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "voice.h"
#include <mutex>

namespace primasynth {
namespace primesynth {
class Channel {
public:
explicit Channel(double outputRate);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once
#include <cstdint>

namespace primasynth {
namespace primesynth {
namespace conv {
void initialize();

Expand Down
Original file line number Diff line number Diff line change
@@ -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 };
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion primasynth/include/lfo.h → primesynth/include/lfo.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once
#include "conversion.h"

namespace primasynth {
namespace primesynth {
class LFO {
public:
LFO(double outputRate, unsigned int interval)
Expand Down
2 changes: 1 addition & 1 deletion primasynth/include/midi.h → primesynth/include/midi.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#define NOMINMAX
#include <Windows.h>

namespace primasynth {
namespace primesynth {
class MIDIInput {
public:
struct SharedParam {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once
#include "soundfont_spec.h"

namespace primasynth {
namespace primesynth {
class Modulator {
public:
explicit Modulator(const sf::ModList& param);
Expand Down
Original file line number Diff line number Diff line change
@@ -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) {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once
#include <cstdint>

namespace primasynth {
namespace primesynth {
namespace sf {
enum class SampleLink : std::uint16_t {
MonoSample = 1,
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

namespace primasynth {
namespace primesynth {
struct StereoValue {
double left, right;

Expand Down
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion primasynth/include/voice.h → primesynth/include/voice.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 };
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion primasynth/src/channel.cpp → primesynth/src/channel.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "channel.h"

namespace primasynth {
namespace primesynth {
Channel::Channel(double outputRate)
: outputRate_(outputRate),
controllers_(),
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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) {}

Expand Down
4 changes: 2 additions & 2 deletions primasynth/src/main.cpp → primesynth/src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion primasynth/src/midi.cpp → primesynth/src/midi.cpp
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <iostream>
#include <sstream>

namespace primasynth {
namespace primesynth {
void checkMMResult(MMRESULT result) {
if (result != MMSYSERR_NOERROR) {
char msg[MAXERRORLENGTH];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)};
}
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "stereo_value.h"

namespace primasynth {
namespace primesynth {
StereoValue StereoValue::operator*(double b) const {
return {left * b, right * b};
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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();
Expand Down
2 changes: 1 addition & 1 deletion primasynth/src/voice.cpp → primesynth/src/voice.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "voice.h"

namespace primasynth {
namespace primesynth {
static constexpr unsigned int CALC_INTERVAL = 64;

// for compatibility
Expand Down

0 comments on commit dc5abf8

Please sign in to comment.