From 12f9da2fe16e26b640c631158f49836732656b65 Mon Sep 17 00:00:00 2001
From: KinoMyu <nellueng@gmail.com>
Date: Sun, 22 Sep 2019 21:05:22 -0700
Subject: [PATCH] whitev

---
 FastHCADecoder           |   2 +-
 QuintetPlayer_ja.qm      | Bin 857 -> 864 bytes
 QuintetPlayer_ja.ts      |  32 ++++++++++++++++----------------
 mainwindow.ui            |   2 +-
 src/HCAStreamChannel.cpp |   2 +-
 src/mainwindow.cpp       |   5 +++--
 6 files changed, 22 insertions(+), 21 deletions(-)

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 c2d77f0586b75cb60d1d0708f800ff08b5d0a8d1..67d2ff43c31f5449902b5777ba9bb557ee09309c 100644
GIT binary patch
delta 180
zcmcb~_JD1IO8pWB)@Aw(3`}7RtVdaZ^m2x<o~aBBj1>$~DXW0|T9)?g8U_Xib(ZsG
zQ-Jhd)(-Djp!{jpo-<8A`VVW*0~eq=P1f1{SAp`cST6-01=3yYYmGaBbO_IBry`&_
zg-oELbId>yHU>imW4~P-Kqdp*#KrDPJbnxlUS#_ixES;s1VV&?QrwOO1*wTS3jTRH
Om6Ja(ifnx4zyttZ(JmVR

delta 189
zcmaFBc9U&_N_`#!>oR=?1||gt)}t&yx{x8PXDR~&qZ30^$|@k=ouxgyhJk@Wo#lMl
z6d>Ks+Tk4wl%LAlbEXMMA7kx#-~yySv(E0n3Y6c%dMWTIkPhL>UVjs)e+JKKry?N#
zRVI*goEgYsV=!be_S?k)WHPW#T<pGCfzg3!vOgoMmVui=tU-!_FGLC`%@JChUs7C}
VoyiX5aQP-?=7neGrR0}00swTKE+YT{

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 @@
         <translation>ミリシタクインテットプレイヤー</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="391"/>
+        <location filename="mainwindow.ui" line="390"/>
         <source>Play</source>
         <translation>再生</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="412"/>
+        <location filename="mainwindow.ui" line="411"/>
         <source>Pause</source>
         <translation>一時停止</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="433"/>
+        <location filename="mainwindow.ui" line="432"/>
         <source>Export</source>
         <translation>書き出し</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="454"/>
+        <location filename="mainwindow.ui" line="453"/>
         <source>Rewind</source>
         <oldsource>Reset</oldsource>
         <translation>巻き戻し</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="496"/>
+        <location filename="mainwindow.ui" line="495"/>
         <source>Solo</source>
         <translation>ソロ</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="517"/>
+        <location filename="mainwindow.ui" line="516"/>
         <source>Unit</source>
         <translation>5人</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="542"/>
+        <location filename="mainwindow.ui" line="540"/>
         <source>Song:</source>
         <translation>楽曲:</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="566"/>
+        <location filename="mainwindow.ui" line="564"/>
         <source>BGM Volume</source>
         <translation>BGM音量</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="590"/>
+        <location filename="mainwindow.ui" line="588"/>
         <source>Idol Volume</source>
         <translation>アイドル音量</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="716"/>
+        <location filename="mainwindow.ui" line="714"/>
         <source>Random</source>
         <translation>ランダム編成</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1241"/>
+        <location filename="mainwindow.ui" line="1239"/>
         <source>13</source>
         <translation>13人</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1265"/>
-        <source>Usotsuki</source>
-        <translation>うそつき</translation>
+        <location filename="mainwindow.ui" line="1263"/>
+        <source>Appeal Only</source>
+        <translation>一部歌いわけ</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1286"/>
+        <location filename="mainwindow.ui" line="1284"/>
         <source>Reverb</source>
         <translation>リバーブ</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1307"/>
+        <location filename="mainwindow.ui" line="1305"/>
         <source>Appeal</source>
         <translation>アピール</translation>
     </message>
diff --git a/mainwindow.ui b/mainwindow.ui
index c2bb5a0..875df28 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -1260,7 +1260,7 @@
      </font>
     </property>
     <property name="text">
-     <string>Usotsuki</string>
+     <string>Appeal Only</string>
     </property>
     <property name="alignment">
      <set>Qt::AlignCenter</set>
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 <fstream>
 #include <iostream>
 #include <set>
+#include <thread>
 #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<QString>().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);