Skip to content
This repository has been archived by the owner on Dec 1, 2023. It is now read-only.

Commit

Permalink
Added Scale Editor Dialogue
Browse files Browse the repository at this point in the history
  • Loading branch information
@eulyderg
eulyderg committed Apr 14, 2021
1 parent a7da699 commit 824fb9b
Show file tree
Hide file tree
Showing 13 changed files with 492 additions and 54 deletions.
2 changes: 2 additions & 0 deletions Dn-FamiTracker.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,7 @@
<Manifest />
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="ScaleEditorDlg.cpp" />
<ClCompile Include="Source\APU\5E01.cpp" />
<ClCompile Include="Source\APU\FDS.cpp" />
<ClCompile Include="Source\APU\nsfplay\xgm\devices\Sound\5e01_apu.cpp" />
Expand Down Expand Up @@ -513,6 +514,7 @@ makehm /h /a afxhh.h IDW_,HIDW_,0x50000 "%(FullPath)" &gt;&gt; "hlp\HTMLDefines.
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">hlp\HTMLDefines.h;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">hlp\HTMLDefines.h;%(Outputs)</Outputs>
</CustomBuild>
<ClInclude Include="ScaleEditorDlg.h" />
<ClInclude Include="Source\APU\5E01.h" />
<ClInclude Include="Source\APU\ChannelLevelState.h" />
<ClInclude Include="Source\APU\FDS.h" />
Expand Down
6 changes: 6 additions & 0 deletions Dn-FamiTracker.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -774,6 +774,9 @@
<ClCompile Include="Source\Channels5E01.cpp">
<Filter>Source Files\Sound Driver\Channels</Filter>
</ClCompile>
<ClCompile Include="ScaleEditorDlg.cpp">
<Filter>Source Files\Dialog Boxes</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="Source\Exception.h">
Expand Down Expand Up @@ -1547,6 +1550,9 @@
<ClInclude Include="Source\Channels5E01.h">
<Filter>Header Files\Sound Driver Headers\Channels Headers</Filter>
</ClInclude>
<ClInclude Include="ScaleEditorDlg.h">
<Filter>Header Files\Dialog Boxes Headers</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="E-FamiTracker.rc">
Expand Down
162 changes: 127 additions & 35 deletions E-FamiTracker.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,6 @@ BEGIN
BUTTON ID_NEXT_SONG
SEPARATOR
BUTTON ID_FILE_GENERALSETTINGS
//SEPARATOR
//BUTTON ID_FILE_CREATE_NSF
END

IDR_INSTRUMENT_TOOLBAR TOOLBAR 16, 15
Expand Down Expand Up @@ -109,7 +107,6 @@ BEGIN
MENUITEM "&Save\tCtrl+S", ID_FILE_SAVE
MENUITEM "Save &As...", ID_FILE_SAVE_AS
MENUITEM SEPARATOR
// MENUITEM "Create NS&F...\tCtrl+E", ID_FILE_CREATE_NSF
MENUITEM "Create WA&V...\tCtrl+Shift+E", ID_FILE_CREATEWAV
MENUITEM SEPARATOR
MENUITEM "&Import Text...", ID_FILE_IMPORTTEXT
Expand Down Expand Up @@ -281,6 +278,8 @@ BEGIN
MENUITEM "Toggle &Edit Mode", ID_TRACKER_EDIT
MENUITEM "Set Ro&w Marker", ID_TRACKER_SET_MARKER
MENUITEM SEPARATOR
MENUITEM "Scale E&ditor...", ID_TRACKER_SCALEEDITOR
MENUITEM SEPARATOR
MENUITEM "&Toggle Channel", ID_TRACKER_TOGGLECHANNEL
MENUITEM "S&olo Channel", ID_TRACKER_SOLOCHANNEL
MENUITEM "To&ggle Chip", ID_TRACKER_TOGGLECHIP
Expand Down Expand Up @@ -321,17 +320,6 @@ BEGIN
MENUITEM "&Popup", ID_CONTROLPANEL_POPUP, INACTIVE
END
END
//POPUP "&Help"
//BEGIN
// //MENUITEM "&Help Topics\tF1", ID_HELP_FINDER
// //MENUITEM "&Effect Table", ID_HELP_EFFECTTABLE
// MENUITEM "&FAQ", ID_HELP_FAQ
// MENUITEM SEPARATOR
// MENUITEM "&Performance", ID_HELP_PERFORMANCE
// MENUITEM SEPARATOR
//MENUITEM "&About Dn-FamiTracker...", ID_APP_ABOUT
// //MENUITEM "Check for updates...", ID_HELP_VERSION_CHECK
//END
END

