Skip to content
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.

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

krn1pnc:master #75

Closed
wants to merge 89 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
e57d550
Modified to allow individual selection of UFDATA files
rokujyushi Jun 14, 2024
ea1df9f
Fix null priority+replace bugs & remove old MsToTickAt code
lottev1991 Jun 21, 2024
0ab8a2b
Some null fixes
lottev1991 Jun 21, 2024
5ed92f9
Rerun tests
lottev1991 Jun 21, 2024
47521d5
Fix [CV] validation
Cadlaxa Jun 22, 2024
7002bd3
Fix several bugs + Add dark L vowels
lottev1991 Jun 27, 2024
34a0bfe
Fixes
lottev1991 Jun 28, 2024
d8dba7f
Dark L vowel boolean fix
lottev1991 Jun 28, 2024
0da8b79
Add Thai VCCV Phonemizer
printto Jul 2, 2024
135e59e
Update fix Thai VCCV tailing -
printto Jul 2, 2024
e22f33c
Update Thai VCCV Phonemizer and fix filename type
printto Jul 2, 2024
3f8e4c0
Update ThaiVCCVPhonemizer
printto Jul 2, 2024
9cdf4bf
update g2p
wolfgitpr Jul 6, 2024
ab3647e
Small phoneme fix
lottev1991 Jul 6, 2024
048c11d
reset g2p data
wolfgitpr Jul 7, 2024
beb064d
fix g2p data
wolfgitpr Jul 7, 2024
ed3267b
Another phoneme fix
lottev1991 Jul 7, 2024
e144d24
Apply Korean sandhi rules to Korean UTAU phonemizers
lottev1991 Jul 10, 2024
d98661d
Rerun checks
lottev1991 Jul 10, 2024
2d3141b
Rerun checks
lottev1991 Jul 10, 2024
5880ab8
Okay please work this isn't funny anymore Linux
lottev1991 Jul 10, 2024
11fc521
Rerun checks
lottev1991 Jul 10, 2024
56102ee
Rerun checks
lottev1991 Jul 10, 2024
4098f7a
Update ThaiVCCVPhonemizer add Thai characters support
printto Jul 10, 2024
a567016
Fix diphthong bug
printto Jul 10, 2024
548f936
Fix [CV] and [C V] validation when there's a [CCV]
Cadlaxa Jul 14, 2024
73ae975
Update vvExceptions to include two letter R-colored vowels
Cadlaxa Jul 20, 2024
c75980f
Merge branch 'master' into th-phonemizer
printto Jul 23, 2024
3b8571d
Merge branch 'stakira:master' into JaG2pFIx
lottev1991 Jul 23, 2024
f5cfae5
Merge branch 'stakira:master' into KoUtauPhonSandhiFix
lottev1991 Jul 24, 2024
2d82f29
update r-colored vowel and l `vvExceptions`
Cadlaxa Jul 24, 2024
3489d7d
Merge branch 'stakira:master' into master
wolfgitpr Jul 24, 2024
c27afe6
Merge branch 'stakira:master' into KoUtauPhonSandhiFix
lottev1991 Jul 24, 2024
ec33600
Merge branch 'stakira:master' into JaG2pFIx
lottev1991 Jul 24, 2024
29fe349
Rerun checks
lottev1991 Jul 24, 2024
97674dc
Rerun checks
lottev1991 Jul 24, 2024
a746e1b
add 'reset all' editing macro
oxygen-dioxide Jul 26, 2024
f2232f2
replaces portaudio with a new backend
stakira Jul 26, 2024
46f573f
deletes portaudio
stakira Jul 26, 2024
4f0f9b8
deletes naudio and cleanup project
stakira Jul 26, 2024
c67bcb7
Merge pull request #1225 from stakira/miniaudio
stakira Jul 26, 2024
2e57074
Merge branch 'stakira:master' into JaG2pFIx
lottev1991 Jul 26, 2024
3757848
Merge branch 'stakira:master' into KoUtauPhonSandhiFix
lottev1991 Jul 26, 2024
b3223e7
Merge branch 'stakira:master' into EnXSampaBugs
lottev1991 Jul 26, 2024
1621d83
Merge branch 'stakira:master' into JaPresampNullPriorityReplaceFix
lottev1991 Jul 26, 2024
26a3f3b
Rerun checks
lottev1991 Jul 26, 2024
60f5837
Rerun checks
lottev1991 Jul 26, 2024
4af34d7
Rerun checks
lottev1991 Jul 27, 2024
af9f1d8
audio fixes
stakira Jul 27, 2024
75d2621
fix yaml race conditions
stakira Jul 27, 2024
8635b90
Merge branch 'stakira:master' into JaG2pFIx
lottev1991 Jul 27, 2024
41f198b
revives naudio
stakira Jul 27, 2024
f7c83af
Merge branch 'stakira:master' into JaPresampNullPriorityReplaceFix
lottev1991 Jul 27, 2024
a3f5ef1
Merge branch 'stakira:master' into EnXSampaBugs
lottev1991 Jul 27, 2024
73a172b
Merge branch 'stakira:master' into KoUtauPhonSandhiFix
lottev1991 Jul 27, 2024
370e326
Merge branch 'stakira:master' into EnXSampaBugs
lottev1991 Jul 27, 2024
be412a7
Merge branch 'stakira:master' into KoUtauPhonSandhiFix
lottev1991 Jul 27, 2024
0b1735f
Merge branch 'stakira:master' into JaPresampNullPriorityReplaceFix
lottev1991 Jul 27, 2024
931e8d1
Merge branch 'stakira:master' into JaG2pFIx
lottev1991 Jul 27, 2024
6958d68
miniaudio fixes
stakira Jul 28, 2024
2e01dba
change the name of this macro to 'Reset notes to default'
oxygen-dioxide Jul 28, 2024
42edc26
Merge branch 'stakira:master' into JaG2pFIx
lottev1991 Jul 28, 2024
99c74e0
Merge branch 'stakira:master' into JaPresampNullPriorityReplaceFix
lottev1991 Jul 28, 2024
7207762
Merge branch 'stakira:master' into KoUtauPhonSandhiFix
lottev1991 Jul 28, 2024
215952b
Merge branch 'stakira:master' into EnXSampaBugs
lottev1991 Jul 28, 2024
fd2799b
Merge branch 'stakira:master' into FixImportTracks
rokujyushi Jul 29, 2024
5dece84
Vowel update
Cadlaxa Aug 2, 2024
240f1c2
removed unnecessary code
Cadlaxa Aug 3, 2024
2981b74
Merge branch 'stakira:master' into master
wolfgitpr Aug 3, 2024
0df94cf
Merge pull request #1227 from rokujyushi/FixImportTracks
stakira Aug 3, 2024
a5b4d3e
Merge pull request #1207 from wolfgitpr/master
stakira Aug 3, 2024
693302d
Merge pull request #1223 from oxygen-dioxide/reset-all
stakira Aug 3, 2024
443ea52
disable appveyor
stakira Aug 3, 2024
69d7ecd
build worldline for old macos versions
stakira Aug 3, 2024
20b67cd
Merge branch 'master' of https://github.com/stakira/OpenUtau into ARP…
Cadlaxa Aug 3, 2024
71fb45e
fixes
Cadlaxa Aug 3, 2024
1b6e333
adds a strings test
stakira Aug 3, 2024
35d2c3f
adds a way to auto selects audio device
stakira Aug 4, 2024
aa21500
build action
stakira Aug 4, 2024
216b291
adds arm64 updater rids
stakira Aug 4, 2024
121872c
Merge pull request #1212 from lottev1991/KoUtauPhonSandhiFix
stakira Aug 4, 2024
08c3bc1
Merge pull request #1208 from lottev1991/JaG2pFIx
stakira Aug 4, 2024
0809c21
Merge pull request #1196 from lottev1991/EnXSampaBugs
stakira Aug 4, 2024
04fd637
Merge pull request #1202 from printto/th-phonemizer
stakira Aug 4, 2024
c4429b3
Merge pull request #1191 from Cadlaxa/cadlaxa-local
stakira Aug 4, 2024
bc2325e
Merge pull request #1190 from lottev1991/JaPresampNullPriorityReplaceFix
stakira Aug 4, 2024
d124e17
Merge pull request #1230 from stakira/ci
stakira Aug 4, 2024
b494994
fixes update url
stakira Aug 4, 2024
eaba693
use the first available audio device
krn1pnc Aug 6, 2024
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
14 changes: 0 additions & 14 deletions .devcontainer/devcontainer.json

