AxioDL
/
amuse
mirror of https://github.com/AxioDL/amuse.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix SoundMacro generation for SampleView

This commit is contained in:
Jack Andersen 2019-03-09 23:13:17 -10:00
parent aa5abd5ff5
commit e04603bb7d
13 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Editor/SampleEditor.cpp
View File

@ -340,7 +340,12 @@ bool SampleView::loadData(ProjectModel::SampleNode* node) {
amuse::SoundMacro::CmdStartSample* startSample = static_cast<amuse::SoundMacro::CmdStartSample*>( amuse::SoundMacro::CmdStartSample* startSample = static_cast<amuse::SoundMacro::CmdStartSample*>(
m_playbackMacro->insertNewCmd(0, amuse::SoundMacro::CmdOp::StartSample)); m_playbackMacro->insertNewCmd(0, amuse::SoundMacro::CmdOp::StartSample));
startSample->sample.id = m_node->id(); startSample->sample.id = m_node->id();
m_playbackMacro->insertNewCmd(1, amuse::SoundMacro::CmdOp::End); amuse::SoundMacro::CmdWaitMs* waitMillisec = static_cast<amuse::SoundMacro::CmdWaitMs*>(
m_playbackMacro->insertNewCmd(1, amuse::SoundMacro::CmdOp::WaitMs));
waitMillisec->keyOff = true;
waitMillisec->ms = 65535;
m_playbackMacro->insertNewCmd(2, amuse::SoundMacro::CmdOp::StopSample);
m_playbackMacro->insertNewCmd(3, amuse::SoundMacro::CmdOp::End);
update(); update();

0
Editor/platforms/freedesktop/1024x1024/apps/amuse.png → Editor/platforms/freedesktop/1024x1024/apps/amuse-gui.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 216 KiB

After

Width:  |  Height:  |  Size: 216 KiB

0
Editor/platforms/freedesktop/128x128/apps/amuse.png → Editor/platforms/freedesktop/128x128/apps/amuse-gui.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

0
Editor/platforms/freedesktop/16x16/apps/amuse.png → Editor/platforms/freedesktop/16x16/apps/amuse-gui.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 924 B

After

Width:  |  Height:  |  Size: 924 B

0
Editor/platforms/freedesktop/256x256/apps/amuse.png → Editor/platforms/freedesktop/256x256/apps/amuse-gui.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 42 KiB

0
Editor/platforms/freedesktop/32x32/apps/amuse.png → Editor/platforms/freedesktop/32x32/apps/amuse-gui.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

0
Editor/platforms/freedesktop/48x48/apps/amuse.png → Editor/platforms/freedesktop/48x48/apps/amuse-gui.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

0
Editor/platforms/freedesktop/512x512/apps/amuse.png → Editor/platforms/freedesktop/512x512/apps/amuse-gui.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 96 KiB

After

Width:  |  Height:  |  Size: 96 KiB

0
Editor/platforms/freedesktop/64x64/apps/amuse.png → Editor/platforms/freedesktop/64x64/apps/amuse-gui.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

10
Editor/platforms/freedesktop/CMakeLists.txt
View File

@ -7,11 +7,11 @@ add_custom_command(OUTPUT ${amuse_BINARY_DIR}/Editor/platforms/freedesktop/maini
COMMAND $<TARGET_FILE:amuse-mkqticon> COMMAND $<TARGET_FILE:amuse-mkqticon>
ARGS ${amuse_BINARY_DIR}/Editor/platforms/freedesktop/mainicon_qt.bin ARGS ${amuse_BINARY_DIR}/Editor/platforms/freedesktop/mainicon_qt.bin
DEPENDS DEPENDS
${amuse_SOURCE_DIR}/Editor/platforms/freedesktop/128x128/apps/amuse.png ${amuse_SOURCE_DIR}/Editor/platforms/freedesktop/128x128/apps/amuse-gui.png
${amuse_SOURCE_DIR}/Editor/platforms/freedesktop/64x64/apps/amuse.png ${amuse_SOURCE_DIR}/Editor/platforms/freedesktop/64x64/apps/amuse-gui.png
${amuse_SOURCE_DIR}/Editor/platforms/freedesktop/48x48/apps/amuse.png ${amuse_SOURCE_DIR}/Editor/platforms/freedesktop/48x48/apps/amuse-gui.png
${amuse_SOURCE_DIR}/Editor/platforms/freedesktop/32x32/apps/amuse.png ${amuse_SOURCE_DIR}/Editor/platforms/freedesktop/32x32/apps/amuse-gui.png
${amuse_SOURCE_DIR}/Editor/platforms/freedesktop/16x16/apps/amuse.png ${amuse_SOURCE_DIR}/Editor/platforms/freedesktop/16x16/apps/amuse-gui.png
WORKING_DIRECTORY ${amuse_SOURCE_DIR}/Editor/platforms/freedesktop WORKING_DIRECTORY ${amuse_SOURCE_DIR}/Editor/platforms/freedesktop
COMMENT "Generating mainicon_qt.bin") COMMENT "Generating mainicon_qt.bin")
bintoc(mainicon_qt.cpp ${amuse_BINARY_DIR}/Editor/platforms/freedesktop/mainicon_qt.bin MAINICON_QT) bintoc(mainicon_qt.cpp ${amuse_BINARY_DIR}/Editor/platforms/freedesktop/mainicon_qt.bin MAINICON_QT)