IDR_PATTERN_POPUP MENU
Expand Down Expand Up @@ -498,11 +486,9 @@ BEGIN
VK_BACK, ID_EDIT_UNDO, VIRTKEY, ALT, NOINVERT
"Z", ID_EDIT_UNDO, VIRTKEY, CONTROL, NOINVERT
VK_F4, ID_FILE_CLOSE, VIRTKEY, ALT, NOINVERT
// "E", ID_FILE_CREATE_NSF, VIRTKEY, CONTROL, NOINVERT
"N", ID_FILE_NEW, VIRTKEY, CONTROL, NOINVERT
"O", ID_FILE_OPEN, VIRTKEY, CONTROL, NOINVERT
"S", ID_FILE_SAVE, VIRTKEY, CONTROL, NOINVERT
// VK_F1, ID_HELP, VIRTKEY, NOINVERT
"K", ID_KRAID1, VIRTKEY, SHIFT, CONTROL, NOINVERT
"R", ID_KRAID2, VIRTKEY, SHIFT, CONTROL, NOINVERT
"A", ID_KRAID3, VIRTKEY, SHIFT, CONTROL, NOINVERT
Expand Down Expand Up @@ -1056,6 +1042,14 @@ BEGIN
TOPMARGIN, 7
BOTTOMMARGIN, 189
END

IDD_SCALE_EDITOR, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 116
TOPMARGIN, 7
BOTTOMMARGIN, 187
END
END
#endif // APSTUDIO_INVOKED

Expand Down Expand Up @@ -1616,7 +1610,7 @@ BEGIN
LTEXT "60 Hz",IDC_SPEED,112,11,26,12
END

IDD_PROPERTIES DIALOGEX 0, 0, 213, 333+14
IDD_PROPERTIES DIALOGEX 0, 0, 213, 347
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Module properties"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
Expand All @@ -1630,32 +1624,31 @@ BEGIN
PUSHBUTTON "Import file",IDC_SONG_IMPORT,138,97,60,14
LTEXT " Title",IDC_STATIC,14,135,17,12,SS_CENTERIMAGE
EDITTEXT IDC_SONGNAME,34,135,100,12,ES_AUTOHSCROLL
GROUPBOX "Expansion sound",IDC_STATIC,7,156,199,43+14
GROUPBOX "Expansion sound",IDC_STATIC,7,156,199,57
CONTROL "VRC6",IDC_EXPANSION_VRC6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,168,33,10
CONTROL "MMC5",IDC_EXPANSION_MMC5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,59,168,35,10
CONTROL "N163",IDC_EXPANSION_N163,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,106,168,33,10
CONTROL "FDS",IDC_EXPANSION_FDS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,182,29,10
CONTROL "VRC7",IDC_EXPANSION_VRC7,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,59,182,33,10
CONTROL "S5B",IDC_EXPANSION_S5B,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,106,182,30,10
CONTROL "AY8930", IDC_EXPANSION_AY8930, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 14, 196, 40, 10
CONTROL "SAA1099", IDC_EXPANSION_SAA1099, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 59, 196, 40, 10
CONTROL "5E01", IDC_EXPANSION_5E01, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 106, 196, 40, 10
CONTROL "AY8930",IDC_EXPANSION_AY8930,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,196,40,10
CONTROL "SAA1099",IDC_EXPANSION_SAA1099,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,59,196,40,10
CONTROL "5E01",IDC_EXPANSION_5E01,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,106,196,40,10
LTEXT "Channels: 1",IDC_CHANNELS_NR,150,168,51,8,WS_DISABLED
CONTROL "",IDC_CHANNELS,"msctls_trackbar32",TBS_AUTOTICKS | WS_DISABLED | WS_TABSTOP,145,180,51,13
GROUPBOX "Vibrato",IDC_STATIC,7,202+14,199,31
COMBOBOX IDC_VIBRATO,14,213+14,184,61,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
GROUPBOX "Pitch mode",IDC_STATIC,7,235+14,199,31
COMBOBOX IDC_COMBO_LINEARPITCH,14,246+14,184,61,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK",IDOK,95,312+14,53,14
PUSHBUTTON "Cancel",IDCANCEL,153,312+14,53,14
GROUPBOX "Vibrato",IDC_STATIC,7,216,199,31
COMBOBOX IDC_VIBRATO,14,227,184,61,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
GROUPBOX "Pitch mode",IDC_STATIC,7,249,199,31
COMBOBOX IDC_COMBO_LINEARPITCH,14,260,184,61,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK",IDOK,95,326,53,14
PUSHBUTTON "Cancel",IDCANCEL,153,326,53,14
GROUPBOX "Song editor",IDC_STATIC,7,7,199,147
GROUPBOX "N163 level offset",IDC_STATIC,7,268+14,199,40
CONTROL "",IDC_N163_OFFSET_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | TBS_BOTH | WS_DISABLED | WS_TABSTOP,9,278+14,146,24
EDITTEXT IDC_N163_OFFSET_EDIT,156,285+14,31,14,ES_AUTOHSCROLL | WS_DISABLED
RTEXT "dB",IDC_N163_OFFSET_DB,190,287+14,8,8,WS_DISABLED
GROUPBOX "N163 level offset",IDC_STATIC,7,282,199,40
CONTROL "",IDC_N163_OFFSET_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | TBS_BOTH | WS_DISABLED | WS_TABSTOP,9,292,146,24
EDITTEXT IDC_N163_OFFSET_EDIT,156,299,31,14,ES_AUTOHSCROLL | WS_DISABLED
RTEXT "dB",IDC_N163_OFFSET_DB,190,301,8,8,WS_DISABLED
END


