Skip to content

Commit

Permalink
feat!: migration to v6 (#24)
Browse files Browse the repository at this point in the history
  • Loading branch information
XeroxDev authored Sep 21, 2024
1 parent 394abc0 commit 56b05fd
Show file tree
Hide file tree
Showing 64 changed files with 368 additions and 528 deletions.
8 changes: 0 additions & 8 deletions .cz.toml

This file was deleted.

26 changes: 26 additions & 0 deletions .github/workflows/draft-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Draft Release

on:
push:
branches:
- main

permissions:
contents: write
pull-requests: write

jobs:
draft-release:
if: "!endsWith(github.event.head_commit.message, '[skip-ci]')"
runs-on: windows-latest
steps:
- name: Check out Git repository
uses: actions/checkout@v4
with:
path: './'
fetch-depth: 0
- name: release-please
uses: googleapis/release-please-action@v4
id: release
with:
target-branch: main
32 changes: 0 additions & 32 deletions .github/workflows/release.yml

This file was deleted.

3 changes: 3 additions & 0 deletions .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
".": "3.0.0"
}
11 changes: 4 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,8 @@ You can also join my discord [here](https://s.tswi.me/discord)

# 6. How to contribute?

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

[commitizen](https://commitizen-tools.github.io/commitizen/) is following the [conventionalcommits](https://www.conventionalcommits.org) specification which follows
the
[angular commit guidelines](https://github.com/angular/angular/blob/22b96b9/CONTRIBUTING.md#-commit-message-guidelines)

[Here](https://kapeli.com/cheat_sheets/Conventional_Commits.docset/Contents/Resources/Documents/index) is a neat little cheatsheet for Conventional Commits
> [!NOTE]
> We're using [release-please](https://github.com/googleapis/release-please) to optimal release the library.
> release-please is following the [conventionalcommits](https://www.conventionalcommits.org) specification.
17 changes: 17 additions & 0 deletions release-please-config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"packages": {
".": {
"package-name": "VoiceMeeterPlugin",
"component": "VoiceMeeterPlugin",
"changelog-path": "CHANGELOG.md",
"release-type": "simple",
"draft": true,
"prerelease": false,
"include-component-in-tag": false,
"extra-files": [
"src/VoiceMeeterPlugin/VoiceMeeterPlugin.csproj"
]
}
},
"$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json"
}
4 changes: 3 additions & 1 deletion src/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<Project>
<PropertyGroup>
<LangVersion>7.3</LangVersion>
<LangVersion>latest</LangVersion>
<BaseIntermediateOutputPath>$(SolutionDir)..\obj\</BaseIntermediateOutputPath>
<BaseOutputPath>$(SolutionDir)..\bin\</BaseOutputPath>
</PropertyGroup>
</Project>
16 changes: 8 additions & 8 deletions src/VoiceMeeterPlugin.sln
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30128.74
# Visual Studio Version 17
VisualStudioVersion = 17.8.34408.163
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VoiceMeeterPlugin", "VoiceMeeterPlugin\VoiceMeeterPlugin.csproj", "{49198B36-9914-4CEA-99C5-7A3858739650}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VoiceMeeterPlugin", "VoiceMeeterPlugin\VoiceMeeterPlugin.csproj", "{CAB60883-9DB0-4C86-817C-A9F5E8B7389B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{49198B36-9914-4CEA-99C5-7A3858739650}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{49198B36-9914-4CEA-99C5-7A3858739650}.Debug|Any CPU.Build.0 = Debug|Any CPU
{49198B36-9914-4CEA-99C5-7A3858739650}.Release|Any CPU.ActiveCfg = Release|Any CPU
{49198B36-9914-4CEA-99C5-7A3858739650}.Release|Any CPU.Build.0 = Release|Any CPU
{CAB60883-9DB0-4C86-817C-A9F5E8B7389B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CAB60883-9DB0-4C86-817C-A9F5E8B7389B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CAB60883-9DB0-4C86-817C-A9F5E8B7389B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CAB60883-9DB0-4C86-817C-A9F5E8B7389B}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {ED803F16-9A0F-4AB9-A35F-E4CF13557060}
SolutionGuid = {0E15B716-1D2C-45CB-B731-E5A3A4741D44}
EndGlobalSection
EndGlobal
11 changes: 4 additions & 7 deletions src/VoiceMeeterPlugin/Actions/Bases/BooleanBaseCommand.cs
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
namespace Loupedeck.VoiceMeeterPlugin.Actions.Bases
{
using System;
using System.Collections.Generic;
using System.Reactive.Linq;
using System.Reactive.Subjects;
using System.Threading.Tasks;

using Extensions;

using Helper;
using Helpers;

using Library.Voicemeeter;

Expand All @@ -24,11 +21,11 @@ private enum VMStates
On
}

private Dictionary<Int32, Boolean[]> Actions { get; } = new Dictionary<Int32, Boolean[]>();
private Dictionary<Int32, Boolean[]> Actions { get; } = new();
private VoiceMeeterService VmService { get; }
private Boolean IsMultiAction { get; set; }
private String Command { get; set; }
private Subject<Boolean> OnDestroy { get; } = new Subject<Boolean>();
private Subject<Boolean> OnDestroy { get; } = new();
public Boolean IsRealClass { get; set; }
private Boolean IsStrip { get; }
private Int32 Offset { get; set; }
Expand Down Expand Up @@ -230,7 +227,7 @@ protected override BitmapImage GetCommandImage(String actionParameter, Int32 sta
return null;
}

this.GetButton(actionParameter, out var mainIndex, out var action, out var actionIndex);
this.GetButton(actionParameter, out var mainIndex, out var action, out _);

if (mainIndex == -1 || action == -1)
{
Expand Down
8 changes: 4 additions & 4 deletions src/VoiceMeeterPlugin/Actions/Bases/SingleBaseAdjustment.cs
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
namespace Loupedeck.VoiceMeeterPlugin.Actions.Bases
{
using System;
using System.Reactive.Linq;
using System.Reactive.Subjects;
using System.Threading.Tasks;

using Extensions;

using Helper;
using Helpers;

using Library.Voicemeeter;

using Services;

public class SingleBaseAdjustment : PluginDynamicAdjustment
{
private AdjustmentItem[] Actions { get; set; }
private VoiceMeeterService VmService { get; }
private String Command { get; set; }
private Subject<Boolean> OnDestroy { get; } = new Subject<Boolean>();
private Subject<Boolean> OnDestroy { get; } = new();
private Int32 Offset { get; set; }
private Boolean IsStrip { get; }
private Int32 MaxValue { get; }
Expand Down
18 changes: 5 additions & 13 deletions src/VoiceMeeterPlugin/Actions/Bases/SingleBaseCommand.cs
Original file line number Diff line number Diff line change
@@ -1,20 +1,12 @@
namespace Loupedeck.VoiceMeeterPlugin.Actions.Bases
{
using System;
using Helpers;

using Helper;

public class SingleBaseCommand : PluginDynamicCommand
public class SingleBaseCommand(String actionName, String description, String groupName, Action action)
: PluginDynamicCommand(actionName, description, groupName)
{
private String ActionName { get; }
private Action Action { get; }

public SingleBaseCommand(String actionName, String description, String groupName, Action action) : base(
actionName, description, groupName)
{
this.ActionName = actionName;
this.Action = action;
}
private String ActionName { get; } = actionName;
private Action Action { get; } = action;

protected override BitmapImage GetCommandImage(String actionParameter, PluginImageSize imageSize)
=> DrawingHelper.DrawDefaultImage(this.ActionName, "", ColorHelper.Inactive);
Expand Down
2 changes: 1 addition & 1 deletion src/VoiceMeeterPlugin/Actions/BusEQCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
using Bases;

using Helper;
using Helpers;

public class BusEqCommand : BooleanBaseCommand
{
Expand Down
2 changes: 1 addition & 1 deletion src/VoiceMeeterPlugin/Actions/BusGainAdjustment.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
using Bases;

using Helper;
using Helpers;

public class BusGainAdjustment : SingleBaseAdjustment
{
Expand Down
2 changes: 1 addition & 1 deletion src/VoiceMeeterPlugin/Actions/BusMonoCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
using Bases;

using Helper;
using Helpers;

public class BusMonoCommand : BooleanBaseCommand
{
Expand Down
2 changes: 1 addition & 1 deletion src/VoiceMeeterPlugin/Actions/BusMuteCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
using Bases;

using Helper;
using Helpers;

public class BusMuteCommand : BooleanBaseCommand
{
Expand Down
2 changes: 1 addition & 1 deletion src/VoiceMeeterPlugin/Actions/BusSelCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ namespace Loupedeck.VoiceMeeterPlugin.Actions
{
using Bases;

using Helper;
using Helpers;

public class BusSelCommand : BooleanBaseCommand
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
using Bases;

using Helper;
using Helpers;

public class HardwareInputCompAdjustment : SingleBaseAdjustment
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
{
using Bases;

using Helper;
using Helpers;

using Library.Voicemeeter;

public class HardwareInputDelayAdjustment : SingleBaseAdjustment
Expand Down
3 changes: 2 additions & 1 deletion src/VoiceMeeterPlugin/Actions/HardwareInputFxAdjustment.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
{
using Bases;

using Helper;
using Helpers;

using Library.Voicemeeter;

public class HardwareInputFx1Adjustment : SingleBaseAdjustment
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
using Bases;

using Helper;
using Helpers;

public class HardwareInputGateAdjustment : SingleBaseAdjustment
{
Expand Down
2 changes: 1 addition & 1 deletion src/VoiceMeeterPlugin/Actions/HardwareInputMonoCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
using Bases;

using Helper;
using Helpers;

public class HardwareInputMonoCommand : BooleanBaseCommand
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
{
using Bases;

using Helper;
using Helpers;

using Library.Voicemeeter;

public class HardwareInputPostDelayCommand : BooleanBaseCommand
Expand Down
3 changes: 2 additions & 1 deletion src/VoiceMeeterPlugin/Actions/HardwareInputPostFxCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
{
using Bases;

using Helper;
using Helpers;

using Library.Voicemeeter;

public class HardwareInputPostFx1Command : BooleanBaseCommand
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
{
using Bases;

using Helper;
using Helpers;

using Library.Voicemeeter;

public class HardwareInputPostReverbCommand : BooleanBaseCommand
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
{
using Bases;

using Helper;
using Helpers;

using Library.Voicemeeter;

public class HardwareInputReverbAdjustment : SingleBaseAdjustment
Expand Down
9 changes: 2 additions & 7 deletions src/VoiceMeeterPlugin/Actions/LoadCommand.cs
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
namespace Loupedeck.VoiceMeeterPlugin.Actions
{
using System;
using System.IO;
using Helpers;

using Helper;
using Library.Voicemeeter;

public class LoadCommand : PluginDynamicCommand
{
public LoadCommand() : base("Load", "Load settings", "Special")
{
this.MakeProfileAction("text;Path:");
}
public LoadCommand() : base("Load", "Load settings", "Special") => this.MakeProfileAction("text;Path:");

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

0 comments on commit 56b05fd

Please sign in to comment.