追加コマンドの設定欄を追加。

rigaya · Aug 4, 2022 · a2ad042 · a2ad042
1 parent f0d77f0
commit a2ad042
Show file tree

Hide file tree

Showing 7 changed files with 174 additions and 107 deletions.
diff --git a/VCECore/rgy_version.h b/VCECore/rgy_version.h
@@ -29,9 +29,9 @@
 #ifndef __RGY_VERSION_H__
 #define __RGY_VERSION_H__
 
-#define VER_FILEVERSION             0,7,1,0
-#define VER_STR_FILEVERSION          "7.01"
-#define VER_STR_FILEVERSION_TCHAR _T("7.01")
+#define VER_FILEVERSION             0,7,2,0
+#define VER_STR_FILEVERSION          "7.02"
+#define VER_STR_FILEVERSION_TCHAR _T("7.02")
 
 
 #ifdef _M_IX86

diff --git a/VCEEnc.sln b/VCEEnc.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28729.10
+# Visual Studio Version 17
+VisualStudioVersion = 17.2.32519.379
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VCEEnc", "VCEEnc\VCEEnc.vcxproj", "{05D4409E-70DD-489B-9A83-268E6CB1B4C5}"
 EndProject

diff --git a/VCEEnc/VCEEnc_readme.txt b/VCEEnc/VCEEnc_readme.txt
@@ -160,6 +160,10 @@ Radeon RX460
 ����̍X�V�Őݒ�t�@�C���̌݊������Ȃ��Ȃ邩������܂���B
 
 �y�ǂ��ł����������z
+2022.08.04 (7.02)
+[VCEEnc.auo]
+�ǉ��R�}���h�̐ݒ藓��ǉ��B
+
 2022.07.28 (7.01)
 [VCEEncC]
 - vpp-colorspace��hdr2sdr�g�p���ɁAldr_nits, source_peak�Ɋւ���G���[�`�F�b�N��ǉ��B

diff --git a/VCEEnc/encode/auo_video.cpp b/VCEEnc/encode/auo_video.cpp
@@ -192,6 +192,13 @@ static void build_full_cmd(char *cmd, size_t nSize, const CONF_GUIEX *conf, cons
     //apply_guiEx_auto_settings(&prm.x264, oip->w, oip->h, oip->rate, oip->scale, sys_dat->exstg->s_local.auto_ref_limit_by_level);
     //GUI部のコマンドライン生成
     strcpy_s(cmd, nSize, gen_cmd(encPrm, false).c_str());
+    //cmdexの処理
+    char cmdex[sizeof(conf->vce.cmdex)];
+    strcpy_s(cmdex, conf->vce.cmdex);
+    cmd_replace(cmdex, sizeof(cmdex), pe, sys_dat, conf, oip);
+    replace_cmd_CRLF_to_Space(cmdex, sizeof(cmdex) - 1);
+    sprintf_s(cmd + strlen(cmd), nSize - strlen(cmd), " %s", cmdex);
+
     //メッセージの発行
     if (encPrm->nVBVBufferSize != 0) {
         write_log_auo_line(LOG_INFO, "自動フィールドシフト使用時はvbv設定は正確に反映されません。");

diff --git a/VCEEnc/frm/frmConfig.cpp b/VCEEnc/frm/frmConfig.cpp
@@ -822,6 +822,7 @@ System::Void frmConfig::SetTXMaxLen(TextBox^ TX, int max_len) {
 System::Void frmConfig::SetTXMaxLenAll() {
     //MaxLengthに最大文字数をセットし、それをもとにバイト数計算を行うイベントをセットする。
     SetTXMaxLen(fcgTXVideoEncoderPath,   sizeof(sys_dat->exstg->s_vid.fullpath) - 1);
+    SetTXMaxLen(fcgTXCmdEx,              sizeof(CONF_VCE::cmdex) - 1);
     SetTXMaxLen(fcgTXAudioEncoderPath,   sizeof(sys_dat->exstg->s_aud_ext[0].fullpath) - 1);
     SetTXMaxLen(fcgTXMP4MuxerPath,       sizeof(sys_dat->exstg->s_mux[MUXER_MP4].fullpath) - 1);
     SetTXMaxLen(fcgTXMKVMuxerPath,       sizeof(sys_dat->exstg->s_mux[MUXER_MKV].fullpath) - 1);
@@ -1227,6 +1228,8 @@ System::Void frmConfig::ConfToFrm(CONF_GUIEX *cnf) {
         fcgTXBatBeforePath->Text           = String(cnf->oth.batfile.before_process).ToString();
         fcgTXBatAfterPath->Text            = String(cnf->oth.batfile.after_process).ToString();
 
+        fcgTXCmdEx->Text = String(cnf->vce.cmdex).ToString();
+
         SetfcgTSLSettingsNotes(cnf->oth.notes);
 
     this->ResumeLayout();
@@ -1427,6 +1430,7 @@ System::String^ frmConfig::FrmToConf(CONF_GUIEX *cnf) {
 
     GetfcgTSLSettingsNotes(cnf->oth.notes, sizeof(cnf->oth.notes));
 
+    GetCHARfromString(cnf->vce.cmdex, sizeof(cnf->vce.cmdex), fcgTXCmdEx->Text);
     strcpy_s(cnf->vce.cmd, gen_cmd(&vce, true).c_str());
 
     return String(gen_cmd(&vce, false).c_str()).ToString();