IDD_WAVE_PROGRESS DIALOGEX 0, 0, 220, 111
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Creating WAV..."
Expand Down Expand Up @@ -1760,8 +1753,7 @@ BEGIN
EDITTEXT IDC_EDIT_GROOVE_DENOM,255,54,17,14,ES_AUTOHSCROLL | ES_NUMBER
PUSHBUTTON "Pad",IDC_BUTTON_GROOVE_PAD,175,72,46,14
EDITTEXT IDC_EDIT_GROOVE_PAD,228,72,45,14,ES_AUTOHSCROLL
CONTROL "",IDC_SPIN_PAD,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,2
,72,10,14
CONTROL "",IDC_SPIN_PAD,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,2,72,10,14
LTEXT "Speed: 6.000",IDC_STATIC_GROOVE_AVERAGE,176,91,46,8
LTEXT "Size: 0 bytes",IDC_STATIC_GROOVE_SIZE,228,91,45,8
PUSHBUTTON "Copy Fxx",IDC_BUTTON_GROOVE_COPY,123,105,45,14
Expand Down Expand Up @@ -2020,6 +2012,35 @@ BEGIN
CONTROL "Do not remind me again.",IDC_UPDATE_REMIND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,156,213,10
END

IDD_SCALE_EDITOR DIALOGEX 0, 0, 123, 194
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Scale Editor"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
DEFPUSHBUTTON "OK",IDOK,60,6,54,14
PUSHBUTTON "Cancel",IDCANCEL,60,24,54,14
GROUPBOX "Notes",IDC_STATIC,6,0,48,168,BS_FLAT
CTEXT "C",IDC_STATIC,12,48,12,12,SS_CENTERIMAGE
CTEXT "A",IDC_STATIC,12,12,12,12,SS_CENTERIMAGE
CTEXT "A",IDC_SCALE_TEXT_AB,12,24,12,12,SS_CENTERIMAGE
PUSHBUTTON "#",IDC_SCALE_BUTTON_AB,24,24,13,12,BS_FLAT
CTEXT "B",IDC_STATIC,12,36,12,12,SS_CENTERIMAGE
PUSHBUTTON "#",IDC_SCALE_BUTTON_CD,24,60,13,12,BS_FLAT
CTEXT "C",IDC_SCALE_TEXT_CD,12,60,12,12,SS_CENTERIMAGE
CTEXT "D",IDC_STATIC,12,72,12,12,SS_CENTERIMAGE
CTEXT "D",IDC_SCALE_TEXT_DE,12,84,12,12,SS_CENTERIMAGE
PUSHBUTTON "#",IDC_SCALE_BUTTON_DE,24,84,13,12,BS_FLAT
CTEXT "E",IDC_STATIC,12,96,12,12,SS_CENTERIMAGE
CTEXT "F",IDC_STATIC,12,108,12,12,SS_CENTERIMAGE
CTEXT "F",IDC_SCALE_TEXT_FG,12,121,12,12,SS_CENTERIMAGE
PUSHBUTTON "#",IDC_SCALE_BUTTON_FG,24,121,13,12,BS_FLAT
CTEXT "G",IDC_STATIC,12,132,12,12,SS_CENTERIMAGE
CTEXT "G",IDC_SCALE_TEXT_GA,12,145,12,12,SS_CENTERIMAGE
PUSHBUTTON "#",IDC_SCALE_BUTTON_GA,24,145,13,12,BS_FLAT
COMBOBOX IDC_SCALE_KEY,6,174,30,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
COMBOBOX IDC_SCALE_SCALE,42,174,72,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
END


