whitev

KinoMyu · Sep 23, 2019 · 12f9da2 · 12f9da2
1 parent a1f6373
commit 12f9da2
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 21 deletions.
diff --git a/FastHCADecoder b/FastHCADecoder
diff --git a/QuintetPlayer_ja.qm b/QuintetPlayer_ja.qm
diff --git 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
@@ -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
@@ -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
@@ -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);