This file was deleted.

180 changes: 137 additions & 43 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,65 +1,159 @@
on: workflow_dispatch
on:
workflow_dispatch:
inputs:
version:
description: "Version"
default: "0.0.0"
required: true
type: string
release:
type: boolean
default: false
description: "Release"
beta:
type: boolean
default: true
description: "Beta"
draft:
type: boolean
default: true
description: "Draft"

env:
release-name: ${{ inputs.version }}${{ inputs.beta && ' Beta' || '' }}

jobs:
pr-test:
runs-on: ${{ matrix.os.runs-on }}
build:
runs-on: ${{ matrix.arch.runs-on }}

strategy:
fail-fast: false
matrix:
os:
- runs-on: windows-latest
arch: win-x64
rid: win-x64
- runs-on: ubuntu-latest
arch: linux-x64
rid: linux-x64
arch:
- { name: win-x64, rid: win-x64, arch: x64, os: win, runs-on: windows-latest }
- { name: win-x86, rid: win-x86, arch: x86, os: win, runs-on: windows-latest }
- { name: win-arm64, rid: win-arm64, arch: arm64, os: win, runs-on: windows-latest }
- { name: osx-x64, rid: osx.10.14-x64, arch: x64, os: osx, runs-on: macos-13 }
- { name: osx-arm64, rid: osx-arm64, arch: arm64, os: osx, runs-on: macos-13 }
- { name: linux-x64, rid: linux-x64, arch: x64, os: linux, runs-on: ubuntu-latest }
- { name: linux-arm64, rid: linux-arm64, arch: arm64, os: linux, runs-on: ubuntu-latest }

