Skip to content

Commit

Permalink
2ch_EDCB/50/226 rectag
Browse files Browse the repository at this point in the history
  • Loading branch information
@abt8WG
abt8WG committed Apr 22, 2016
1 parent 02d5c7b commit e9171dd
Show file tree
Hide file tree
Showing 32 changed files with 151 additions and 45 deletions.
8 changes: 6 additions & 2 deletions Common/CtrlCmdUtil.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ DWORD WriteVALUE( WORD ver, BYTE* buff, DWORD buffOffset, const REC_SETTING_DATA
pos += WriteVALUE(ver, buff, pos, val.tuijyuuFlag);
pos += WriteVALUE(ver, buff, pos, val.serviceMode);
pos += WriteVALUE(ver, buff, pos, val.pittariFlag);
pos += WriteVALUE(ver, buff, pos, val.batFilePath);
pos += WriteVALUE(ver, buff, pos, val.getBatFilePathAndRecTag());
pos += WriteVALUE(ver, buff, pos, val.recFolderList);
pos += WriteVALUE(ver, buff, pos, val.suspendMode);
pos += WriteVALUE(ver, buff, pos, val.rebootFlag);
Expand Down Expand Up @@ -130,7 +130,11 @@ BOOL ReadVALUE( WORD ver, REC_SETTING_DATA* val, const BYTE* buff, DWORD buffSiz
READ_VALUE_OR_FAIL( ver, buff, buffSize, pos, size, &val->tuijyuuFlag );
READ_VALUE_OR_FAIL( ver, buff, buffSize, pos, size, &val->serviceMode );
READ_VALUE_OR_FAIL( ver, buff, buffSize, pos, size, &val->pittariFlag );
READ_VALUE_OR_FAIL( ver, buff, buffSize, pos, size, &val->batFilePath );
{
wstring batFilePathAndRecTag;
READ_VALUE_OR_FAIL( ver, buff, buffSize, pos, size, &batFilePathAndRecTag );
val->setBatFilePathAndRecTag(batFilePathAndRecTag);
}
READ_VALUE_OR_FAIL( ver, buff, buffSize, pos, size, &val->recFolderList );
READ_VALUE_OR_FAIL( ver, buff, buffSize, pos, size, &val->suspendMode );
READ_VALUE_OR_FAIL( ver, buff, buffSize, pos, size, &val->rebootFlag );
Expand Down
27 changes: 20 additions & 7 deletions Common/ParseTextInstances.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -648,8 +648,12 @@ bool CParseReserveText::ParseLine(const wstring& parseLine, pair<DWORD, RESERVE_
item.second.recSetting.recMode = (BYTE)_wtoi(NextToken(token));
item.second.recSetting.pittariFlag = _wtoi(NextToken(token)) != 0 && item.second.eventID != 0xFFFF;
NextToken(token);
if( item.second.recSetting.batFilePath.assign(token[0], token[1]) == L"0" ){
item.second.recSetting.batFilePath.clear();
{
wstring batFilePathAndRecTag;
if (batFilePathAndRecTag.assign(token[0], token[1]) == L"0") {
batFilePathAndRecTag.clear();
}
item.second.recSetting.setBatFilePathAndRecTag(batFilePathAndRecTag);
}
//将来用
NextToken(token);
Expand Down Expand Up @@ -732,6 +736,7 @@ bool CParseReserveText::SaveLine(const pair<DWORD, RESERVE_DATA>& item, wstring&
item.second.recSetting.partialRecFolder[i].writePlugIn + L"*" +
item.second.recSetting.partialRecFolder[i].recNamePlugIn + L"\n";
}
wstring batFilePathAndRecTag = item.second.recSetting.getBatFilePathAndRecTag();
Format(saveLine, L"%04d/%02d/%02d\n%02d:%02d:%02d\n%02d:%02d:%02d\n%s\n%s\n%d\n%d\n%d\n%d\n%d\n%d\n%d\n%d\n%d\n%s\n%s\n%s\n%s\n%d\n%d\n%s\n%d\n%d\n%d\n%d\n%04d/%02d/%02d\n%02d:%02d:%02d\n%d\n%s%d\n%d\n%d\n%d\n%d\n%s",
item.second.startTime.wYear, item.second.startTime.wMonth, item.second.startTime.wDay,
item.second.startTime.wHour, item.second.startTime.wMinute, item.second.startTime.wSecond,
Expand All @@ -747,7 +752,7 @@ bool CParseReserveText::SaveLine(const pair<DWORD, RESERVE_DATA>& item, wstring&
item.second.reserveID,
item.second.recSetting.recMode,
item.second.recSetting.pittariFlag,
item.second.recSetting.batFilePath.empty() ? L"0" : item.second.recSetting.batFilePath.c_str(),
batFilePathAndRecTag.empty() ? L"0" : batFilePathAndRecTag.c_str(),
L"0",
item.second.comment.c_str(),
item.second.recSetting.recFolderList.empty() ? L"" : (
Expand Down Expand Up @@ -1003,7 +1008,11 @@ bool CParseEpgAutoAddText::ParseLine(const wstring& parseLine, pair<DWORD, EPG_A
item.second.recSetting.serviceMode = _wtoi(NextToken(token));
item.second.recSetting.pittariFlag = _wtoi(NextToken(token)) != 0;
NextToken(token);
item.second.recSetting.batFilePath.assign(token[0], token[1]);
{
wstring batFilePathAndRecTag;
batFilePathAndRecTag.assign(token[0], token[1]);
item.second.recSetting.setBatFilePathAndRecTag(batFilePathAndRecTag);
}
item.second.recSetting.suspendMode = (BYTE)_wtoi(NextToken(token));
if( token[0] == token[1] ){
item.second.recSetting.suspendMode = 4;
Expand Down Expand Up @@ -1121,7 +1130,7 @@ bool CParseEpgAutoAddText::SaveLine(const pair<DWORD, EPG_AUTO_ADD_DATA>& item,
item.second.recSetting.tuijyuuFlag,
item.second.recSetting.serviceMode,
item.second.recSetting.pittariFlag,
item.second.recSetting.batFilePath.c_str(),
item.second.recSetting.getBatFilePathAndRecTag().c_str(),
item.second.recSetting.suspendMode,
item.second.recSetting.rebootFlag,
item.second.recSetting.useMargineFlag,
Expand Down Expand Up @@ -1234,7 +1243,11 @@ bool CParseManualAutoAddText::ParseLine(const wstring& parseLine, pair<DWORD, MA
item.second.recSetting.serviceMode = _wtoi(NextToken(token));
item.second.recSetting.pittariFlag = _wtoi(NextToken(token)) != 0;
NextToken(token);
item.second.recSetting.batFilePath.assign(token[0], token[1]);
{
wstring batFilePathAndRecTag;
batFilePathAndRecTag.assign(token[0], token[1]);
item.second.recSetting.setBatFilePathAndRecTag(batFilePathAndRecTag);
}
item.second.recSetting.suspendMode = (BYTE)_wtoi(NextToken(token));
if( token[0] == token[1] ){
item.second.recSetting.suspendMode = 4;
Expand Down Expand Up @@ -1307,7 +1320,7 @@ bool CParseManualAutoAddText::SaveLine(const pair<DWORD, MANUAL_AUTO_ADD_DATA>&
item.second.recSetting.tuijyuuFlag,
item.second.recSetting.serviceMode,
item.second.recSetting.pittariFlag,
item.second.recSetting.batFilePath.c_str(),
item.second.recSetting.getBatFilePathAndRecTag().c_str(),
item.second.recSetting.suspendMode,
item.second.recSetting.rebootFlag,
item.second.recSetting.useMargineFlag,
Expand Down
16 changes: 16 additions & 0 deletions Common/StructDef.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,14 @@ typedef struct _REC_FILE_SET_INFO{

//録画設定情報
typedef struct _REC_SETTING_DATA{
static const wchar_t SEPARATOR = '*'; // batFilePathとrecTagを結合/分離する際のセパレーターキャラクター
BYTE recMode; //録画モード
BYTE priority; //優先度
BYTE tuijyuuFlag; //イベントリレー追従するかどうか
DWORD serviceMode; //処理対象データモード
BYTE pittariFlag; //ぴったり？録画
wstring batFilePath; //録画後BATファイルパス
wstring recTag; //録画タグ
vector<REC_FILE_SET_INFO> recFolderList; //録画フォルダパス
BYTE suspendMode; //休止モード
BYTE rebootFlag; //録画後再起動する
Expand All @@ -49,6 +51,7 @@ typedef struct _REC_SETTING_DATA{
serviceMode = 0;
pittariFlag = FALSE;
batFilePath = L"";
recTag = L"";
suspendMode = 0;
rebootFlag = FALSE;
useMargineFlag = FALSE;
Expand All @@ -58,6 +61,19 @@ typedef struct _REC_SETTING_DATA{
partialRecFlag = 0;
tunerID = 0;
};
void setBatFilePathAndRecTag(const wstring& val){
size_t pos = val.find_first_of(SEPARATOR);
if( pos == wstring::npos ){
batFilePath = val;
recTag = L"";
}else{
batFilePath = val.substr(0, pos);
recTag = val.substr(pos + 1);
}
};
wstring getBatFilePathAndRecTag() const{
return (recTag.empty()) ? batFilePath : batFilePath + SEPARATOR + recTag;
};
} REC_SETTING_DATA;

struct _EPG_AUTO_ADD_DATA;
Expand Down
1 change: 1 addition & 0 deletions Document/Readme_EpgTimer.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1004,6 +1004,7 @@ $Title2F$ $Title2$
$Genre$ �ԑg�̃W�������iEPG�f�[�^���ݎ��̂݁j�iRecName_Macro.dll�̂݁j
$Genre2$ �ԑg�̏ڍ׃W�������iEPG�f�[�^���ݎ��̂݁j�iRecName_Macro.dll�̂݁j
$AddKey$ EPG�����\��œo�^���ꂽ�L�[���[�h�i�o�b�`�̂݁j
$RecTag$ �^��ݒ�Ŏw�肵���^��^�O�i�o�b�`�̂݁j
$SubTitle$ �T�u�^�C�g���i�ԑg���e�j�iEPG�f�[�^���ݎ��̂݁j�iRecName_Macro.dll�̂݁j
$SubTitle2$ $SubTitle$�̓��e�Łu^[#����][0-9�O�P�Q�R�S�T�U�V�W�X]�v�̌����Ƀq�b�g�����ꍇ�̂݁iEPG�f�[�^���ݎ��̂݁j�iRecName_Macro.dll�̂݁j

Expand Down
1 change: 1 addition & 0 deletions Document/Readme_Mod.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -742,6 +742,7 @@ I GetNotifyUpdateCount(
serviceMode:I=�����Ώۃf�[�^���[�h
pittariFlag:B=�҂�����?�^��
batFilePath:S=�^���BAT�t�@�C���p�X
recTag:S=�^��^�O
suspendMode:I=�x�~���[�h
rebootFlag:B=�^���ċN������
startMargin:I|nil=�^��J�n���̃}�[�W��(�f�t�H���g�̂Ƃ�nil)
Expand Down
2 changes: 2 additions & 0 deletions EDCBSupport/EDCBSupport/ReserveDialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,7 @@ void CReserveDialog::InitDialog(HWND hDlg)
SetComboBoxDroppedWidth(hDlg,IDC_RESERVE_BAT);
}
::SetDlgItemTextW(hDlg,IDC_RESERVE_BAT,RecSetting.batFilePath.c_str());
::SetDlgItemTextW(hDlg,IDC_RESERVE_REC_TAG,RecSetting.recTag.c_str());

::CheckDlgButton(hDlg,IDC_RESERVE_USEMARGIN,
RecSetting.useMargineFlag?BST_CHECKED:BST_UNCHECKED);
Expand Down Expand Up @@ -436,6 +437,7 @@ bool CReserveDialog::GetSettings(HWND hDlg)
else
RecSetting.rebootFlag=0;
GetDlgItemString(hDlg,IDC_RESERVE_BAT,&RecSetting.batFilePath);
GetDlgItemString(hDlg,IDC_RESERVE_REC_TAG,&RecSetting.recTag);
RecSetting.useMargineFlag=::IsDlgButtonChecked(hDlg,IDC_RESERVE_USEMARGIN)==BST_CHECKED;
if (RecSetting.useMargineFlag) {
RecSetting.startMargine=::GetDlgItemInt(hDlg,IDC_RESERVE_STARTMARGIN,NULL,TRUE);
Expand Down
36 changes: 19 additions & 17 deletions EDCBSupport/EDCBSupport/res/EDCBSupport.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,13 @@ BEGIN
EDITTEXT IDC_OPTIONS_NETWORKPASSWORD,68,63,80,12,ES_PASSWORD | ES_AUTOHSCROLL
END

IDD_RESERVE DIALOG 0, 0, 272, 304
IDD_RESERVE DIALOG 0, 0, 272, 322
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "EpgTimer �\��ݒ�"
FONT 9, "�l�r �o�S�V�b�N"
BEGIN
DEFPUSHBUTTON "OK",IDOK,148,282,56,14
PUSHBUTTON "�L�����Z��",IDCANCEL,208,282,56,14
DEFPUSHBUTTON "OK",IDOK,148,300,56,14
PUSHBUTTON "�L�����Z��",IDCANCEL,208,300,56,14
EDITTEXT IDC_RESERVE_INFO,0,0,272,24,ES_MULTILINE | ES_READONLY | NOT WS_BORDER
LTEXT "�^�C�g��:",-1,8,34,36,8
EDITTEXT IDC_RESERVE_TITLE,64,32,200,12,ES_AUTOHSCROLL
Expand All @@ -136,20 +136,22 @@ BEGIN
LTEXT "�^�����sBAT:",-1,8,196,52,8
COMBOBOX IDC_RESERVE_BAT,64,194,182,80,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "...",IDC_RESERVE_BAT_BROWSE,250,193,14,14
CONTROL "�^��}�[�W�����w�肷��",IDC_RESERVE_USEMARGIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,212,88,9
LTEXT "�J�n:",IDC_RESERVE_STARTMARGIN_LABEL,104,212,20,8
EDITTEXT IDC_RESERVE_STARTMARGIN,128,210,32,12,ES_AUTOHSCROLL
LTEXT "�b",IDC_RESERVE_STARTMARGIN_UNIT,162,212,8,8
LTEXT "�I��:",IDC_RESERVE_ENDMARGIN_LABEL,180,212,20,8
EDITTEXT IDC_RESERVE_ENDMARGIN,204,210,32,12,ES_AUTOHSCROLL
LTEXT "�b",IDC_RESERVE_ENDMARGIN_UNIT,238,212,8,8
CONTROL "�Ώۃf�[�^���w�肷��",IDC_RESERVE_SERVICEMODE_CUSTOM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,226,80,9
CONTROL "�����f�[�^",IDC_RESERVE_SERVICEMODE_CAPTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,104,226,48,9
CONTROL "�f�[�^����",IDC_RESERVE_SERVICEMODE_DATA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,226,48,9
CONTROL "�����Z�O��ʃt�@�C���ɓ����o�͂���",IDC_RESERVE_PARTIALREC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,238,128,9
CONTROL "�A�������^��𓯂��t�@�C���ɏo�͂���",IDC_RESERVE_CONTINUEREC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,250,136,9
LTEXT "�g�p�`���[�i�[:",-1,8,264,52,8
COMBOBOX IDC_RESERVE_TUNER,64,262,120,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_HSCROLL
LTEXT "�^��^�O:",-1,8,214,52,8
EDITTEXT IDC_RESERVE_REC_TAG,64,212,182,12,ES_AUTOHSCROLL
CONTROL "�^��}�[�W�����w�肷��",IDC_RESERVE_USEMARGIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,230,88,9
LTEXT "�J�n:",IDC_RESERVE_STARTMARGIN_LABEL,104,230,20,8
EDITTEXT IDC_RESERVE_STARTMARGIN,128,228,32,12,ES_AUTOHSCROLL
LTEXT "�b",IDC_RESERVE_STARTMARGIN_UNIT,162,230,8,8
LTEXT "�I��:",IDC_RESERVE_ENDMARGIN_LABEL,180,230,20,8
EDITTEXT IDC_RESERVE_ENDMARGIN,204,228,32,12,ES_AUTOHSCROLL
LTEXT "�b",IDC_RESERVE_ENDMARGIN_UNIT,238,230,8,8
CONTROL "�Ώۃf�[�^���w�肷��",IDC_RESERVE_SERVICEMODE_CUSTOM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,244,80,9
CONTROL "�����f�[�^",IDC_RESERVE_SERVICEMODE_CAPTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,104,244,48,9
CONTROL "�f�[�^����",IDC_RESERVE_SERVICEMODE_DATA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,244,48,9
CONTROL "�����Z�O��ʃt�@�C���ɓ����o�͂���",IDC_RESERVE_PARTIALREC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,256,128,9
CONTROL "�A�������^��𓯂��t�@�C���ɏo�͂���",IDC_RESERVE_CONTINUEREC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,268,136,9
LTEXT "�g�p�`���[�i�[:",-1,8,282,52,8
COMBOBOX IDC_RESERVE_TUNER,64,282,120,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_HSCROLL
END

IDD_FOLDER DIALOG 0, 0, 240, 86
Expand Down
1 change: 1 addition & 0 deletions EDCBSupport/EDCBSupport/resource.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@
#define IDC_RESERVE_PARTIALREC 1032
#define IDC_RESERVE_CONTINUEREC 1033
#define IDC_RESERVE_TUNER 1034
#define IDC_RESERVE_REC_TAG 1035

#define IDC_FOLDER_FOLDER 1000
#define IDC_FOLDER_FOLDER_BROWSE 1001
Expand Down
2 changes: 1 addition & 1 deletion EpgTimer/EpgTimer/AddReserveEpgWindow.xaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Window x:Class="EpgTimer.AddReserveEpgWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Title="予約登録" Height="580" Width="740" xmlns:my="clr-namespace:EpgTimer" WindowStartupLocation="CenterOwner" Closed="Window_Closed">
Title="予約登録" Height="603" Width="740" xmlns:my="clr-namespace:EpgTimer" WindowStartupLocation="CenterOwner" Closed="Window_Closed">

<Grid>
<Grid.RowDefinitions>
Expand Down
2 changes: 1 addition & 1 deletion EpgTimer/EpgTimer/ChgReserveWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:EpgTimer"
Title="予約変更" Height="580" Width="740" xmlns:my="clr-namespace:EpgTimer" Loaded="Window_Loaded" WindowStartupLocation="CenterOwner" Closed="Window_Closed">
Title="予約変更" Height="603" Width="740" xmlns:my="clr-namespace:EpgTimer" Loaded="Window_Loaded" WindowStartupLocation="CenterOwner" Closed="Window_Closed">
<Window.Resources>
<local:UIReserveModeConverter x:Key="reserveModeConverter" />
</Window.Resources>
Expand Down
1 change: 1 addition & 0 deletions EpgTimer/EpgTimer/Common/CommonManagerClass.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -780,6 +780,7 @@ public String ConvertReserveText(ReserveData reserveInfo)
}

view += "録画実行bat : " + reserveInfo.RecSetting.BatFilePath + "\r\n";
view += "録画タグ : " + reserveInfo.RecSetting.RecTag + "\r\n";

if (reserveInfo.RecSetting.RecFolderList.Count == 0)
{
Expand Down
43 changes: 41 additions & 2 deletions EpgTimer/EpgTimer/Common/CtrlCmdDef.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,8 @@ public void Read(MemoryStream s, ushort version)
/// <summary>録画設定情報</summary>
public class RecSettingData : ICtrlCmdReadWrite
{
/// <summary>BatFilePathとTagを結合/分離する際のセパレーターキャラクター</summary>
private static readonly char SEPARATOR = '*';
/// <summary>録画モード</summary>
public byte RecMode;
/// <summary>優先度</summary>
Expand All @@ -158,6 +160,8 @@ public class RecSettingData : ICtrlCmdReadWrite
public byte PittariFlag;
/// <summary>録画後BATファイルパス</summary>
public string BatFilePath;
/// <summary>録画タグ</summary>
public string RecTag;
/// <summary>録画フォルダパス</summary>
public List<RecFileSetInfo> RecFolderList;
/// <summary>休止モード</summary>
Expand Down Expand Up @@ -186,6 +190,7 @@ public RecSettingData()
ServiceMode = 0;
PittariFlag = 0;
BatFilePath = "";
RecTag = "";
RecFolderList = new List<RecFileSetInfo>();
SuspendMode = 0;
RebootFlag = 0;
Expand All @@ -206,7 +211,9 @@ public void Write(MemoryStream s, ushort version)
w.Write(TuijyuuFlag);
w.Write(ServiceMode);
w.Write(PittariFlag);
w.Write(BatFilePath);
// versionを上げてbatFilePathとrecTagを別々に書き込んだ方が良いのだけど
// versionを上げたときの影響が把握できなかったためbatFilePathにrecTagを埋め込む
w.Write(GetBatFilePathAndRecTag());
w.Write(RecFolderList);
w.Write(SuspendMode);
w.Write(RebootFlag);
Expand All @@ -231,7 +238,13 @@ public void Read(MemoryStream s, ushort version)
r.Read(ref TuijyuuFlag);
r.Read(ref ServiceMode);
r.Read(ref PittariFlag);
r.Read(ref BatFilePath);
{
// versionを上げてbatFilePathとrecTagを別々に読み込んだ方が良いのだけど
// versionを上げたときの影響が把握できなかったためbatFilePathからrecTagを分離する
string batFilePathAndRecTag = "";
r.Read(ref batFilePathAndRecTag);
SetBatFilePathAndRecTag(batFilePathAndRecTag);
}
r.Read(ref RecFolderList);
r.Read(ref SuspendMode);
r.Read(ref RebootFlag);
Expand All @@ -247,6 +260,32 @@ public void Read(MemoryStream s, ushort version)
}
r.End();
}
/// <summary>
/// batFilePathとrecTagを合成した文字列を分離してbatFilePathとrecTagに設定する
/// </summary>
/// <param name="val">batFilePathとrecTagを合成したもの</param>
public void SetBatFilePathAndRecTag(string val)
{
int pos = val.IndexOf(SEPARATOR);
if (pos < 0)
{
BatFilePath = val;
RecTag = "";
}
else
{
BatFilePath = val.Substring(0, pos);
RecTag = val.Substring(pos + 1);
}
}
/// <summary>
/// batFilePathとrecTagを合成した文字列を返す
/// </summary>
/// <returns>batFilePathとrecTagを合成した文字列</returns>
public string GetBatFilePathAndRecTag()
{
return (RecTag.Length == 0) ? BatFilePath : BatFilePath + SEPARATOR + RecTag;
}
}

/// <summary>登録予約基本情報</summary>
Expand Down
3 changes: 3 additions & 0 deletions EpgTimer/EpgTimer/CtrlCmdDefEx/RecSettingDataEx.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ private static string CustomTimeFormat(int span, byte useMarginFlag)
private static void CopyData(RecSettingData src, RecSettingData dest)
{
dest.BatFilePath = src.BatFilePath;
dest.RecTag = src.RecTag;
dest.ContinueRecFlag = src.ContinueRecFlag;
dest.EndMargine = src.EndMargine;
dest.PartialRecFlag = src.PartialRecFlag;
Expand All @@ -119,6 +120,7 @@ private static void CopyData(RecSettingData src, RecSettingData dest)
public static bool EqualsValue(RecSettingData src, RecSettingData dest)
{
return src.BatFilePath == dest.BatFilePath
&& src.RecTag == dest.RecTag
&& src.ContinueRecFlag == dest.ContinueRecFlag
&& src.EndMargine == dest.EndMargine
&& src.PartialRecFlag == dest.PartialRecFlag
Expand All @@ -140,6 +142,7 @@ public static bool EqualsSettingTo(this RecSettingData src, RecSettingData dest,
{
if (src == null || dest == null) return false;
return src.BatFilePath == dest.BatFilePath
&& src.RecTag == dest.RecTag
&& src.ContinueRecFlag == dest.ContinueRecFlag
&& (src.EndMargine == dest.EndMargine || src.UseMargineFlag == 0)//マージンデフォルト時
&& src.PartialRecFlag == dest.PartialRecFlag
Expand Down
1 change: 1 addition & 0 deletions EpgTimer/EpgTimer/DefineClass/EpgAutoDataItem.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,7 @@ public String SearchInfoText
}

view += "録画実行bat : " + EpgAutoAddInfo.recSetting.BatFilePath + "\r\n";
view += "録画タグ : " + EpgAutoAddInfo.recSetting.RecTag + "\r\n";

if (EpgAutoAddInfo.recSetting.RecFolderList.Count == 0)
{
Expand Down
Loading

0 comments on commit e9171dd

Please sign in to comment.