Skip to content

Commit 56b05fd

Browse files
XeroxDevXeroxDev
authored
feat!: migration to v6 (#24)
1 parent 394abc0 commit 56b05fd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+368
-528
lines changed

‎.cz.toml

-8
This file was deleted.

‎.github/workflows/draft-release.yml

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Draft Release
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
8+
permissions:
9+
contents: write
10+
pull-requests: write
11+
12+
jobs:
13+
draft-release:
14+
if: "!endsWith(github.event.head_commit.message, '[skip-ci]')"
15+
runs-on: windows-latest
16+
steps:
17+
- name: Check out Git repository
18+
uses: actions/checkout@v4
19+
with:
20+
path: './'
21+
fetch-depth: 0
22+
- name: release-please
23+
uses: googleapis/release-please-action@v4
24+
id: release
25+
with:
26+
target-branch: main

‎.github/workflows/release.yml

-32
This file was deleted.

‎.release-please-manifest.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
".": "3.0.0"
3+
}

‎README.md

+4-7
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,8 @@ You can also join my discord [here](https://s.tswi.me/discord)
4242

4343
# 6. How to contribute?
4444

45-
Just fork the repository and create PR's, but we use
46-
[commitizen](https://commitizen-tools.github.io/commitizen/) to optimal release the plugin.
45+
Just fork the repository and create PR's.
4746

48-
[commitizen](https://commitizen-tools.github.io/commitizen/) is following the [conventionalcommits](https://www.conventionalcommits.org) specification which follows
49-
the
50-
[angular commit guidelines](https://github.com/angular/angular/blob/22b96b9/CONTRIBUTING.md#-commit-message-guidelines)
51-
52-
[Here](https://kapeli.com/cheat_sheets/Conventional_Commits.docset/Contents/Resources/Documents/index) is a neat little cheatsheet for Conventional Commits
47+
> [!NOTE]
48+
> We're using [release-please](https://github.com/googleapis/release-please) to optimal release the library.
49+
> release-please is following the [conventionalcommits](https://www.conventionalcommits.org) specification.

‎release-please-config.json

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"packages": {
3+
".": {
4+
"package-name": "VoiceMeeterPlugin",
5+
"component": "VoiceMeeterPlugin",
6+
"changelog-path": "CHANGELOG.md",
7+
"release-type": "simple",
8+
"draft": true,
9+
"prerelease": false,
10+
"include-component-in-tag": false,
11+
"extra-files": [
12+
"src/VoiceMeeterPlugin/VoiceMeeterPlugin.csproj"
13+
]
14+
}
15+
},
16+
"$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json"
17+
}

‎src/Directory.Build.props

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<Project>
22
<PropertyGroup>
3-
<LangVersion>7.3</LangVersion>
3+
<LangVersion>latest</LangVersion>
4+
<BaseIntermediateOutputPath>$(SolutionDir)..\obj\</BaseIntermediateOutputPath>
5+
<BaseOutputPath>$(SolutionDir)..\bin\</BaseOutputPath>
46
</PropertyGroup>
57
</Project>

‎src/VoiceMeeterPlugin.sln

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.30128.74
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.8.34408.163
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VoiceMeeterPlugin", "VoiceMeeterPlugin\VoiceMeeterPlugin.csproj", "{49198B36-9914-4CEA-99C5-7A3858739650}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VoiceMeeterPlugin", "VoiceMeeterPlugin\VoiceMeeterPlugin.csproj", "{CAB60883-9DB0-4C86-817C-A9F5E8B7389B}"
77
EndProject
88
Global
99
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1010
Debug|Any CPU = Debug|Any CPU
1111
Release|Any CPU = Release|Any CPU
1212
EndGlobalSection
1313
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14-
{49198B36-9914-4CEA-99C5-7A3858739650}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15-
{49198B36-9914-4CEA-99C5-7A3858739650}.Debug|Any CPU.Build.0 = Debug|Any CPU
16-
{49198B36-9914-4CEA-99C5-7A3858739650}.Release|Any CPU.ActiveCfg = Release|Any CPU
17-
{49198B36-9914-4CEA-99C5-7A3858739650}.Release|Any CPU.Build.0 = Release|Any CPU
14+
{CAB60883-9DB0-4C86-817C-A9F5E8B7389B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15+
{CAB60883-9DB0-4C86-817C-A9F5E8B7389B}.Debug|Any CPU.Build.0 = Debug|Any CPU
16+
{CAB60883-9DB0-4C86-817C-A9F5E8B7389B}.Release|Any CPU.ActiveCfg = Release|Any CPU
17+
{CAB60883-9DB0-4C86-817C-A9F5E8B7389B}.Release|Any CPU.Build.0 = Release|Any CPU
1818
EndGlobalSection
1919
GlobalSection(SolutionProperties) = preSolution
2020
HideSolutionNode = FALSE
2121
EndGlobalSection
2222
GlobalSection(ExtensibilityGlobals) = postSolution
23-
SolutionGuid = {ED803F16-9A0F-4AB9-A35F-E4CF13557060}
23+
SolutionGuid = {0E15B716-1D2C-45CB-B731-E5A3A4741D44}
2424
EndGlobalSection
2525
EndGlobal

‎src/VoiceMeeterPlugin/Actions/Bases/BooleanBaseCommand.cs

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
namespace Loupedeck.VoiceMeeterPlugin.Actions.Bases
22
{
3-
using System;
4-
using System.Collections.Generic;
53
using System.Reactive.Linq;
64
using System.Reactive.Subjects;
7-
using System.Threading.Tasks;
85

96
using Extensions;
107

11-
using Helper;
8+
using Helpers;
129

1310
using Library.Voicemeeter;
1411

@@ -24,11 +21,11 @@ private enum VMStates
2421
On
2522
}
2623

27-
private Dictionary<Int32, Boolean[]> Actions { get; } = new Dictionary<Int32, Boolean[]>();
24+
private Dictionary<Int32, Boolean[]> Actions { get; } = new();
2825
private VoiceMeeterService VmService { get; }
2926
private Boolean IsMultiAction { get; set; }
3027
private String Command { get; set; }
31-
private Subject<Boolean> OnDestroy { get; } = new Subject<Boolean>();
28+
private Subject<Boolean> OnDestroy { get; } = new();
3229
public Boolean IsRealClass { get; set; }
3330
private Boolean IsStrip { get; }
3431
private Int32 Offset { get; set; }
@@ -230,7 +227,7 @@ protected override BitmapImage GetCommandImage(String actionParameter, Int32 sta
230227
return null;
231228
}
232229

233-
this.GetButton(actionParameter, out var mainIndex, out var action, out var actionIndex);
230+
this.GetButton(actionParameter, out var mainIndex, out var action, out _);
234231

235232
if (mainIndex == -1 || action == -1)
236233
{

‎src/VoiceMeeterPlugin/Actions/Bases/SingleBaseAdjustment.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
namespace Loupedeck.VoiceMeeterPlugin.Actions.Bases
22
{
3-
using System;
43
using System.Reactive.Linq;
54
using System.Reactive.Subjects;
6-
using System.Threading.Tasks;
75

86
using Extensions;
97

10-
using Helper;
8+
using Helpers;
9+
1110
using Library.Voicemeeter;
11+
1212
using Services;
1313

1414
public class SingleBaseAdjustment : PluginDynamicAdjustment
1515
{
1616
private AdjustmentItem[] Actions { get; set; }
1717
private VoiceMeeterService VmService { get; }
1818
private String Command { get; set; }
19-
private Subject<Boolean> OnDestroy { get; } = new Subject<Boolean>();
19+
private Subject<Boolean> OnDestroy { get; } = new();
2020
private Int32 Offset { get; set; }
2121
private Boolean IsStrip { get; }
2222
private Int32 MaxValue { get; }

‎src/VoiceMeeterPlugin/Actions/Bases/SingleBaseCommand.cs

+5-13
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,12 @@
11
namespace Loupedeck.VoiceMeeterPlugin.Actions.Bases
22
{
3-
using System;
3+
using Helpers;
44

5-
using Helper;
6-
7-
public class SingleBaseCommand : PluginDynamicCommand
5+
public class SingleBaseCommand(String actionName, String description, String groupName, Action action)
6+
: PluginDynamicCommand(actionName, description, groupName)
87
{
9-
private String ActionName { get; }
10-
private Action Action { get; }
11-
12-
public SingleBaseCommand(String actionName, String description, String groupName, Action action) : base(
13-
actionName, description, groupName)
14-
{
15-
this.ActionName = actionName;
16-
this.Action = action;
17-
}
8+
private String ActionName { get; } = actionName;
9+
private Action Action { get; } = action;
1810

1911
protected override BitmapImage GetCommandImage(String actionParameter, PluginImageSize imageSize)
2012
=> DrawingHelper.DrawDefaultImage(this.ActionName, "", ColorHelper.Inactive);

‎src/VoiceMeeterPlugin/Actions/BusEQCommand.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
using Bases;
44

5-
using Helper;
5+
using Helpers;
66

77
public class BusEqCommand : BooleanBaseCommand
88
{

‎src/VoiceMeeterPlugin/Actions/BusGainAdjustment.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
using Bases;
44

5-
using Helper;
5+
using Helpers;
66

77
public class BusGainAdjustment : SingleBaseAdjustment
88
{

‎src/VoiceMeeterPlugin/Actions/BusMonoCommand.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
using Bases;
44

5-
using Helper;
5+
using Helpers;
66

77
public class BusMonoCommand : BooleanBaseCommand
88
{

‎src/VoiceMeeterPlugin/Actions/BusMuteCommand.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
using Bases;
44

5-
using Helper;
5+
using Helpers;
66

77
public class BusMuteCommand : BooleanBaseCommand
88
{

‎src/VoiceMeeterPlugin/Actions/BusSelCommand.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace Loupedeck.VoiceMeeterPlugin.Actions
2424
{
2525
using Bases;
2626

27-
using Helper;
27+
using Helpers;
2828

2929
public class BusSelCommand : BooleanBaseCommand
3030
{

‎src/VoiceMeeterPlugin/Actions/HardwareInputCompAdjustment.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
using Bases;
44

5-
using Helper;
5+
using Helpers;
66

77
public class HardwareInputCompAdjustment : SingleBaseAdjustment
88
{

‎src/VoiceMeeterPlugin/Actions/HardwareInputDelayAdjustment.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
{
33
using Bases;
44

5-
using Helper;
5+
using Helpers;
6+
67
using Library.Voicemeeter;
78

89
public class HardwareInputDelayAdjustment : SingleBaseAdjustment

‎src/VoiceMeeterPlugin/Actions/HardwareInputFxAdjustment.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
{
33
using Bases;
44

5-
using Helper;
5+
using Helpers;
6+
67
using Library.Voicemeeter;
78

89
public class HardwareInputFx1Adjustment : SingleBaseAdjustment

‎src/VoiceMeeterPlugin/Actions/HardwareInputGateAdjustment.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
using Bases;
44

5-
using Helper;
5+
using Helpers;
66

77
public class HardwareInputGateAdjustment : SingleBaseAdjustment
88
{

‎src/VoiceMeeterPlugin/Actions/HardwareInputMonoCommand.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
using Bases;
44

5-
using Helper;
5+
using Helpers;
66

77
public class HardwareInputMonoCommand : BooleanBaseCommand
88
{

‎src/VoiceMeeterPlugin/Actions/HardwareInputPostDelayCommand.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
{
33
using Bases;
44

5-
using Helper;
5+
using Helpers;
6+
67
using Library.Voicemeeter;
78

89
public class HardwareInputPostDelayCommand : BooleanBaseCommand

‎src/VoiceMeeterPlugin/Actions/HardwareInputPostFxCommand.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
{
33
using Bases;
44

5-
using Helper;
5+
using Helpers;
6+
67
using Library.Voicemeeter;
78

89
public class HardwareInputPostFx1Command : BooleanBaseCommand

‎src/VoiceMeeterPlugin/Actions/HardwareInputPostReverbCommand.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
{
33
using Bases;
44

5-
using Helper;
5+
using Helpers;
6+
67
using Library.Voicemeeter;
78

89
public class HardwareInputPostReverbCommand : BooleanBaseCommand

‎src/VoiceMeeterPlugin/Actions/HardwareInputReverbAdjustment.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
{
33
using Bases;
44

5-
using Helper;
5+
using Helpers;
6+
67
using Library.Voicemeeter;
78

89
public class HardwareInputReverbAdjustment : SingleBaseAdjustment

‎src/VoiceMeeterPlugin/Actions/LoadCommand.cs

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
11
namespace Loupedeck.VoiceMeeterPlugin.Actions
22
{
3-
using System;
4-
using System.IO;
3+
using Helpers;
54

6-
using Helper;
75
using Library.Voicemeeter;
86

97
public class LoadCommand : PluginDynamicCommand
108
{
11-
public LoadCommand() : base("Load", "Load settings", "Special")
12-
{
13-
this.MakeProfileAction("text;Path:");
14-
}
9+
public LoadCommand() : base("Load", "Load settings", "Special") => this.MakeProfileAction("text;Path:");
1510

1611
protected override BitmapImage GetCommandImage(String actionParameter, PluginImageSize imageSize)
1712
=> DrawingHelper.DrawDefaultImage("Load", Path.GetFileNameWithoutExtension(actionParameter) ?? "", ColorHelper.Inactive);

0 commit comments

Comments
 (0)