dummy export window, keybind and related settings
This commit is contained in:
parent
8aabaf0e01
commit
df63257d11
|
|
@ -779,6 +779,7 @@ src/gui/doAction.cpp
|
||||||
src/gui/editing.cpp
|
src/gui/editing.cpp
|
||||||
src/gui/editControls.cpp
|
src/gui/editControls.cpp
|
||||||
src/gui/effectList.cpp
|
src/gui/effectList.cpp
|
||||||
|
src/gui/exportWin.cpp
|
||||||
src/gui/findReplace.cpp
|
src/gui/findReplace.cpp
|
||||||
src/gui/fmPreview.cpp
|
src/gui/fmPreview.cpp
|
||||||
src/gui/gradient.cpp
|
src/gui/gradient.cpp
|
||||||
|
|
|
||||||
|
|
@ -65,6 +65,9 @@ void FurnaceGUI::doAction(int what) {
|
||||||
case GUI_ACTION_SAVE_AS:
|
case GUI_ACTION_SAVE_AS:
|
||||||
openFileDialog(GUI_FILE_SAVE);
|
openFileDialog(GUI_FILE_SAVE);
|
||||||
break;
|
break;
|
||||||
|
case GUI_ACTION_EXPORT:
|
||||||
|
displayExport=true;
|
||||||
|
break;
|
||||||
case GUI_ACTION_UNDO:
|
case GUI_ACTION_UNDO:
|
||||||
if (curWindow==GUI_WINDOW_SAMPLE_EDIT) {
|
if (curWindow==GUI_WINDOW_SAMPLE_EDIT) {
|
||||||
doUndoSample();
|
doUndoSample();
|
||||||
|
|
|
||||||
24
src/gui/exportWin.cpp
Normal file
24
src/gui/exportWin.cpp
Normal file
|
|
@ -0,0 +1,24 @@
|
||||||
|
/**
|
||||||
|
* Furnace Tracker - multi-system chiptune tracker
|
||||||
|
* Copyright (C) 2021-2023 tildearrow and contributors
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License along
|
||||||
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "gui.h"
|
||||||
|
|
||||||
|
void FurnaceGUI::drawExport() {
|
||||||
|
if (ImGui::Button("dummy")) ImGui::CloseCurrentPopup();
|
||||||
|
}
|
||||||
358
src/gui/gui.cpp
358
src/gui/gui.cpp
|
|
@ -4081,197 +4081,203 @@ bool FurnaceGUI::loop() {
|
||||||
openFileDialog(GUI_FILE_SAVE_DMF_LEGACY);
|
openFileDialog(GUI_FILE_SAVE_DMF_LEGACY);
|
||||||
}
|
}
|
||||||
ImGui::Separator();
|
ImGui::Separator();
|
||||||
if (ImGui::BeginMenu("export audio...")) {
|
if (settings.classicExportOptions) {
|
||||||
exitDisabledTimer=1;
|
if (ImGui::BeginMenu("export audio...")) {
|
||||||
if (ImGui::MenuItem("one file")) {
|
exitDisabledTimer=1;
|
||||||
openFileDialog(GUI_FILE_EXPORT_AUDIO_ONE);
|
if (ImGui::MenuItem("one file")) {
|
||||||
|
openFileDialog(GUI_FILE_EXPORT_AUDIO_ONE);
|
||||||
|
}
|
||||||
|
if (ImGui::MenuItem("multiple files (one per chip)")) {
|
||||||
|
openFileDialog(GUI_FILE_EXPORT_AUDIO_PER_SYS);
|
||||||
|
}
|
||||||
|
if (ImGui::MenuItem("multiple files (one per channel)")) {
|
||||||
|
openFileDialog(GUI_FILE_EXPORT_AUDIO_PER_CHANNEL);
|
||||||
|
}
|
||||||
|
if (ImGui::InputInt("Loops",&exportLoops,1,2)) {
|
||||||
|
if (exportLoops<0) exportLoops=0;
|
||||||
|
}
|
||||||
|
if (ImGui::InputDouble("Fade out (seconds)",&exportFadeOut,1.0,2.0,"%.1f")) {
|
||||||
|
if (exportFadeOut<0.0) exportFadeOut=0.0;
|
||||||
|
}
|
||||||
|
ImGui::EndMenu();
|
||||||
}
|
}
|
||||||
if (ImGui::MenuItem("multiple files (one per chip)")) {
|
if (ImGui::BeginMenu("export VGM...")) {
|
||||||
openFileDialog(GUI_FILE_EXPORT_AUDIO_PER_SYS);
|
exitDisabledTimer=1;
|
||||||
}
|
ImGui::Text("settings:");
|
||||||
if (ImGui::MenuItem("multiple files (one per channel)")) {
|
if (ImGui::BeginCombo("format version",fmt::sprintf("%d.%.2x",vgmExportVersion>>8,vgmExportVersion&0xff).c_str())) {
|
||||||
openFileDialog(GUI_FILE_EXPORT_AUDIO_PER_CHANNEL);
|
for (int i=0; i<7; i++) {
|
||||||
}
|
if (ImGui::Selectable(fmt::sprintf("%d.%.2x",vgmVersions[i]>>8,vgmVersions[i]&0xff).c_str(),vgmExportVersion==vgmVersions[i])) {
|
||||||
if (ImGui::InputInt("Loops",&exportLoops,1,2)) {
|
vgmExportVersion=vgmVersions[i];
|
||||||
if (exportLoops<0) exportLoops=0;
|
}
|
||||||
}
|
|
||||||
if (ImGui::InputDouble("Fade out (seconds)",&exportFadeOut,1.0,2.0,"%.1f")) {
|
|
||||||
if (exportFadeOut<0.0) exportFadeOut=0.0;
|
|
||||||
}
|
|
||||||
ImGui::EndMenu();
|
|
||||||
}
|
|
||||||
if (ImGui::BeginMenu("export VGM...")) {
|
|
||||||
exitDisabledTimer=1;
|
|
||||||
ImGui::Text("settings:");
|
|
||||||
if (ImGui::BeginCombo("format version",fmt::sprintf("%d.%.2x",vgmExportVersion>>8,vgmExportVersion&0xff).c_str())) {
|
|
||||||
for (int i=0; i<7; i++) {
|
|
||||||
if (ImGui::Selectable(fmt::sprintf("%d.%.2x",vgmVersions[i]>>8,vgmVersions[i]&0xff).c_str(),vgmExportVersion==vgmVersions[i])) {
|
|
||||||
vgmExportVersion=vgmVersions[i];
|
|
||||||
}
|
}
|
||||||
|
ImGui::EndCombo();
|
||||||
}
|
}
|
||||||
ImGui::EndCombo();
|
ImGui::Checkbox("loop",&vgmExportLoop);
|
||||||
}
|
if (vgmExportLoop && e->song.loopModality==2) {
|
||||||
ImGui::Checkbox("loop",&vgmExportLoop);
|
ImGui::Text("loop trail:");
|
||||||
if (vgmExportLoop && e->song.loopModality==2) {
|
ImGui::Indent();
|
||||||
ImGui::Text("loop trail:");
|
if (ImGui::RadioButton("auto-detect",vgmExportTrailingTicks==-1)) {
|
||||||
ImGui::Indent();
|
vgmExportTrailingTicks=-1;
|
||||||
if (ImGui::RadioButton("auto-detect",vgmExportTrailingTicks==-1)) {
|
|
||||||
vgmExportTrailingTicks=-1;
|
|
||||||
}
|
|
||||||
if (ImGui::RadioButton("add one loop",vgmExportTrailingTicks==-2)) {
|
|
||||||
vgmExportTrailingTicks=-2;
|
|
||||||
}
|
|
||||||
if (ImGui::RadioButton("custom",vgmExportTrailingTicks>=0)) {
|
|
||||||
vgmExportTrailingTicks=0;
|
|
||||||
}
|
|
||||||
if (vgmExportTrailingTicks>=0) {
|
|
||||||
ImGui::SameLine();
|
|
||||||
if (ImGui::InputInt("##TrailTicks",&vgmExportTrailingTicks,1,100)) {
|
|
||||||
if (vgmExportTrailingTicks<0) vgmExportTrailingTicks=0;
|
|
||||||
}
|
}
|
||||||
|
if (ImGui::RadioButton("add one loop",vgmExportTrailingTicks==-2)) {
|
||||||
|
vgmExportTrailingTicks=-2;
|
||||||
|
}
|
||||||
|
if (ImGui::RadioButton("custom",vgmExportTrailingTicks>=0)) {
|
||||||
|
vgmExportTrailingTicks=0;
|
||||||
|
}
|
||||||
|
if (vgmExportTrailingTicks>=0) {
|
||||||
|
ImGui::SameLine();
|
||||||
|
if (ImGui::InputInt("##TrailTicks",&vgmExportTrailingTicks,1,100)) {
|
||||||
|
if (vgmExportTrailingTicks<0) vgmExportTrailingTicks=0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
ImGui::Unindent();
|
||||||
}
|
}
|
||||||
ImGui::Unindent();
|
ImGui::Checkbox("add pattern change hints",&vgmExportPatternHints);
|
||||||
}
|
if (ImGui::IsItemHovered()) {
|
||||||
ImGui::Checkbox("add pattern change hints",&vgmExportPatternHints);
|
ImGui::SetTooltip(
|
||||||
if (ImGui::IsItemHovered()) {
|
"inserts data blocks on pattern changes.\n"
|
||||||
ImGui::SetTooltip(
|
"useful if you are writing a playback routine.\n\n"
|
||||||
"inserts data blocks on pattern changes.\n"
|
|
||||||
"useful if you are writing a playback routine.\n\n"
|
|
||||||
|
|
||||||
"the format of a pattern change data block is:\n"
|
"the format of a pattern change data block is:\n"
|
||||||
"67 66 FE ll ll ll ll 01 oo rr pp pp pp ...\n"
|
"67 66 FE ll ll ll ll 01 oo rr pp pp pp ...\n"
|
||||||
"- ll: length, a 32-bit little-endian number\n"
|
"- ll: length, a 32-bit little-endian number\n"
|
||||||
"- oo: order\n"
|
"- oo: order\n"
|
||||||
"- rr: initial row (a 0Dxx effect is able to select a different row)\n"
|
"- rr: initial row (a 0Dxx effect is able to select a different row)\n"
|
||||||
"- pp: pattern index (one per channel)\n\n"
|
"- pp: pattern index (one per channel)\n\n"
|
||||||
|
|
||||||
"pattern indexes are ordered as they appear in the song."
|
"pattern indexes are ordered as they appear in the song."
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
ImGui::Checkbox("direct stream mode",&vgmExportDirectStream);
|
ImGui::Checkbox("direct stream mode",&vgmExportDirectStream);
|
||||||
if (ImGui::IsItemHovered()) {
|
if (ImGui::IsItemHovered()) {
|
||||||
ImGui::SetTooltip(
|
ImGui::SetTooltip(
|
||||||
"required for DualPCM and MSM6258 export.\n\n"
|
"required for DualPCM and MSM6258 export.\n\n"
|
||||||
"allows for volume/direction changes when playing samples,\n"
|
"allows for volume/direction changes when playing samples,\n"
|
||||||
"at the cost of a massive increase in file size."
|
"at the cost of a massive increase in file size."
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
ImGui::Text("chips to export:");
|
ImGui::Text("chips to export:");
|
||||||
bool hasOneAtLeast=false;
|
bool hasOneAtLeast=false;
|
||||||
for (int i=0; i<e->song.systemLen; i++) {
|
for (int i=0; i<e->song.systemLen; i++) {
|
||||||
int minVersion=e->minVGMVersion(e->song.system[i]);
|
int minVersion=e->minVGMVersion(e->song.system[i]);
|
||||||
ImGui::BeginDisabled(minVersion>vgmExportVersion || minVersion==0);
|
ImGui::BeginDisabled(minVersion>vgmExportVersion || minVersion==0);
|
||||||
ImGui::Checkbox(fmt::sprintf("%d. %s##_SYSV%d",i+1,getSystemName(e->song.system[i]),i).c_str(),&willExport[i]);
|
ImGui::Checkbox(fmt::sprintf("%d. %s##_SYSV%d",i+1,getSystemName(e->song.system[i]),i).c_str(),&willExport[i]);
|
||||||
ImGui::EndDisabled();
|
ImGui::EndDisabled();
|
||||||
if (minVersion>vgmExportVersion) {
|
if (minVersion>vgmExportVersion) {
|
||||||
if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled)) {
|
if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled)) {
|
||||||
ImGui::SetTooltip("this chip is only available in VGM %d.%.2x and higher!",minVersion>>8,minVersion&0xff);
|
ImGui::SetTooltip("this chip is only available in VGM %d.%.2x and higher!",minVersion>>8,minVersion&0xff);
|
||||||
|
}
|
||||||
|
} else if (minVersion==0) {
|
||||||
|
if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled)) {
|
||||||
|
ImGui::SetTooltip("this chip is not supported by the VGM format!");
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (willExport[i]) hasOneAtLeast=true;
|
||||||
}
|
}
|
||||||
} else if (minVersion==0) {
|
}
|
||||||
if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled)) {
|
ImGui::Text("select the chip you wish to export,");
|
||||||
ImGui::SetTooltip("this chip is not supported by the VGM format!");
|
ImGui::Text("but only up to %d of each type.",(vgmExportVersion>=0x151)?2:1);
|
||||||
|
if (hasOneAtLeast) {
|
||||||
|
if (ImGui::MenuItem("click to export")) {
|
||||||
|
openFileDialog(GUI_FILE_EXPORT_VGM);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (willExport[i]) hasOneAtLeast=true;
|
ImGui::Text("nothing to export");
|
||||||
}
|
|
||||||
}
|
|
||||||
ImGui::Text("select the chip you wish to export,");
|
|
||||||
ImGui::Text("but only up to %d of each type.",(vgmExportVersion>=0x151)?2:1);
|
|
||||||
if (hasOneAtLeast) {
|
|
||||||
if (ImGui::MenuItem("click to export")) {
|
|
||||||
openFileDialog(GUI_FILE_EXPORT_VGM);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
ImGui::Text("nothing to export");
|
|
||||||
}
|
|
||||||
ImGui::EndMenu();
|
|
||||||
}
|
|
||||||
int numZSMCompat=0;
|
|
||||||
for (int i=0; i<e->song.systemLen; i++) {
|
|
||||||
if ((e->song.system[i] == DIV_SYSTEM_VERA) || (e->song.system[i] == DIV_SYSTEM_YM2151)) numZSMCompat++;
|
|
||||||
}
|
|
||||||
if (numZSMCompat > 0) {
|
|
||||||
if (ImGui::BeginMenu("export ZSM...")) {
|
|
||||||
exitDisabledTimer=1;
|
|
||||||
ImGui::Text("Commander X16 Zsound Music File");
|
|
||||||
if (ImGui::InputInt("Tick Rate (Hz)",&zsmExportTickRate,1,2)) {
|
|
||||||
if (zsmExportTickRate<1) zsmExportTickRate=1;
|
|
||||||
if (zsmExportTickRate>44100) zsmExportTickRate=44100;
|
|
||||||
}
|
|
||||||
ImGui::Checkbox("loop",&zsmExportLoop);
|
|
||||||
ImGui::SameLine();
|
|
||||||
ImGui::Checkbox("optimize size",&zsmExportOptimize);
|
|
||||||
ImGui::SameLine();
|
|
||||||
if (ImGui::Button("Begin Export")) {
|
|
||||||
openFileDialog(GUI_FILE_EXPORT_ZSM);
|
|
||||||
ImGui::CloseCurrentPopup();
|
|
||||||
}
|
}
|
||||||
ImGui::EndMenu();
|
ImGui::EndMenu();
|
||||||
}
|
}
|
||||||
}
|
int numZSMCompat=0;
|
||||||
int numAmiga=0;
|
for (int i=0; i<e->song.systemLen; i++) {
|
||||||
for (int i=0; i<e->song.systemLen; i++) {
|
if ((e->song.system[i] == DIV_SYSTEM_VERA) || (e->song.system[i] == DIV_SYSTEM_YM2151)) numZSMCompat++;
|
||||||
if (e->song.system[i]==DIV_SYSTEM_AMIGA) numAmiga++;
|
}
|
||||||
}
|
if (numZSMCompat > 0) {
|
||||||
if (numAmiga && settings.iCannotWait) {
|
if (ImGui::BeginMenu("export ZSM...")) {
|
||||||
if (ImGui::BeginMenu("export Amiga validation data...")) {
|
exitDisabledTimer=1;
|
||||||
|
ImGui::Text("Commander X16 Zsound Music File");
|
||||||
|
if (ImGui::InputInt("Tick Rate (Hz)",&zsmExportTickRate,1,2)) {
|
||||||
|
if (zsmExportTickRate<1) zsmExportTickRate=1;
|
||||||
|
if (zsmExportTickRate>44100) zsmExportTickRate=44100;
|
||||||
|
}
|
||||||
|
ImGui::Checkbox("loop",&zsmExportLoop);
|
||||||
|
ImGui::SameLine();
|
||||||
|
ImGui::Checkbox("optimize size",&zsmExportOptimize);
|
||||||
|
ImGui::SameLine();
|
||||||
|
if (ImGui::Button("Begin Export")) {
|
||||||
|
openFileDialog(GUI_FILE_EXPORT_ZSM);
|
||||||
|
ImGui::CloseCurrentPopup();
|
||||||
|
}
|
||||||
|
ImGui::EndMenu();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
int numAmiga=0;
|
||||||
|
for (int i=0; i<e->song.systemLen; i++) {
|
||||||
|
if (e->song.system[i]==DIV_SYSTEM_AMIGA) numAmiga++;
|
||||||
|
}
|
||||||
|
if (numAmiga && settings.iCannotWait) {
|
||||||
|
if (ImGui::BeginMenu("export Amiga validation data...")) {
|
||||||
|
exitDisabledTimer=1;
|
||||||
|
ImGui::Text(
|
||||||
|
"this is NOT ROM export! only use for making sure the\n"
|
||||||
|
"Furnace Amiga emulator is working properly by\n"
|
||||||
|
"comparing it with real Amiga output."
|
||||||
|
);
|
||||||
|
ImGui::AlignTextToFramePadding();
|
||||||
|
ImGui::Text("Directory");
|
||||||
|
ImGui::SameLine();
|
||||||
|
ImGui::InputText("##AVDPath",&workingDirROMExport);
|
||||||
|
if (ImGui::Button("Bake Data")) {
|
||||||
|
std::vector<DivROMExportOutput> out=e->buildROM(DIV_ROM_AMIGA_VALIDATION);
|
||||||
|
if (workingDirROMExport.size()>0) {
|
||||||
|
if (workingDirROMExport[workingDirROMExport.size()-1]!=DIR_SEPARATOR) workingDirROMExport+=DIR_SEPARATOR_STR;
|
||||||
|
}
|
||||||
|
for (DivROMExportOutput& i: out) {
|
||||||
|
String path=workingDirROMExport+i.name;
|
||||||
|
FILE* outFile=ps_fopen(path.c_str(),"wb");
|
||||||
|
if (outFile!=NULL) {
|
||||||
|
fwrite(i.data->getFinalBuf(),1,i.data->size(),outFile);
|
||||||
|
fclose(outFile);
|
||||||
|
}
|
||||||
|
i.data->finish();
|
||||||
|
delete i.data;
|
||||||
|
}
|
||||||
|
showError(fmt::sprintf("Done! Baked %d files.",(int)out.size()));
|
||||||
|
ImGui::CloseCurrentPopup();
|
||||||
|
}
|
||||||
|
ImGui::EndMenu();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (ImGui::BeginMenu("export text...")) {
|
||||||
exitDisabledTimer=1;
|
exitDisabledTimer=1;
|
||||||
ImGui::Text(
|
ImGui::Text(
|
||||||
"this is NOT ROM export! only use for making sure the\n"
|
"this option exports the song to a text file.\n"
|
||||||
"Furnace Amiga emulator is working properly by\n"
|
|
||||||
"comparing it with real Amiga output."
|
|
||||||
);
|
);
|
||||||
ImGui::AlignTextToFramePadding();
|
if (ImGui::Button("export")) {
|
||||||
ImGui::Text("Directory");
|
openFileDialog(GUI_FILE_EXPORT_TEXT);
|
||||||
ImGui::SameLine();
|
|
||||||
ImGui::InputText("##AVDPath",&workingDirROMExport);
|
|
||||||
if (ImGui::Button("Bake Data")) {
|
|
||||||
std::vector<DivROMExportOutput> out=e->buildROM(DIV_ROM_AMIGA_VALIDATION);
|
|
||||||
if (workingDirROMExport.size()>0) {
|
|
||||||
if (workingDirROMExport[workingDirROMExport.size()-1]!=DIR_SEPARATOR) workingDirROMExport+=DIR_SEPARATOR_STR;
|
|
||||||
}
|
|
||||||
for (DivROMExportOutput& i: out) {
|
|
||||||
String path=workingDirROMExport+i.name;
|
|
||||||
FILE* outFile=ps_fopen(path.c_str(),"wb");
|
|
||||||
if (outFile!=NULL) {
|
|
||||||
fwrite(i.data->getFinalBuf(),1,i.data->size(),outFile);
|
|
||||||
fclose(outFile);
|
|
||||||
}
|
|
||||||
i.data->finish();
|
|
||||||
delete i.data;
|
|
||||||
}
|
|
||||||
showError(fmt::sprintf("Done! Baked %d files.",(int)out.size()));
|
|
||||||
ImGui::CloseCurrentPopup();
|
|
||||||
}
|
}
|
||||||
ImGui::EndMenu();
|
ImGui::EndMenu();
|
||||||
}
|
}
|
||||||
}
|
if (ImGui::BeginMenu("export command stream...")) {
|
||||||
if (ImGui::BeginMenu("export text...")) {
|
exitDisabledTimer=1;
|
||||||
exitDisabledTimer=1;
|
ImGui::Text(
|
||||||
ImGui::Text(
|
"this option exports a text or binary file which\n"
|
||||||
"this option exports the song to a text file.\n"
|
"contains a dump of the internal command stream\n"
|
||||||
);
|
"produced when playing the song.\n\n"
|
||||||
if (ImGui::Button("export")) {
|
|
||||||
openFileDialog(GUI_FILE_EXPORT_TEXT);
|
|
||||||
}
|
|
||||||
ImGui::EndMenu();
|
|
||||||
}
|
|
||||||
if (ImGui::BeginMenu("export command stream...")) {
|
|
||||||
exitDisabledTimer=1;
|
|
||||||
ImGui::Text(
|
|
||||||
"this option exports a text or binary file which\n"
|
|
||||||
"contains a dump of the internal command stream\n"
|
|
||||||
"produced when playing the song.\n\n"
|
|
||||||
|
|
||||||
"technical/development use only!"
|
"technical/development use only!"
|
||||||
);
|
);
|
||||||
if (ImGui::Button("export (binary)")) {
|
if (ImGui::Button("export (binary)")) {
|
||||||
openFileDialog(GUI_FILE_EXPORT_CMDSTREAM_BINARY);
|
openFileDialog(GUI_FILE_EXPORT_CMDSTREAM_BINARY);
|
||||||
|
}
|
||||||
|
if (ImGui::Button("export (text)")) {
|
||||||
|
openFileDialog(GUI_FILE_EXPORT_CMDSTREAM);
|
||||||
|
}
|
||||||
|
ImGui::EndMenu();
|
||||||
}
|
}
|
||||||
if (ImGui::Button("export (text)")) {
|
} else {
|
||||||
openFileDialog(GUI_FILE_EXPORT_CMDSTREAM);
|
if (ImGui::MenuItem("export...",BIND_FOR(GUI_ACTION_EXPORT))) {
|
||||||
|
displayExport=true;
|
||||||
}
|
}
|
||||||
ImGui::EndMenu();
|
|
||||||
}
|
}
|
||||||
ImGui::Separator();
|
ImGui::Separator();
|
||||||
if (!settings.classicChipOptions) {
|
if (!settings.classicChipOptions) {
|
||||||
|
|
@ -5453,6 +5459,11 @@ bool FurnaceGUI::loop() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (displayExport) {
|
||||||
|
displayExport=false;
|
||||||
|
ImGui::OpenPopup("Export");
|
||||||
|
}
|
||||||
|
|
||||||
if (displayEditString) {
|
if (displayEditString) {
|
||||||
ImGui::OpenPopup("EditString");
|
ImGui::OpenPopup("EditString");
|
||||||
}
|
}
|
||||||
|
|
@ -5494,6 +5505,15 @@ bool FurnaceGUI::loop() {
|
||||||
ImGui::EndPopup();
|
ImGui::EndPopup();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (ImGui::BeginPopupModal("Export",NULL,ImGuiWindowFlags_NoMove|ImGuiWindowFlags_NoScrollWithMouse|ImGuiWindowFlags_NoScrollbar)) {
|
||||||
|
ImGui::SetWindowPos(ImVec2(((canvasW)-ImGui::GetWindowSize().x)*0.5,((canvasH)-ImGui::GetWindowSize().y)*0.5));
|
||||||
|
if (ImGui::GetWindowSize().x<newSongMinSize.x || ImGui::GetWindowSize().y<newSongMinSize.y) {
|
||||||
|
ImGui::SetWindowSize(newSongMinSize,ImGuiCond_Always);
|
||||||
|
}
|
||||||
|
drawExport();
|
||||||
|
ImGui::EndPopup();
|
||||||
|
}
|
||||||
|
|
||||||
centerNextWindow("Error",canvasW,canvasH);
|
centerNextWindow("Error",canvasW,canvasH);
|
||||||
if (ImGui::BeginPopupModal("Error",NULL,ImGuiWindowFlags_AlwaysAutoResize)) {
|
if (ImGui::BeginPopupModal("Error",NULL,ImGuiWindowFlags_AlwaysAutoResize)) {
|
||||||
ImGui::Text("%s",errorString.c_str());
|
ImGui::Text("%s",errorString.c_str());
|
||||||
|
|
|
||||||
|
|
@ -517,6 +517,7 @@ enum FurnaceGUIActions {
|
||||||
GUI_ACTION_OPEN_BACKUP,
|
GUI_ACTION_OPEN_BACKUP,
|
||||||
GUI_ACTION_SAVE,
|
GUI_ACTION_SAVE,
|
||||||
GUI_ACTION_SAVE_AS,
|
GUI_ACTION_SAVE_AS,
|
||||||
|
GUI_ACTION_EXPORT,
|
||||||
GUI_ACTION_UNDO,
|
GUI_ACTION_UNDO,
|
||||||
GUI_ACTION_REDO,
|
GUI_ACTION_REDO,
|
||||||
GUI_ACTION_PLAY_TOGGLE,
|
GUI_ACTION_PLAY_TOGGLE,
|
||||||
|
|
@ -1371,7 +1372,7 @@ class FurnaceGUI {
|
||||||
bool vgmExportDirectStream, displayInsTypeList;
|
bool vgmExportDirectStream, displayInsTypeList;
|
||||||
bool portrait, injectBackUp, mobileMenuOpen, warnColorPushed;
|
bool portrait, injectBackUp, mobileMenuOpen, warnColorPushed;
|
||||||
bool wantCaptureKeyboard, oldWantCaptureKeyboard, displayMacroMenu;
|
bool wantCaptureKeyboard, oldWantCaptureKeyboard, displayMacroMenu;
|
||||||
bool displayNew, fullScreen, preserveChanPos, wantScrollList, noteInputPoly, notifyWaveChange;
|
bool displayNew, displayExport, fullScreen, preserveChanPos, wantScrollList, noteInputPoly, notifyWaveChange;
|
||||||
bool displayPendingIns, pendingInsSingle, displayPendingRawSample, snesFilterHex, modTableHex, displayEditString;
|
bool displayPendingIns, pendingInsSingle, displayPendingRawSample, snesFilterHex, modTableHex, displayEditString;
|
||||||
bool mobileEdit;
|
bool mobileEdit;
|
||||||
bool killGraphics;
|
bool killGraphics;
|
||||||
|
|
@ -1626,6 +1627,7 @@ class FurnaceGUI {
|
||||||
int centerPopup;
|
int centerPopup;
|
||||||
int insIconsStyle;
|
int insIconsStyle;
|
||||||
int classicChipOptions;
|
int classicChipOptions;
|
||||||
|
int classicExportOptions;
|
||||||
int wasapiEx;
|
int wasapiEx;
|
||||||
int chanOscThreads;
|
int chanOscThreads;
|
||||||
int renderPoolThreads;
|
int renderPoolThreads;
|
||||||
|
|
@ -1820,6 +1822,7 @@ class FurnaceGUI {
|
||||||
centerPopup(1),
|
centerPopup(1),
|
||||||
insIconsStyle(1),
|
insIconsStyle(1),
|
||||||
classicChipOptions(0),
|
classicChipOptions(0),
|
||||||
|
classicExportOptions(0), // poll?
|
||||||
wasapiEx(0),
|
wasapiEx(0),
|
||||||
chanOscThreads(0),
|
chanOscThreads(0),
|
||||||
renderPoolThreads(0),
|
renderPoolThreads(0),
|
||||||
|
|
@ -2375,6 +2378,7 @@ class FurnaceGUI {
|
||||||
void drawSettings();
|
void drawSettings();
|
||||||
void drawDebug();
|
void drawDebug();
|
||||||
void drawNewSong();
|
void drawNewSong();
|
||||||
|
void drawExport();
|
||||||
void drawLog();
|
void drawLog();
|
||||||
void drawEffectList();
|
void drawEffectList();
|
||||||
void drawSubSongs(bool asChild=false);
|
void drawSubSongs(bool asChild=false);
|
||||||
|
|
|
||||||
|
|
@ -537,6 +537,7 @@ const FurnaceGUIActionDef guiActions[GUI_ACTION_MAX]={
|
||||||
D("OPEN_BACKUP", "Restore backup", 0),
|
D("OPEN_BACKUP", "Restore backup", 0),
|
||||||
D("SAVE", "Save file", FURKMOD_CMD|SDLK_s),
|
D("SAVE", "Save file", FURKMOD_CMD|SDLK_s),
|
||||||
D("SAVE_AS", "Save as", FURKMOD_CMD|FURKMOD_SHIFT|SDLK_s),
|
D("SAVE_AS", "Save as", FURKMOD_CMD|FURKMOD_SHIFT|SDLK_s),
|
||||||
|
D("EXPORT", "Export", FURKMOD_CMD|SDLK_e),
|
||||||
D("UNDO", "Undo", FURKMOD_CMD|SDLK_z),
|
D("UNDO", "Undo", FURKMOD_CMD|SDLK_z),
|
||||||
D("REDO", "Redo", FURKMOD_CMD|SDLK_y),
|
D("REDO", "Redo", FURKMOD_CMD|SDLK_y),
|
||||||
D("PLAY_TOGGLE", "Play/Stop (toggle)", SDLK_RETURN),
|
D("PLAY_TOGGLE", "Play/Stop (toggle)", SDLK_RETURN),
|
||||||
|
|
|
||||||
|
|
@ -1659,6 +1659,7 @@ void FurnaceGUI::drawSettings() {
|
||||||
UI_KEYBIND_CONFIG(GUI_ACTION_OPEN_BACKUP);
|
UI_KEYBIND_CONFIG(GUI_ACTION_OPEN_BACKUP);
|
||||||
UI_KEYBIND_CONFIG(GUI_ACTION_SAVE);
|
UI_KEYBIND_CONFIG(GUI_ACTION_SAVE);
|
||||||
UI_KEYBIND_CONFIG(GUI_ACTION_SAVE_AS);
|
UI_KEYBIND_CONFIG(GUI_ACTION_SAVE_AS);
|
||||||
|
UI_KEYBIND_CONFIG(GUI_ACTION_EXPORT);
|
||||||
UI_KEYBIND_CONFIG(GUI_ACTION_UNDO);
|
UI_KEYBIND_CONFIG(GUI_ACTION_UNDO);
|
||||||
UI_KEYBIND_CONFIG(GUI_ACTION_REDO);
|
UI_KEYBIND_CONFIG(GUI_ACTION_REDO);
|
||||||
UI_KEYBIND_CONFIG(GUI_ACTION_PLAY_TOGGLE);
|
UI_KEYBIND_CONFIG(GUI_ACTION_PLAY_TOGGLE);
|
||||||
|
|
@ -2652,6 +2653,12 @@ void FurnaceGUI::drawSettings() {
|
||||||
settingsChanged=true;
|
settingsChanged=true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool classicExportOptionsB=settings.classicExportOptions;
|
||||||
|
if (ImGui::Checkbox("Display separate export options in File menu",&classicExportOptionsB)) {
|
||||||
|
settings.classicExportOptions=classicExportOptionsB;
|
||||||
|
settingsChanged=true;
|
||||||
|
}
|
||||||
|
|
||||||
// SUBSECTION ORDERS
|
// SUBSECTION ORDERS
|
||||||
CONFIG_SUBSECTION("Orders");
|
CONFIG_SUBSECTION("Orders");
|
||||||
// sorry. temporarily disabled until ImGui has a way to add separators in tables arbitrarily.
|
// sorry. temporarily disabled until ImGui has a way to add separators in tables arbitrarily.
|
||||||
|
|
@ -3787,6 +3794,7 @@ void FurnaceGUI::syncSettings() {
|
||||||
settings.centerPopup=e->getConfInt("centerPopup",1);
|
settings.centerPopup=e->getConfInt("centerPopup",1);
|
||||||
settings.insIconsStyle=e->getConfInt("insIconsStyle",1);
|
settings.insIconsStyle=e->getConfInt("insIconsStyle",1);
|
||||||
settings.classicChipOptions=e->getConfInt("classicChipOptions",0);
|
settings.classicChipOptions=e->getConfInt("classicChipOptions",0);
|
||||||
|
settings.classicExportOptions=e->getConfInt("classicExportOptions",0);
|
||||||
settings.wasapiEx=e->getConfInt("wasapiEx",0);
|
settings.wasapiEx=e->getConfInt("wasapiEx",0);
|
||||||
settings.chanOscThreads=e->getConfInt("chanOscThreads",0);
|
settings.chanOscThreads=e->getConfInt("chanOscThreads",0);
|
||||||
settings.renderPoolThreads=e->getConfInt("renderPoolThreads",0);
|
settings.renderPoolThreads=e->getConfInt("renderPoolThreads",0);
|
||||||
|
|
@ -3953,6 +3961,7 @@ void FurnaceGUI::syncSettings() {
|
||||||
clampSetting(settings.centerPopup,0,1);
|
clampSetting(settings.centerPopup,0,1);
|
||||||
clampSetting(settings.insIconsStyle,0,2);
|
clampSetting(settings.insIconsStyle,0,2);
|
||||||
clampSetting(settings.classicChipOptions,0,1);
|
clampSetting(settings.classicChipOptions,0,1);
|
||||||
|
clampSetting(settings.classicExportOptions,0,1);
|
||||||
clampSetting(settings.wasapiEx,0,1);
|
clampSetting(settings.wasapiEx,0,1);
|
||||||
clampSetting(settings.chanOscThreads,0,256);
|
clampSetting(settings.chanOscThreads,0,256);
|
||||||
clampSetting(settings.renderPoolThreads,0,DIV_MAX_CHIPS);
|
clampSetting(settings.renderPoolThreads,0,DIV_MAX_CHIPS);
|
||||||
|
|
@ -4232,6 +4241,7 @@ void FurnaceGUI::commitSettings() {
|
||||||
e->setConf("centerPopup",settings.centerPopup);
|
e->setConf("centerPopup",settings.centerPopup);
|
||||||
e->setConf("insIconsStyle",settings.insIconsStyle);
|
e->setConf("insIconsStyle",settings.insIconsStyle);
|
||||||
e->setConf("classicChipOptions",settings.classicChipOptions);
|
e->setConf("classicChipOptions",settings.classicChipOptions);
|
||||||
|
e->setConf("classicExportOptions",settings.classicExportOptions);
|
||||||
e->setConf("wasapiEx",settings.wasapiEx);
|
e->setConf("wasapiEx",settings.wasapiEx);
|
||||||
e->setConf("chanOscThreads",settings.chanOscThreads);
|
e->setConf("chanOscThreads",settings.chanOscThreads);
|
||||||
e->setConf("renderPoolThreads",settings.renderPoolThreads);
|
e->setConf("renderPoolThreads",settings.renderPoolThreads);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue