Skip to content

Commit 4650556

Browse files
flop-syflop-sy
authored
Merge branch 'Meowchestra:main' into main
2 parents 0e54c41 + 4a5de20 commit 4650556

File tree

177 files changed

+27315
-16883
lines changed

Some content is hidden

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

177 files changed

+27315
-16883
lines changed

‎BardMusicPlayer.Coffer/BardMusicPlayer.Coffer.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</PropertyGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="LiteDB" Version="5.0.13"/>
22+
<PackageReference Include="LiteDB" Version="5.0.15"/>
2323
</ItemGroup>
2424

2525
<ItemGroup>

‎BardMusicPlayer.DalamudBridge/BardMusicPlayer.DalamudBridge.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
</PropertyGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="H.Formatters.Newtonsoft.Json" Version="12.0.42"/>
22-
<PackageReference Include="H.Pipes" Version="2.0.42"/>
23-
<PackageReference Include="H.Pipes.AccessControl" Version="2.0.42"/>
21+
<PackageReference Include="H.Formatters.Newtonsoft.Json" Version="13.0.43"/>
22+
<PackageReference Include="H.Pipes" Version="2.0.43"/>
23+
<PackageReference Include="H.Pipes.AccessControl" Version="2.0.43"/>
2424
<PackageReference Include="Newtonsoft.Json" Version="13.0.2"/>
2525
</ItemGroup>
2626

‎BardMusicPlayer.Grunt/BardMusicPlayer.Grunt.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</PropertyGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="H.Pipes" Version="2.0.42"/>
22-
<PackageReference Include="H.Pipes.AccessControl" Version="2.0.42"/>
21+
<PackageReference Include="H.Pipes" Version="2.0.43"/>
22+
<PackageReference Include="H.Pipes.AccessControl" Version="2.0.43"/>
2323
</ItemGroup>
2424

2525
<ItemGroup>

‎BardMusicPlayer.Grunt/GameExtensions.Instrument.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public static bool EquipInstrumentSync(this Game game, Instrument instrumentWant
6161
/// <param name="game"></param>
6262
/// <param name="instrumentToneWanted"></param>
6363
/// <returns></returns>
64-
public static async Task<bool> EquipTone(this Game game, InstrumentTone instrumentToneWanted)
64+
/*public static async Task<bool> EquipTone(this Game game, InstrumentTone instrumentToneWanted)
6565
{
6666
if (!BmpGrunt.Instance.Started) throw new BmpGruntException("Grunt not started.");
6767
@@ -86,5 +86,5 @@ public static async Task<bool> EquipTone(this Game game, InstrumentTone instrume
8686
}
8787
8888
return Game.InstrumentToneHeld.Equals(instrumentToneWanted);
89-
}
89+
}*/
9090
}

‎BardMusicPlayer.Maestro/BmpMaestro.cs

+13-1
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,18 @@ public void SetSpeedShift(Performer p, float percentage)
171171
_orchestrator?.SetSpeedshift(p, percentage);
172172
}
173173

174+
/// <summary>
175+
/// sets the speed for bard
176+
/// </summary>
177+
public void SetSpeedShiftAll(float percentage)
178+
{
179+
if (_orchestrator == null)
180+
return;
181+
182+
var performers = _orchestrator.GetAllPerformers();
183+
Parallel.ForEach(performers, perf => { _orchestrator.SetSpeedshift(perf, percentage); });
184+
}
185+
174186
/// <summary>
175187
/// sets the speed for host performer
176188
/// </summary>
@@ -299,7 +311,7 @@ public void StartEnsCheck()
299311
return;
300312

301313
var perf = _orchestrator.GetAllPerformers();
302-
foreach (var p in perf.Where(static p => p.HostProcess))
314+
foreach (var p in perf)
303315
p.DoReadyCheck();
304316
}
305317

‎BardMusicPlayer.MidiUtil/BardMusicPlayer.MidiUtil.csproj