/////////////////////////////////////////////////////////////////////////////
//
Expand Down Expand Up @@ -2180,6 +2201,67 @@ BEGIN
0
END

IDD_SCALE_EDITOR DLGINIT
BEGIN
IDC_SCALE_KEY, 0x403, 2, 0
0x0041,
IDC_SCALE_KEY, 0x403, 3, 0
0x2341, "\000"
IDC_SCALE_KEY, 0x403, 3, 0
0x6242, "\000"
IDC_SCALE_KEY, 0x403, 2, 0
0x0042,
IDC_SCALE_KEY, 0x403, 2, 0
0x0043,
IDC_SCALE_KEY, 0x403, 3, 0
0x2343, "\000"
IDC_SCALE_KEY, 0x403, 3, 0
0x6244, "\000"
IDC_SCALE_KEY, 0x403, 2, 0
0x0044,
IDC_SCALE_KEY, 0x403, 3, 0
0x2344, "\000"
IDC_SCALE_KEY, 0x403, 3, 0
0x6245, "\000"
IDC_SCALE_KEY, 0x403, 2, 0
0x0045,
IDC_SCALE_KEY, 0x403, 2, 0
0x0046,
IDC_SCALE_KEY, 0x403, 3, 0
0x2346, "\000"
IDC_SCALE_KEY, 0x403, 3, 0
0x6247, "\000"
IDC_SCALE_KEY, 0x403, 2, 0
0x0047,
IDC_SCALE_KEY, 0x403, 3, 0
0x2347, "\000"
IDC_SCALE_KEY, 0x403, 3, 0
0x6241, "\000"
IDC_SCALE_SCALE, 0x403, 6, 0
0x614d, 0x6f6a, 0x0072,
IDC_SCALE_SCALE, 0x403, 6, 0
0x694d, 0x6f6e, 0x0072,
IDC_SCALE_SCALE, 0x403, 15, 0
0x6148, 0x6d72, 0x6e6f, 0x6369, 0x6d20, 0x6e69, 0x726f, "\000"
IDC_SCALE_SCALE, 0x403, 14, 0
0x654d, 0x6f6c, 0x6964, 0x2063, 0x696d, 0x6f6e, 0x0072,
IDC_SCALE_SCALE, 0x403, 7, 0
0x6f49, 0x696e, 0x6e61, "\000"
IDC_SCALE_SCALE, 0x403, 7, 0
0x6f44, 0x6972, 0x6e61, "\000"
IDC_SCALE_SCALE, 0x403, 9, 0
0x6850, 0x7972, 0x6967, 0x6e61, "\000"
IDC_SCALE_SCALE, 0x403, 7, 0
0x794c, 0x6964, 0x6e61, "\000"
IDC_SCALE_SCALE, 0x403, 11, 0
0x694d, 0x6f78, 0x796c, 0x6964, 0x6e61, "\000"
IDC_SCALE_SCALE, 0x403, 8, 0
0x6541, 0x6c6f, 0x6169, 0x006e,
IDC_SCALE_SCALE, 0x403, 8, 0
0x6f4c, 0x7263, 0x6169, 0x006e,
0
END


/////////////////////////////////////////////////////////////////////////////
//
Expand Down Expand Up @@ -2396,6 +2478,11 @@ BEGIN
0
END

IDD_SCALE_EDITOR AFX_DIALOG_LAYOUT
BEGIN
0
END


/////////////////////////////////////////////////////////////////////////////
//
Expand Down Expand Up @@ -2454,7 +2541,7 @@ END
STRINGTABLE
BEGIN
AFX_IDS_APP_TITLE "0CC-FamiTracker"
AFX_IDS_IDLEMESSAGE "E-FamiTracker 0.0.1.4.0Ba"
AFX_IDS_IDLEMESSAGE "Welcome to E-FamiTracker!"
AFX_IDS_HELPMODEMESSAGE "Select an object on which to get Help"
END

Expand Down Expand Up @@ -2931,6 +3018,11 @@ BEGIN
ID_SELECT_OTHER "Restore the current selection in the inactive editor window\nSelect in Other Editor"
END

STRINGTABLE
BEGIN
ID_TRACKER_SCALEEDITOR "Edit sharps and flats of each note\nScale Editor..."
END

STRINGTABLE
BEGIN
IDS_FIND_BEGIN "Begin"
Expand Down
Loading

0 comments on commit 824fb9b

Please sign in to comment.