Skip to content
This repository was archived by the owner on Aug 22, 2022. It is now read-only.

Commit 1977464

Browse files
XyLe-GBPXyLe-GBP
committed
Update version 1.1.1
1 parent 1c128d4 commit 1977464

File tree

3 files changed

+224
-176
lines changed

3 files changed

+224
-176
lines changed

‎ATRACTool/AT3Dlg.cpp‎

Lines changed: 69 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -86,110 +86,113 @@ BOOL AT3Dlg::OnInitDialog()
8686
CButton* RADIO1 = (CButton*)GetDlgItem(IDC_RADIO_CH1);
8787
CButton* RADIO2 = (CButton*)GetDlgItem(IDC_RADIO_CH2);
8888

89-
if (bitrate == 0) {
89+
switch (bitrate)
90+
{
91+
case 0:
9092
m_hBitrate.SetCurSel(0);
9193
CheckRadioButton(IDC_RADIO_CH1, IDC_RADIO_CH2, IDC_RADIO_CH1);
9294
RADIO1->EnableWindow(TRUE);
9395
RADIO2->EnableWindow(FALSE);
9496
BITRATE = _T(" -br 32");
95-
}
96-
else if (bitrate == 1) {
97+
break;
98+
case 1:
9799
m_hBitrate.SetCurSel(1);
98100
CheckRadioButton(IDC_RADIO_CH1, IDC_RADIO_CH2, IDC_RADIO_CH2);
99101
RADIO1->EnableWindow(TRUE);
100102
RADIO2->EnableWindow(TRUE);
101103
BITRATE = _T(" -br 48");
102-
}
103-
else if (bitrate == 2) {
104+
break;
105+
case 2:
104106
m_hBitrate.SetCurSel(2);
105107
CheckRadioButton(IDC_RADIO_CH1, IDC_RADIO_CH2, IDC_RADIO_CH1);
106108
RADIO1->EnableWindow(TRUE);
107109
RADIO2->EnableWindow(FALSE);
108110
BITRATE = _T(" -br 52");
109-
}
110-
else if (bitrate == 3) {
111+
break;
112+
case 3:
111113
m_hBitrate.SetCurSel(3);
112114
CheckRadioButton(IDC_RADIO_CH1, IDC_RADIO_CH2, IDC_RADIO_CH2);
113115
RADIO1->EnableWindow(TRUE);
114116
RADIO2->EnableWindow(TRUE);
115117
BITRATE = _T(" -br 64");
116-
}
117-
else if (bitrate == 4) {
118+
break;
119+
case 4:
118120
m_hBitrate.SetCurSel(4);
119121
CheckRadioButton(IDC_RADIO_CH1, IDC_RADIO_CH2, IDC_RADIO_CH2);
120122
RADIO1->EnableWindow(TRUE);
121123
RADIO2->EnableWindow(TRUE);
122124
BITRATE = _T(" -br 66");
123-
}
124-
else if (bitrate == 5) {
125+
break;
126+
case 5:
125127
m_hBitrate.SetCurSel(5);
126128
CheckRadioButton(IDC_RADIO_CH1, IDC_RADIO_CH2, IDC_RADIO_CH2);
127129
RADIO1->EnableWindow(TRUE);
128130
RADIO2->EnableWindow(TRUE);
129131
BITRATE = _T(" -br 96");
130-
}
131-
else if (bitrate == 6) {
132+
break;
133+
case 6:
132134
m_hBitrate.SetCurSel(6);
133135
CheckRadioButton(IDC_RADIO_CH1, IDC_RADIO_CH2, IDC_RADIO_CH2);
134136
RADIO1->EnableWindow(FALSE);
135137
RADIO2->EnableWindow(TRUE);
136138
BITRATE = _T(" -br 105");
137-
}
138-
else if (bitrate == 7) {
139+
break;
140+
case 7:
139141
m_hBitrate.SetCurSel(7);
140142
CheckRadioButton(IDC_RADIO_CH1, IDC_RADIO_CH2, IDC_RADIO_CH2);
141143
RADIO1->EnableWindow(TRUE);
142144
RADIO2->EnableWindow(TRUE);
143145
BITRATE = _T(" -br 128");
144-
}
145-
else if (bitrate == 8) {
146+
break;
147+
case 8:
146148
m_hBitrate.SetCurSel(8);
147149
CheckRadioButton(IDC_RADIO_CH1, IDC_RADIO_CH2, IDC_RADIO_CH2);
148150
RADIO1->EnableWindow(FALSE);
149151
RADIO2->EnableWindow(TRUE);
150152
BITRATE = _T(" -br 132");
151-
}
152-
else if (bitrate == 9) {
153+
break;
154+
case 9:
153155
m_hBitrate.SetCurSel(9);
154156
CheckRadioButton(IDC_RADIO_CH1, IDC_RADIO_CH2, IDC_RADIO_CH2);
155157
RADIO1->EnableWindow(FALSE);
156158
RADIO2->EnableWindow(TRUE);
157159
BITRATE = _T(" -br 160");
158-
}
159-
else if (bitrate == 10) {
160+
break;
161+
case 10:
160162
m_hBitrate.SetCurSel(10);
161163
CheckRadioButton(IDC_RADIO_CH1, IDC_RADIO_CH2, IDC_RADIO_CH2);
162164
RADIO1->EnableWindow(FALSE);
163165
RADIO2->EnableWindow(TRUE);
164166
BITRATE = _T(" -br 192");
165-
}
166-
else if (bitrate == 11) {
167+
break;
168+
case 11:
167169
m_hBitrate.SetCurSel(11);
168170
CheckRadioButton(IDC_RADIO_CH1, IDC_RADIO_CH2, IDC_RADIO_CH2);
169171
RADIO1->EnableWindow(FALSE);
170172
RADIO2->EnableWindow(TRUE);
171173
BITRATE = _T(" -br 256");
172-
}
173-
else if (bitrate == 12) {
174+
break;
175+
case 12:
174176
m_hBitrate.SetCurSel(12);
175177
CheckRadioButton(IDC_RADIO_CH1, IDC_RADIO_CH2, IDC_RADIO_CH2);
176178
RADIO1->EnableWindow(FALSE);
177179
RADIO2->EnableWindow(TRUE);
178180
BITRATE = _T(" -br 320");
179-
}
180-
else if (bitrate == 13) {
181+
break;
182+
case 13:
181183
m_hBitrate.SetCurSel(13);
182184
CheckRadioButton(IDC_RADIO_CH1, IDC_RADIO_CH2, IDC_RADIO_CH2);
183185
RADIO1->EnableWindow(FALSE);
184186
RADIO2->EnableWindow(TRUE);
185187
BITRATE = _T(" -br 352");
186-
}
187-
else {
188+
break;
189+
default:
188190
m_hBitrate.SetCurSel(11);
189191
CheckRadioButton(IDC_RADIO_CH1, IDC_RADIO_CH2, IDC_RADIO_CH2);
190192
RADIO1->EnableWindow(FALSE);
191193
RADIO2->EnableWindow(TRUE);
192194
BITRATE = _T(" -br 256");
195+
break;
193196
}
194197

195198
CButton* CHECK_LOOPPOINT = (CButton*)GetDlgItem(IDC_CHECK_LOOPPOINT);
@@ -295,18 +298,18 @@ void AT3Dlg::OnBnClickedOk()
295298

296299
if (CHECK_LOOPPOINT->GetCheck() == BST_CHECKED) {
297300
if (EDIT_LOOPSTART->GetWindowTextLength() < 1) {
298-
MessageBox(_T("LoopStartの値が無効です。"), _T("エラー"), MB_ICONERROR | MB_OK);
301+
MessageBox(_T("LoopStartのサンプル値が無効です。"), _T("エラー"), MB_ICONERROR | MB_OK);
299302
return;
300303
}
301304
if (EDIT_LOOPEND->GetWindowTextLength() < 1) {
302-
MessageBox(_T("LoopEndの値が無効です。"), _T("エラー"), MB_ICONERROR | MB_OK);
305+
MessageBox(_T("LoopEndのサンプル値が無効です。"), _T("エラー"), MB_ICONERROR | MB_OK);
303306
return;
304307
}
305308
}
306309

307310
if (CHECK_PARTLOOP->GetCheck() == BST_CHECKED) {
308311
if (EDIT_LOOPPART->GetWindowTextLength() == 0) {
309-
MessageBox(_T("LoopPartの値が無効です。"), _T("エラー"), MB_ICONERROR | MB_OK);
312+
MessageBox(_T("LoopPartの回数値が無効です。"), _T("エラー"), MB_ICONERROR | MB_OK);
310313
return;
311314
}
312315
}
@@ -385,110 +388,115 @@ void AT3Dlg::OnCbnSelchangeComboBitrate()
385388
CComboBox* BIT = (CComboBox*)GetDlgItem(IDC_COMBO_BITRATE);
386389
CButton* RADIO1 = (CButton*)GetDlgItem(IDC_RADIO_CH1);
387390
CButton* RADIO2 = (CButton*)GetDlgItem(IDC_RADIO_CH2);
388-
if (BIT->GetCurSel() == 0) { // 32k
391+
392+
switch (BIT->GetCurSel())
393+
{
394+
case 0:
389395
CheckRadioButton(IDC_RADIO_CH1, IDC_RADIO_CH2, IDC_RADIO_CH1);
390396
RADIO1->EnableWindow(TRUE);
391397
RADIO2->EnableWindow(FALSE);
392398
BITRATE = _T(" -br 32");
393399
OutputDebugString(_T("Set bitrate: 32[kbps]\n"));
394-
}
395-
else if (BIT->GetCurSel() == 1) { // 48k
400+
break;
401+
case 1:
396402
CheckRadioButton(IDC_RADIO_CH1, IDC_RADIO_CH2, IDC_RADIO_CH2);
397403
RADIO1->EnableWindow(TRUE);
398404
RADIO2->EnableWindow(TRUE);
399405
BITRATE = _T(" -br 48");
400406
OutputDebugString(_T("Set bitrate: 48[kbps]\n"));
401-
}
402-
else if (BIT->GetCurSel() == 2) { // 52k
407+
break;
408+
case 2:
403409
CheckRadioButton(IDC_RADIO_CH1, IDC_RADIO_CH2, IDC_RADIO_CH1);
404410
RADIO1->EnableWindow(TRUE);
405411
RADIO2->EnableWindow(FALSE);
406412
BITRATE = _T(" -br 52");
407413
OutputDebugString(_T("Set bitrate: 52[kbps]\n"));
408-
}
409-
else if (BIT->GetCurSel() == 3) { // 64k
414+
break;
415+
case 3:
410416
CheckRadioButton(IDC_RADIO_CH1, IDC_RADIO_CH2, IDC_RADIO_CH2);
411417
RADIO1->EnableWindow(TRUE);
412418
RADIO2->EnableWindow(TRUE);
413419
BITRATE = _T(" -br 64");
414420
OutputDebugString(_T("Set bitrate: 64[kbps]\n"));
415-
}
416-
else if (BIT->GetCurSel() == 4) { // 66k
421+
break;
422+
case 4:
417423
CheckRadioButton(IDC_RADIO_CH1, IDC_RADIO_CH2, IDC_RADIO_CH2);
418424
RADIO1->EnableWindow(TRUE);
419425
RADIO2->EnableWindow(TRUE);
420426
BITRATE = _T(" -br 66");
421427
OutputDebugString(_T("Set bitrate: 66[kbps]\n"));
422-
}
423-
else if (BIT->GetCurSel() == 5) { // 96k
428+
break;
429+
case 5:
424430
CheckRadioButton(IDC_RADIO_CH1, IDC_RADIO_CH2, IDC_RADIO_CH2);
425431
RADIO1->EnableWindow(TRUE);
426432
RADIO2->EnableWindow(TRUE);
427433
BITRATE = _T(" -br 96");
428434
OutputDebugString(_T("Set bitrate: 96[kbps]\n"));
429-
}
430-
else if (BIT->GetCurSel() == 6) { // 105k
435+
break;
436+
case 6:
431437
CheckRadioButton(IDC_RADIO_CH1, IDC_RADIO_CH2, IDC_RADIO_CH2);
432438
RADIO1->EnableWindow(FALSE);
433439
RADIO2->EnableWindow(TRUE);
434440
BITRATE = _T(" -br 105");
435441
OutputDebugString(_T("Set bitrate: 105[kbps]\n"));
436-
}
437-
else if (BIT->GetCurSel() == 7) { // 128k
442+
break;
443+
case 7:
438444
CheckRadioButton(IDC_RADIO_CH1, IDC_RADIO_CH2, IDC_RADIO_CH2);
439445
RADIO1->EnableWindow(TRUE);
440446
RADIO2->EnableWindow(TRUE);
441447
BITRATE = _T(" -br 128");
442448
OutputDebugString(_T("Set bitrate: 128[kbps]\n"));
443-
}
444-
else if (BIT->GetCurSel() == 8) { // 132k
449+
break;
450+
case 8:
445451
CheckRadioButton(IDC_RADIO_CH1, IDC_RADIO_CH2, IDC_RADIO_CH2);
446452
RADIO1->EnableWindow(FALSE);
447453
RADIO2->EnableWindow(TRUE);
448454
BITRATE = _T(" -br 132");
449455
OutputDebugString(_T("Set bitrate: 132[kbps]\n"));
450-
}
451-
else if (BIT->GetCurSel() == 9) { // 160k
456+
break;
457+
case 9:
452458
CheckRadioButton(IDC_RADIO_CH1, IDC_RADIO_CH2, IDC_RADIO_CH2);
453459
RADIO1->EnableWindow(FALSE);
454460
RADIO2->EnableWindow(TRUE);
455461
BITRATE = _T(" -br 160");
456462
OutputDebugString(_T("Set bitrate: 160[kbps]\n"));
457-
}
458-
else if (BIT->GetCurSel() == 10) { // 192k
463+
break;
464+
case 10:
459465
CheckRadioButton(IDC_RADIO_CH1, IDC_RADIO_CH2, IDC_RADIO_CH2);
460466
RADIO1->EnableWindow(FALSE);
461467
RADIO2->EnableWindow(TRUE);
462468
BITRATE = _T(" -br 192");
463469
OutputDebugString(_T("Set bitrate: 192[kbps]\n"));
464-
}
465-
else if (BIT->GetCurSel() == 11) { // 256k
470+
break;
471+
case 11:
466472
CheckRadioButton(IDC_RADIO_CH1, IDC_RADIO_CH2, IDC_RADIO_CH2);
467473
RADIO1->EnableWindow(FALSE);
468474
RADIO2->EnableWindow(TRUE);
469475
BITRATE = _T(" -br 256");
470476
OutputDebugString(_T("Set bitrate: 256[kbps]\n"));
471-
}
472-
else if (BIT->GetCurSel() == 12) { // 320k
477+
break;
478+
case 12:
473479
CheckRadioButton(IDC_RADIO_CH1, IDC_RADIO_CH2, IDC_RADIO_CH2);
474480
RADIO1->EnableWindow(FALSE);
475481
RADIO2->EnableWindow(TRUE);
476482
BITRATE = _T(" -br 320");
477483
OutputDebugString(_T("Set bitrate: 320[kbps]\n"));
478-
}
479-
else if (BIT->GetCurSel() == 13) { // 352k
484+
break;
485+
case 13:
480486
CheckRadioButton(IDC_RADIO_CH1, IDC_RADIO_CH2, IDC_RADIO_CH2);
481487
RADIO1->EnableWindow(FALSE);
482488
RADIO2->EnableWindow(TRUE);
483489
BITRATE = _T(" -br 352");
484490
OutputDebugString(_T("Set bitrate: 352[kbps]\n"));
485-
}
486-
else { // Error
491+
break;
492+
default:
487493
RADIO1->EnableWindow(FALSE);
488494
RADIO2->EnableWindow(FALSE);
489495
BITRATE = _T("");
490496
OutputDebugString(_T("Set bitrate: exception occured.\n"));
497+
break;
491498
}
499+
492500
CEdit* EDIT_PARAM = (CEdit*)GetDlgItem(IDC_EDIT3);
493501
EDIT_PARAM->SetWindowText(CMDPARAM = TOOL + BITRATE + LOOPFLAG + LOOPSTART + LOOPEND + WHOLELOOPFLAG + LOOPPARTFLAG + LOOPPART + _T(" $InFile $OutFile"));
494502
return;

0 commit comments

Comments
 (0)