+185
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,185 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<ProjectGuid>{692EBA77-D80C-4E74-AF9D-FB74FB8BAD78}</ProjectGuid>
8+
<OutputType>Library</OutputType>
9+
<RootNamespace>BardMusicPlayer.MidiUtil</RootNamespace>
10+
<AssemblyName>BardMusicPlayer.MidiUtil</AssemblyName>
11+
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
12+
<FileAlignment>512</FileAlignment>
13+
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
14+
<WarningLevel>4</WarningLevel>
15+
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
16+
<Deterministic>true</Deterministic>
17+
<NuGetPackageImportStamp>
18+
</NuGetPackageImportStamp>
19+
</PropertyGroup>
20+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
21+
<PlatformTarget>x64</PlatformTarget>
22+
<DebugSymbols>true</DebugSymbols>
23+
<DebugType>full</DebugType>
24+
<Optimize>false</Optimize>
25+
<OutputPath>bin\Debug\</OutputPath>
26+
<DefineConstants>DEBUG;TRACE</DefineConstants>
27+
<ErrorReport>prompt</ErrorReport>
28+
<WarningLevel>4</WarningLevel>
29+
</PropertyGroup>
30+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
31+
<PlatformTarget>x64</PlatformTarget>
32+
<DebugType>pdbonly</DebugType>
33+
<Optimize>true</Optimize>
34+
<OutputPath>bin\Release\</OutputPath>
35+
<DefineConstants>TRACE</DefineConstants>
36+
<ErrorReport>prompt</ErrorReport>
37+
<WarningLevel>4</WarningLevel>
38+
</PropertyGroup>
39+
<PropertyGroup>
40+
<StartupObject />
41+
</PropertyGroup>
42+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
43+
<DebugSymbols>true</DebugSymbols>
44+
<OutputPath>bin\x64\Debug\</OutputPath>
45+
<DefineConstants>DEBUG;TRACE</DefineConstants>
46+
<DebugType>full</DebugType>
47+
<PlatformTarget>x64</PlatformTarget>
48+
<LangVersion>7.3</LangVersion>
49+
<ErrorReport>prompt</ErrorReport>
50+
</PropertyGroup>
51+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
52+
<OutputPath>bin\x64\Release\</OutputPath>
53+
<DefineConstants>TRACE</DefineConstants>
54+
<Optimize>true</Optimize>
55+
<DebugType>pdbonly</DebugType>
56+
<PlatformTarget>x64</PlatformTarget>
57+
<LangVersion>7.3</LangVersion>
58+
<ErrorReport>prompt</ErrorReport>
59+
</PropertyGroup>
60+
<ItemGroup>
61+
<Reference Include="Melanchall.DryWetMidi, Version=6.0.1.0, Culture=neutral, PublicKeyToken=83d0ffad275219ad, processorArchitecture=MSIL">
62+
<HintPath>..\packages\Melanchall.DryWetMidi.6.0.1\lib\net45\Melanchall.DryWetMidi.dll</HintPath>
63+
</Reference>
64+
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
65+
<HintPath>..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
66+
</Reference>
67+
<Reference Include="System" />
68+
<Reference Include="System.ComponentModel.Composition" />
69+
<Reference Include="System.Data" />
70+
<Reference Include="System.Runtime, Version=4.1.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
71+
<HintPath>..\packages\System.Runtime.4.3.1\lib\net462\System.Runtime.dll</HintPath>
72+
<Private>True</Private>
73+
<Private>True</Private>
74+
</Reference>
75+
<Reference Include="System.Xml" />
76+
<Reference Include="Microsoft.CSharp" />
77+
<Reference Include="System.Core" />
78+
<Reference Include="System.Xml.Linq" />
79+
<Reference Include="System.Data.DataSetExtensions" />
80+
<Reference Include="System.Net.Http" />
81+
<Reference Include="System.Xaml">
82+
<RequiredTargetFramework>4.0</RequiredTargetFramework>
83+
</Reference>
84+
<Reference Include="WindowsBase" />
85+
<Reference Include="PresentationCore" />
86+
<Reference Include="PresentationFramework" />
87+
</ItemGroup>
88+
<ItemGroup>
89+
<Compile Include="MidiUtil.cs" />
90+
<Compile Include="Managers\MidiFunctions\MidiSongFunctions.cs" />
91+
<Compile Include="Managers\MidiFunctions\MidiTrackFunctions.cs" />
92+
<Compile Include="Managers\MidiManager.cs" />
93+
<Compile Include="Managers\UiManager.cs" />
94+
<Compile Include="Properties\AssemblyInfo.cs">
95+
<SubType>Code</SubType>
96+
</Compile>
97+
<Compile Include="Properties\Resources.Designer.cs">
98+
<AutoGen>True</AutoGen>
99+
<DesignTime>True</DesignTime>
100+
<DependentUpon>Resources.resx</DependentUpon>
101+
</Compile>
102+
<Compile Include="Properties\Settings.Designer.cs">
103+
<AutoGen>True</AutoGen>
104+
<DependentUpon>Settings.settings</DependentUpon>
105+
<DesignTimeSharedInput>True</DesignTimeSharedInput>
106+
</Compile>
107+
<Compile Include="Ui\Control.cs" />
108+
<Compile Include="Ui\MidiEditWindow.xaml.cs">
109+
<DependentUpon>MidiEditWindow.xaml</DependentUpon>
110+
</Compile>
111+
<Compile Include="Ui\Model.cs" />
112+
<Compile Include="Ui\TextInputWindow.xaml.cs">
113+
<DependentUpon>TextInputWindow.xaml</DependentUpon>
114+
</Compile>
115+
<Compile Include="Ui\TrackLine\MidiLineControl.cs" />
116+
<Compile Include="Ui\TrackLine\MidiLineModel.cs" />
117+
<Compile Include="Ui\TrackLine\MidiLineView.xaml.cs">
118+
<DependentUpon>MidiLineView.xaml</DependentUpon>
119+
</Compile>
120+
<Compile Include="Ui\TrackView\MidiTrackLineControl.cs" />
121+
<Compile Include="Ui\TrackView\MidiTrackLineModel.cs" />
122+
<Compile Include="Ui\TrackView\MidiTrackLineView.xaml.cs">
123+
<DependentUpon>MidiTrackLineView.xaml</DependentUpon>
124+
</Compile>
125+
<Compile Include="Ui\TrackView\MidiTrackView.xaml.cs">
126+
<DependentUpon>MidiTrackView.xaml</DependentUpon>
127+
</Compile>
128+
<Compile Include="Utils\Converters.cs" />
129+
<Compile Include="Utils\Extension.cs" />
130+
<Compile Include="Utils\HandleBinding.cs" />
131+
<EmbeddedResource Include="Properties\Resources.resx">
132+
<Generator>ResXFileCodeGenerator</Generator>
133+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
134+
</EmbeddedResource>
135+
<None Include="packages.config" />
136+
<None Include="Properties\Settings.settings">
137+
<Generator>SettingsSingleFileGenerator</Generator>
138+
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
139+
</None>
140+
</ItemGroup>
141+
<ItemGroup>
142+
<Page Include="Ui\MidiEditWindow.xaml">
143+
<Generator>MSBuild:Compile</Generator>
144+
<SubType>Designer</SubType>
145+
</Page>
146+
<Page Include="Ui\TextInputWindow.xaml">
147+
<Generator>MSBuild:Compile</Generator>
148+
<SubType>Designer</SubType>
149+
</Page>
150+
<Page Include="Ui\TrackLine\MidiLineView.xaml">
151+
<Generator>MSBuild:Compile</Generator>
152+
<SubType>Designer</SubType>
153+
</Page>
154+
<Page Include="Ui\TrackView\MidiTrackLineView.xaml">
155+
<Generator>MSBuild:Compile</Generator>
156+
<SubType>Designer</SubType>
157+
</Page>
158+
<Page Include="Ui\TrackView\MidiTrackView.xaml">
159+
<Generator>MSBuild:Compile</Generator>
160+
<SubType>Designer</SubType>
161+
</Page>
162+
</ItemGroup>
163+
<ItemGroup>
164+
<ProjectReference Include="..\BardMusicPlayer.Quotidian\BardMusicPlayer.Quotidian.csproj">
165+
<Project>{97070a4a-0a5a-4b67-bc79-d2a2cf9b5b13}</Project>
166+
<Name>BardMusicPlayer.Quotidian</Name>
167+
</ProjectReference>
168+
<ProjectReference Include="..\BardMusicPlayer.Siren\BardMusicPlayer.Siren.csproj">
169+
<Project>{03d848f1-f319-43da-b0f8-e83a19ef3108}</Project>
170+
<Name>BardMusicPlayer.Siren</Name>
171+
</ProjectReference>
172+
<ProjectReference Include="..\BardMusicPlayer.Transmogrify\BardMusicPlayer.Transmogrify.csproj">
173+
<Project>{afb55e52-c439-481e-99f4-0b56c42a6d4b}</Project>
174+
<Name>BardMusicPlayer.Transmogrify</Name>
175+
</ProjectReference>
176+
</ItemGroup>
177+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
178+
<Import Project="..\packages\Melanchall.DryWetMidi.6.0.1\build\Melanchall.DryWetMidi.targets" Condition="Exists('..\packages\Melanchall.DryWetMidi.6.0.1\build\Melanchall.DryWetMidi.targets')" />
179+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
180+
<PropertyGroup>
181+
<ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
182+
</PropertyGroup>
183+
<Error Condition="!Exists('..\packages\Melanchall.DryWetMidi.6.0.1\build\Melanchall.DryWetMidi.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Melanchall.DryWetMidi.6.0.1\build\Melanchall.DryWetMidi.targets'))" />
184+
</Target>
185+
</Project>

0 commit comments

Comments
 (0)