Merge branch 'master' of https://github.com/tildearrow/furnace into es5506_alt
* 'master' of https://github.com/tildearrow/furnace: (77 commits) GUI: use pattern font for input latch GUI: partially implement note input latch UI GUI: transpose value does not transpose effect ID GUI: prepare for note input latch UI GUI: min ins selector width fix GUI: separate operation masks GUI: add missing FDS preset GUI: prepare for separate operation mask GUI: "none" instrument should not remove inscolumn GUI: fix ins 0 being inserted on blank song GUI: add a "none" option to instrument list update to-do list GUI: add "absorb" instrument input mode use good default instrument when adding ins better default instrument for OPL/OPLL GUI: fix selection being visible in dummy row area Further fix looped sample preview GUI: fix about screen in power saving mode VRC6: saw volume 63 GUI: add an effect list window ... # Conflicts: # src/engine/platform/amiga.cpp # src/engine/vgmOps.cpp # src/gui/dataList.cpp # src/gui/guiConst.cpp # src/gui/insEdit.cpp # src/gui/sampleEdit.cpp
This commit is contained in:
commit
49a41ff862
116 changed files with 2535 additions and 993 deletions
|
|
@ -18,8 +18,8 @@
|
|||
*/
|
||||
|
||||
// guiConst: constants used in the GUI like arrays, strings and other stuff
|
||||
#include "guiConst.h"
|
||||
#include "gui.h"
|
||||
#include "guiConst.h"
|
||||
#include "../engine/song.h"
|
||||
|
||||
const int opOrder[4]={
|
||||
|
|
@ -146,6 +146,60 @@ const char* loopMode[DIV_SAMPLE_LOOPMODE_MAX]={
|
|||
"Pingpong"
|
||||
};
|
||||
|
||||
const FurnaceGUIColors fxColors[16]={
|
||||
GUI_COLOR_PATTERN_EFFECT_MISC, // 00
|
||||
GUI_COLOR_PATTERN_EFFECT_PITCH, // 01
|
||||
GUI_COLOR_PATTERN_EFFECT_PITCH, // 02
|
||||
GUI_COLOR_PATTERN_EFFECT_PITCH, // 03
|
||||
GUI_COLOR_PATTERN_EFFECT_PITCH, // 04
|
||||
GUI_COLOR_PATTERN_EFFECT_VOLUME, // 05
|
||||
GUI_COLOR_PATTERN_EFFECT_VOLUME, // 06
|
||||
GUI_COLOR_PATTERN_EFFECT_VOLUME, // 07
|
||||
GUI_COLOR_PATTERN_EFFECT_PANNING, // 08
|
||||
GUI_COLOR_PATTERN_EFFECT_SPEED, // 09
|
||||
GUI_COLOR_PATTERN_EFFECT_VOLUME, // 0A
|
||||
GUI_COLOR_PATTERN_EFFECT_SONG, // 0B
|
||||
GUI_COLOR_PATTERN_EFFECT_TIME, // 0C
|
||||
GUI_COLOR_PATTERN_EFFECT_SONG, // 0D
|
||||
GUI_COLOR_PATTERN_EFFECT_INVALID, // 0E
|
||||
GUI_COLOR_PATTERN_EFFECT_SPEED, // 0F
|
||||
};
|
||||
|
||||
const FurnaceGUIColors extFxColors[32]={
|
||||
GUI_COLOR_PATTERN_EFFECT_MISC, // E0
|
||||
GUI_COLOR_PATTERN_EFFECT_PITCH, // E1
|
||||
GUI_COLOR_PATTERN_EFFECT_PITCH, // E2
|
||||
GUI_COLOR_PATTERN_EFFECT_MISC, // E3
|
||||
GUI_COLOR_PATTERN_EFFECT_MISC, // E4
|
||||
GUI_COLOR_PATTERN_EFFECT_PITCH, // E5
|
||||
GUI_COLOR_PATTERN_EFFECT_INVALID, // E6
|
||||
GUI_COLOR_PATTERN_EFFECT_INVALID, // E7
|
||||
GUI_COLOR_PATTERN_EFFECT_INVALID, // E8
|
||||
GUI_COLOR_PATTERN_EFFECT_INVALID, // E9
|
||||
GUI_COLOR_PATTERN_EFFECT_MISC, // EA
|
||||
GUI_COLOR_PATTERN_EFFECT_MISC, // EB
|
||||
GUI_COLOR_PATTERN_EFFECT_TIME, // EC
|
||||
GUI_COLOR_PATTERN_EFFECT_TIME, // ED
|
||||
GUI_COLOR_PATTERN_EFFECT_SONG, // EE
|
||||
GUI_COLOR_PATTERN_EFFECT_SONG, // EF
|
||||
GUI_COLOR_PATTERN_EFFECT_SPEED, // F0
|
||||
GUI_COLOR_PATTERN_EFFECT_PITCH, // F1
|
||||
GUI_COLOR_PATTERN_EFFECT_PITCH, // F2
|
||||
GUI_COLOR_PATTERN_EFFECT_VOLUME, // F3
|
||||
GUI_COLOR_PATTERN_EFFECT_VOLUME, // F4
|
||||
GUI_COLOR_PATTERN_EFFECT_INVALID, // F5
|
||||
GUI_COLOR_PATTERN_EFFECT_INVALID, // F6
|
||||
GUI_COLOR_PATTERN_EFFECT_INVALID, // F7
|
||||
GUI_COLOR_PATTERN_EFFECT_VOLUME, // F8
|
||||
GUI_COLOR_PATTERN_EFFECT_VOLUME, // F9
|
||||
GUI_COLOR_PATTERN_EFFECT_VOLUME, // FA
|
||||
GUI_COLOR_PATTERN_EFFECT_INVALID, // FB
|
||||
GUI_COLOR_PATTERN_EFFECT_INVALID, // FC
|
||||
GUI_COLOR_PATTERN_EFFECT_INVALID, // FD
|
||||
GUI_COLOR_PATTERN_EFFECT_INVALID, // FE
|
||||
GUI_COLOR_PATTERN_EFFECT_SONG, // FF
|
||||
};
|
||||
|
||||
#define D FurnaceGUIActionDef
|
||||
#define NOT_AN_ACTION -1
|
||||
|
||||
|
|
@ -175,6 +229,7 @@ const FurnaceGUIActionDef guiActions[GUI_ACTION_MAX]={
|
|||
D("REPEAT_PATTERN", "Toggle repeat pattern", 0),
|
||||
D("FOLLOW_ORDERS", "Follow orders", 0),
|
||||
D("FOLLOW_PATTERN", "Follow pattern", 0),
|
||||
D("FULLSCREEN", "Toggle full-screen", SDLK_F11),
|
||||
D("PANIC", "Panic", SDLK_F12),
|
||||
|
||||
D("WINDOW_EDIT_CONTROLS", "Edit Controls", 0),
|
||||
|
|
@ -200,6 +255,7 @@ const FurnaceGUIActionDef guiActions[GUI_ACTION_MAX]={
|
|||
D("WINDOW_CHANNELS", "Channels", 0),
|
||||
D("WINDOW_REGISTER_VIEW", "Register View", 0),
|
||||
D("WINDOW_LOG", "Log Viewer", 0),
|
||||
D("EFFECT_LIST", "Effect List", 0),
|
||||
|
||||
D("COLLAPSE_WINDOW", "Collapse/expand current window", 0),
|
||||
D("CLOSE_WINDOW", "Close current window", FURKMOD_SHIFT|SDLK_ESCAPE),
|
||||
|
|
@ -210,6 +266,10 @@ const FurnaceGUIActionDef guiActions[GUI_ACTION_MAX]={
|
|||
D("PAT_NOTE_DOWN", "Transpose (-1)", FURKMOD_CMD|SDLK_F1),
|
||||
D("PAT_OCTAVE_UP", "Transpose (+1 octave)", FURKMOD_CMD|SDLK_F4),
|
||||
D("PAT_OCTAVE_DOWN", "Transpose (-1 octave)", FURKMOD_CMD|SDLK_F3),
|
||||
D("PAT_VALUE_UP", "Increase values (+1)", FURKMOD_CMD|FURKMOD_SHIFT|SDLK_F2),
|
||||
D("PAT_VALUE_DOWN", "Increase values (-1)", FURKMOD_CMD|FURKMOD_SHIFT|SDLK_F1),
|
||||
D("PAT_VALUE_UP_COARSE", "Increase values (+16)", FURKMOD_CMD|FURKMOD_SHIFT|SDLK_F4),
|
||||
D("PAT_VALUE_DOWN_COARSE", "Increase values (-16)", FURKMOD_CMD|FURKMOD_SHIFT|SDLK_F3),
|
||||
D("PAT_SELECT_ALL", "Select all", FURKMOD_CMD|SDLK_a),
|
||||
D("PAT_CUT", "Cut", FURKMOD_CMD|SDLK_x),
|
||||
D("PAT_COPY", "Copy", FURKMOD_CMD|SDLK_c),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue