Skip to content

Fix preview volume #612

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 29, 2025
Merged

Fix preview volume #612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions sources/Application/Model/Project.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,25 @@

#include <math.h>

#define DEFAULT_VOLUME 60

Project::Project(const char *name)
: Persistent("PROJECT"), VariableContainer(&variables_), song_(),
tempoNudge_(0), tempo_(FourCC::VarTempo, DEFAULT_TEMPO),
masterVolume_(FourCC::VarMasterVolume, 100),
channelVolume1_(FourCC::VarChannel1Volume, 60),
channelVolume2_(FourCC::VarChannel2Volume, 60),
channelVolume3_(FourCC::VarChannel3Volume, 60),
channelVolume4_(FourCC::VarChannel4Volume, 60),
channelVolume5_(FourCC::VarChannel5Volume, 60),
channelVolume6_(FourCC::VarChannel6Volume, 60),
channelVolume7_(FourCC::VarChannel7Volume, 60),
channelVolume8_(FourCC::VarChannel8Volume, 60),
masterVolume_(FourCC::VarMasterVolume, DEFAULT_VOLUME),
channelVolume1_(FourCC::VarChannel1Volume, DEFAULT_VOLUME),
channelVolume2_(FourCC::VarChannel2Volume, DEFAULT_VOLUME),
channelVolume3_(FourCC::VarChannel3Volume, DEFAULT_VOLUME),
channelVolume4_(FourCC::VarChannel4Volume, DEFAULT_VOLUME),
channelVolume5_(FourCC::VarChannel5Volume, DEFAULT_VOLUME),
channelVolume6_(FourCC::VarChannel6Volume, DEFAULT_VOLUME),
channelVolume7_(FourCC::VarChannel7Volume, DEFAULT_VOLUME),
channelVolume8_(FourCC::VarChannel8Volume, DEFAULT_VOLUME),
wrap_(FourCC::VarWrap, false), transpose_(FourCC::VarTranspose, 0),
scale_(FourCC::VarScale, scaleNames, numScales, 0),
scaleRoot_(FourCC::VarScaleRoot, noteNames, 12, 0),
projectName_(FourCC::VarProjectName, name) {
projectName_(FourCC::VarProjectName, name),
previewVolume_(FourCC::VarPreviewVolume, DEFAULT_VOLUME) {

this->variables_.insert(variables_.end(), &tempo_);
this->variables_.insert(variables_.end(), &masterVolume_);
Expand All @@ -51,6 +54,7 @@ Project::Project(const char *name)
this->variables_.insert(variables_.end(), &scaleRoot_);
scaleRoot_.SetInt(0); // Default to C (0)
this->variables_.insert(variables_.end(), &projectName_);
this->variables_.insert(variables_.end(), &previewVolume_);

// Project name is now managed through the WatchedVariable

Expand Down
1 change: 1 addition & 0 deletions sources/Application/Model/Project.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ class Project : public Persistent, public VariableContainer, I_Observer {
Variable scale_;
Variable scaleRoot_;
WatchedVariable projectName_;
Variable previewVolume_;
};

#endif