Merge branch 'main' of https://github.com/rerdavies/pipedal
This commit is contained in:
Vendored
+1
-1
@@ -8,7 +8,7 @@
|
|||||||
],
|
],
|
||||||
"compilerPath": "/usr/bin/gcc",
|
"compilerPath": "/usr/bin/gcc",
|
||||||
"cStandard": "c17",
|
"cStandard": "c17",
|
||||||
"cppStandard": "c++17",
|
"cppStandard": "c++20",
|
||||||
"intelliSenseMode": "linux-gcc-arm64",
|
"intelliSenseMode": "linux-gcc-arm64",
|
||||||
"compileCommands": "${workspaceFolder}/build/compile_commands.json",
|
"compileCommands": "${workspaceFolder}/build/compile_commands.json",
|
||||||
"configurationProvider": "ms-vscode.cmake-tools"
|
"configurationProvider": "ms-vscode.cmake-tools"
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"socket_server_port": 8080,
|
"socket_server_port": 80,
|
||||||
"socket_server_address": "*",
|
"socket_server_address": "*",
|
||||||
|
|
||||||
"max_upload_size": 1048576,
|
"max_upload_size": 1048576,
|
||||||
|
|||||||
+17
-3
@@ -114,11 +114,17 @@ export const MainPage =
|
|||||||
constructor(props: MainProps) {
|
constructor(props: MainProps) {
|
||||||
super(props);
|
super(props);
|
||||||
this.model = PiPedalModelFactory.getInstance();
|
this.model = PiPedalModelFactory.getInstance();
|
||||||
|
let pedalboard = this.model.pedalBoard.get();
|
||||||
|
let selectedPedal = -1;
|
||||||
|
if (pedalboard.items.length !== 0)
|
||||||
|
{
|
||||||
|
selectedPedal = pedalboard.items[0].instanceId;
|
||||||
|
}
|
||||||
|
|
||||||
this.state = {
|
this.state = {
|
||||||
selectedPedal: -1,
|
selectedPedal: selectedPedal,
|
||||||
loadDialogOpen: false,
|
loadDialogOpen: false,
|
||||||
pedalBoard: this.model.pedalBoard.get(),
|
pedalBoard: pedalboard,
|
||||||
addMenuAnchorEl: null,
|
addMenuAnchorEl: null,
|
||||||
splitControlBar: this.windowSize.width < SPLIT_CONTROLBAR_THRESHHOLD,
|
splitControlBar: this.windowSize.width < SPLIT_CONTROLBAR_THRESHHOLD,
|
||||||
horizontalScrollLayout: this.windowSize.height < HORIZONTAL_CONTROL_SCROLL_HEIGHT_BREAK,
|
horizontalScrollLayout: this.windowSize.height < HORIZONTAL_CONTROL_SCROLL_HEIGHT_BREAK,
|
||||||
@@ -188,7 +194,15 @@ export const MainPage =
|
|||||||
this.model.loadPluginPreset(instanceId, presetInstanceId);
|
this.model.loadPluginPreset(instanceId, presetInstanceId);
|
||||||
}
|
}
|
||||||
onPedalBoardChanged(value: PedalBoard) {
|
onPedalBoardChanged(value: PedalBoard) {
|
||||||
this.setState({ pedalBoard: value });
|
let selectedItem = -1;
|
||||||
|
if (value.items.length !== 0)
|
||||||
|
{
|
||||||
|
selectedItem = value.items[0].instanceId;
|
||||||
|
}
|
||||||
|
this.setState({
|
||||||
|
pedalBoard: value,
|
||||||
|
selectedPedal: selectedItem
|
||||||
|
});
|
||||||
}
|
}
|
||||||
onDeletePedal(instanceId: number): void {
|
onDeletePedal(instanceId: number): void {
|
||||||
let result = this.model.deletePedalBoardPedal(instanceId);
|
let result = this.model.deletePedalBoardPedal(instanceId);
|
||||||
|
|||||||
+1
-1
@@ -61,7 +61,7 @@ endif()
|
|||||||
|
|
||||||
|
|
||||||
# specify the C++ standard
|
# specify the C++ standard
|
||||||
set(CMAKE_CXX_STANDARD 17)
|
set(CMAKE_CXX_STANDARD 20)
|
||||||
set(CMAKE_CXX_STANDARD_REQUIRED True)
|
set(CMAKE_CXX_STANDARD_REQUIRED True)
|
||||||
|
|
||||||
set (USE_SANITIZE False)
|
set (USE_SANITIZE False)
|
||||||
|
|||||||
@@ -351,7 +351,6 @@ void InstallJackService()
|
|||||||
// lock account for login.
|
// lock account for login.
|
||||||
silentSysExec("passwd -l " JACK_SERVICE_ACCOUNT_NAME);
|
silentSysExec("passwd -l " JACK_SERVICE_ACCOUNT_NAME);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add to audio groups.
|
// Add to audio groups.
|
||||||
// sysExec(USERMOD_BIN " -a -G " JACK_SERVICE_GROUP_NAME " " JACK_SERVICE_ACCOUNT_NAME);
|
// sysExec(USERMOD_BIN " -a -G " JACK_SERVICE_GROUP_NAME " " JACK_SERVICE_ACCOUNT_NAME);
|
||||||
sysExec(USERMOD_BIN " -a -G" AUDIO_SERVICE_GROUP_NAME " " JACK_SERVICE_ACCOUNT_NAME);
|
sysExec(USERMOD_BIN " -a -G" AUDIO_SERVICE_GROUP_NAME " " JACK_SERVICE_ACCOUNT_NAME);
|
||||||
|
|||||||
Reference in New Issue
Block a user