diff --git a/FastHCADecoder b/FastHCADecoder
index 3e73d14..6a883d9 160000
--- a/FastHCADecoder
+++ b/FastHCADecoder
@@ -1 +1 @@
-Subproject commit 3e73d148aa74421f85d32025a62f0f3bbeaf4a1d
+Subproject commit 6a883d9feac4164856a5fc64114ef3d41706f1e1
diff --git a/QuintetPlayer_ja.qm b/QuintetPlayer_ja.qm
index c2d77f0..67d2ff4 100644
Binary files a/QuintetPlayer_ja.qm and b/QuintetPlayer_ja.qm differ
diff --git a/QuintetPlayer_ja.ts b/QuintetPlayer_ja.ts
index 8c23b9e..3a0978a 100644
--- a/QuintetPlayer_ja.ts
+++ b/QuintetPlayer_ja.ts
@@ -9,73 +9,73 @@
ミリシタクインテットプレイヤー
-
+
Play
再生
-
+
Pause
一時停止
-
+
Export
書き出し
-
+
Rewind
Reset
巻き戻し
-
+
Solo
ソロ
-
+
Unit
5人
-
+
Song:
楽曲:
-
+
BGM Volume
BGM音量
-
+
Idol Volume
アイドル音量
-
+
Random
ランダム編成
-
+
13
13人
-
- Usotsuki
- うそつき
+
+ Appeal Only
+ 一部歌いわけ
-
+
Reverb
リバーブ
-
+
Appeal
アピール
diff --git a/mainwindow.ui b/mainwindow.ui
index c2bb5a0..875df28 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -1260,7 +1260,7 @@
- Usotsuki
+ Appeal Only
Qt::AlignCenter
diff --git a/src/HCAStreamChannel.cpp b/src/HCAStreamChannel.cpp
index 1cca974..d2af839 100644
--- a/src/HCAStreamChannel.cpp
+++ b/src/HCAStreamChannel.cpp
@@ -1,5 +1,5 @@
#include "HCAStreamChannel.h"
-#include "../HCADecoder/clHCA.h"
+#include "../FastHCADecoder/clHCA.h"
HCAStreamChannel::HCAStreamChannel(HCADecodeService* dec, float volume, unsigned int cipher_key_1, unsigned int cipher_key_2, unsigned int sub_key)
: dec {dec},
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index e3baa71..f9796ea 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -5,6 +5,7 @@
#include
#include
#include
+#include
#include "mainwindow.h"
#include "ui_mainwindow.h"
#include "../bass/bass.h"
@@ -26,7 +27,7 @@ MainWindow::MainWindow(QWidget *parent) :
idol_mix_stream {BASS_Mixer_StreamCreate(44100,2,BASS_STREAM_DECODE)},
idol_oneshot_stream {BASS_Mixer_StreamCreate(44100,2,BASS_STREAM_DECODE)},
freeverb_params {1, 0.4f, 0.76f, 0.3f, 1, 0, BASS_BFX_CHANALL},
- dec {2}
+ dec {std::thread::hardware_concurrency() > 2 ? std::thread::hardware_concurrency() / 2: 1}
{
QString locale = QLocale::system().name();
locale.truncate(locale.lastIndexOf('_'));
@@ -269,7 +270,7 @@ void MainWindow::setBGM(const QString&)
{
current_song = ui->songsel->currentData().value().toLocal8Bit().constData();
- is_usotsuki = current_song == "macpri";
+ is_usotsuki = current_song == "macpri" || current_song == "whitev";
unit_size = is_usotsuki ? 1 : old_unit_size;
ui->usotsukilabel->setVisible(is_usotsuki);
ui->soloButton->setVisible(!is_usotsuki);