steps:
# Setup
- uses: actions/checkout@v4
- uses: actions/setup-dotnet@v4
with:
dotnet-version: "6.0.x"
- name: Restore
run: dotnet restore OpenUtau -r ${{ matrix.os.rid }}
- name: test
- uses: actions/setup-node@v4
with:
node-version: 20
- uses: justalemon/[email protected]
with:
version: ${{ inputs.version }}
csproj-files: "OpenUtau/*.csproj"

# Test
- name: Test
run: dotnet test OpenUtau.Test

- name: Download DirectML.dll
shell: powershell
run: Invoke-WebRequest -Uri "https://www.nuget.org/api/v2/package/Microsoft.AI.DirectML/1.12.0" -OutFile "Microsoft.AI.DirectML.nupkg"
if: matrix.os.arch == 'win-x64'
- name: Extract DirectML.dll
# Build
- name: Restore
run: dotnet restore OpenUtau -r ${{ matrix.arch.rid }}

- name: Publish
run: dotnet publish OpenUtau -c Release -r ${{ matrix.arch.rid }} --self-contained true -o bin/${{ matrix.arch.name }}/
if: ${{ matrix.arch.os != 'osx' }}

# Create Zip
- name: DirectML
shell: cmd
run: |
curl -L https://www.nuget.org/api/v2/package/Microsoft.AI.DirectML/1.12.0 -o Microsoft.AI.DirectML.nupkg
mkdir Microsoft.AI.DirectML
tar -xf Microsoft.AI.DirectML.nupkg -C Microsoft.AI.DirectML
if: matrix.os.arch == 'win-x64'
copy /y Microsoft.AI.DirectML\bin\${{ matrix.arch.arch }}-${{ matrix.arch.os }}\DirectML.dll bin\${{ matrix.arch.name }}\
if: ${{ matrix.arch.os == 'win' }}

- name: Set executable permission
run: chmod +x bin/${{ matrix.arch.name }}/OpenUtau
if: ${{ matrix.arch.os == 'linux' }}

- name: Zip
run: |
cd bin/${{ matrix.arch.name }}
7z a ../../OpenUtau-${{ matrix.arch.name }}.zip *
if: ${{ matrix.arch.os != 'osx' }}

- name: Build non-mac
run: dotnet publish OpenUtau -c Release -r ${{ matrix.os.rid }} --self-contained true -o bin/${{ matrix.os.arch }}/
if: matrix.os.arch != 'osx-x64'
- name: upload non-mac build
uses: actions/upload-artifact@v4
# Create Installer
- name: Get VC Redist
run: |
curl https://aka.ms/vs/17/release/vc_redist.${{ matrix.arch.arch }}.exe -o vc_redist.${{ matrix.arch.arch }}.exe
if: ${{ matrix.arch.os == 'win' }}

- name: Create Installer
uses: joncloud/[email protected]
with:
name: OpenUtau-${{ matrix.os.arch }}
path: bin/${{ matrix.os.arch }}
if: matrix.os.arch != 'osx-x64'

- name: Setup Node.js
uses: actions/setup-node@v4
if: matrix.os.arch == 'osx-x64'
- name: Build mac
script-file: OpenUtau.nsi
arguments: "-DPRODUCT_VERSION=${{ inputs.version }} -DARCH=${{ matrix.arch.arch }}"
if: ${{ matrix.arch.os == 'win' }}

# Create Dmg
- name: Create Dmg
run: |
dotnet msbuild OpenUtau -t:BundleApp -p:Configuration=Release -p:RuntimeIdentifier=${{ matrix.os.rid }} -p:UseAppHost=true -p:OutputPath=../bin/${{ matrix.os.arch }}/
cp OpenUtau/Assets/OpenUtau.icns bin/${{ matrix.os.arch }}/publish/OpenUtau.app/Contents/Resources/
dotnet msbuild OpenUtau -t:BundleApp -p:Configuration=Release -p:RuntimeIdentifier=${{ matrix.arch.rid }} -p:UseAppHost=true -p:OutputPath=../bin/${{ matrix.arch.name }}/
npm install -g create-dmg
create-dmg bin/osx-x64/publish/OpenUtau.app
mv *.dmg OpenUtau-osx-x64.dmg
codesign -fvs - OpenUtau-osx-x64.dmg
if: matrix.os.arch == 'osx-x64'
- name: Upload mac build
uses: actions/upload-artifact@v4
cp OpenUtau/Assets/OpenUtau.icns bin/${{ matrix.arch.name }}/publish/OpenUtau.app/Contents/Resources/
create-dmg bin/${{ matrix.arch.name }}/publish/OpenUtau.app || true
mv *.dmg OpenUtau-${{ matrix.arch.name }}.dmg
codesign -fvs - OpenUtau-${{ matrix.arch.name }}.dmg
if: ${{ matrix.arch.os == 'osx' }}

# Upload Artifacts
- uses: actions/upload-artifact@v4
with:
name: OpenUtau-${{ matrix.arch.name }}.zip
path: OpenUtau-${{ matrix.arch.name }}.zip
if: ${{ !inputs.release && matrix.arch.os != 'osx' }}

- uses: actions/upload-artifact@v4
with:
name: OpenUtau-${{ matrix.arch.name }}.exe
path: OpenUtau-${{ matrix.arch.name }}.exe
if: ${{ !inputs.release && matrix.arch.os == 'win' }}

- uses: actions/upload-artifact@v4
with:
name: OpenUtau-osx-${{ matrix.arch.name }}.dmg
path: OpenUtau-osx-${{ matrix.arch.name }}.dmg
if: ${{ !inputs.release && matrix.arch.os == 'osx' }}

# Appcast
- name: Appcast Windows
shell: cmd
run: |
python appcast.py -v=${{ inputs.version }} -o=windows -r=${{ matrix.arch.name }} -f=OpenUtau-${{ matrix.arch.name }}.zip
python appcast.py -v=${{ inputs.version }} -o=windows -r=${{ matrix.arch.name }}-installer -f=OpenUtau-${{ matrix.arch.name }}.exe
if: ${{ inputs.release && matrix.arch.os == 'win' }}

- name: Appcast MacOS
run: |
python appcast.py -v=${{ inputs.version }} -o=macos -r=${{ matrix.arch.name }} -f=OpenUtau-${{ matrix.arch.name }}.dmg
if: ${{ inputs.release && matrix.arch.os == 'osx' }}

- name: Appcast Linux
run: |
python appcast.py -v=${{ inputs.version }} -o=linux -r=${{ matrix.arch.name }} -f=OpenUtau-${{ matrix.arch.name }}.zip
if: ${{ inputs.release && matrix.arch.os == 'linux' }}

# Release
- name: Release
uses: softprops/action-gh-release@v2
with:
name: OpenUtau-${{ matrix.os.arch }}
path: OpenUtau-osx-x64.dmg
if: matrix.os.arch == 'osx-x64'
tag_name: ${{ inputs.version }}
name: ${{ env.release-name }}
prerelease: ${{ inputs.beta }}
draft: ${{ inputs.draft }}
files: |
appcast.${{ matrix.arch.name }}*.xml
OpenUtau-${{ matrix.arch.name }}.*
if: ${{ inputs.release }}
5 changes: 2 additions & 3 deletions .github/workflows/release-cleanup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ name: release-cleanup

# Controls when the workflow will run
on:
# Triggers the workflow on push or pull request events but only for the "master" branch
push:
branches: [ "master" ]
schedule:
- cron: '15 10 * * 3' # every Wednesday at 10:15 UTC

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
Expand Down
29 changes: 0 additions & 29 deletions OpenUtau.Core/Audio/AudioDevice.cs

This file was deleted.

75 changes: 0 additions & 75 deletions OpenUtau.Core/Audio/AudioEngine.cs

This file was deleted.

10 changes: 0 additions & 10 deletions OpenUtau.Core/Audio/AudioFrame.cs

This file was deleted.

14 changes: 0 additions & 14 deletions OpenUtau.Core/Audio/AudioStreamInfo.cs

This file was deleted.

Loading
Loading