3
Editor/platforms/freedesktop/amuse.desktop → Editor/platforms/freedesktop/amuse-gui.desktop Normal file → Executable file
View File

@ -1,9 +1,10 @@
#!/usr/bin/env xdg-open
[Desktop Entry] [Desktop Entry]
Name=Amuse Name=Amuse
GenericName=MusyX Game Audio Editor GenericName=MusyX Game Audio Editor
Comment=Edit Audio Data of MusyX Sound Groups Comment=Edit Audio Data of MusyX Sound Groups
Exec=amuse-gui Exec=amuse-gui
Icon=amuse Icon=amuse-gui
Terminal=false Terminal=false
Type=Application Type=Application
Categories=Audio Categories=Audio

2
Editor/platforms/freedesktop/mkqticon.c
View File

@ -36,7 +36,7 @@ int main(int argc, char* argv[])
printf("Rendering main icon @%dx%d\n", *d, *d); printf("Rendering main icon @%dx%d\n", *d, *d);
fflush(stdout); fflush(stdout);
snprintf(command, 2048, "%dx%d/apps/amuse.png", *d, *d); snprintf(command, 2048, "%dx%d/apps/amuse-gui.png", *d, *d);
FILE* fp = fopen(command, "rb"); FILE* fp = fopen(command, "rb");
if (!fp) if (!fp)
{ {

32
Editor/resources/lang_de.ts
View File

@ -1687,70 +1687,70 @@
<context> <context>
<name>SampleControls</name> <name>SampleControls</name>
<message> <message>
<location filename="../SampleEditor.cpp" line="400"/> <location filename="../SampleEditor.cpp" line="405"/>
<source>Change %1</source> <source>Change %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../SampleEditor.cpp" line="442"/> <location filename="../SampleEditor.cpp" line="447"/>
<location filename="../SampleEditor.cpp" line="454"/> <location filename="../SampleEditor.cpp" line="459"/>
<location filename="../SampleEditor.cpp" line="681"/> <location filename="../SampleEditor.cpp" line="686"/>
<source>Loop</source> <source>Loop</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../SampleEditor.cpp" line="471"/> <location filename="../SampleEditor.cpp" line="476"/>
<source>Loop Start</source> <source>Loop Start</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../SampleEditor.cpp" line="488"/> <location filename="../SampleEditor.cpp" line="493"/>
<source>Loop End</source> <source>Loop End</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../SampleEditor.cpp" line="505"/> <location filename="../SampleEditor.cpp" line="510"/>
<source>Change Base Pitch</source> <source>Change Base Pitch</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../SampleEditor.cpp" line="577"/> <location filename="../SampleEditor.cpp" line="582"/>
<source>Make WAV Version</source> <source>Make WAV Version</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../SampleEditor.cpp" line="584"/> <location filename="../SampleEditor.cpp" line="589"/>
<source>Make Compressed Version</source> <source>Make Compressed Version</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../SampleEditor.cpp" line="589"/> <location filename="../SampleEditor.cpp" line="594"/>
<source>Up To Date</source> <source>Up To Date</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../SampleEditor.cpp" line="654"/> <location filename="../SampleEditor.cpp" line="659"/>
<location filename="../SampleEditor.cpp" line="722"/> <location filename="../SampleEditor.cpp" line="727"/>
<source>Nothing Loaded</source> <source>Nothing Loaded</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../SampleEditor.cpp" line="674"/> <location filename="../SampleEditor.cpp" line="679"/>
<source>Zoom</source> <source>Zoom</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../SampleEditor.cpp" line="688"/> <location filename="../SampleEditor.cpp" line="693"/>
<source>Start</source> <source>Start</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../SampleEditor.cpp" line="695"/> <location filename="../SampleEditor.cpp" line="700"/>
<source>End</source> <source>End</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../SampleEditor.cpp" line="702"/> <location filename="../SampleEditor.cpp" line="707"/>
<source>Base Pitch</source> <source>Base Pitch</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>