Fix SoundMacro generation for SampleView
|
@ -340,7 +340,12 @@ bool SampleView::loadData(ProjectModel::SampleNode* node) {
|
|||
amuse::SoundMacro::CmdStartSample* startSample = static_cast<amuse::SoundMacro::CmdStartSample*>(
|
||||
m_playbackMacro->insertNewCmd(0, amuse::SoundMacro::CmdOp::StartSample));
|
||||
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();
|
||||
|
||||
|
|
Before Width: | Height: | Size: 216 KiB After Width: | Height: | Size: 216 KiB |
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
Before Width: | Height: | Size: 924 B After Width: | Height: | Size: 924 B |
Before Width: | Height: | Size: 42 KiB After Width: | Height: | Size: 42 KiB |
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 2.6 KiB |
Before Width: | Height: | Size: 5.0 KiB After Width: | Height: | Size: 5.0 KiB |
Before Width: | Height: | Size: 96 KiB After Width: | Height: | Size: 96 KiB |
Before Width: | Height: | Size: 7.5 KiB After Width: | Height: | Size: 7.5 KiB |
|
@ -7,11 +7,11 @@ add_custom_command(OUTPUT ${amuse_BINARY_DIR}/Editor/platforms/freedesktop/maini
|
|||
COMMAND $<TARGET_FILE:amuse-mkqticon>
|
||||
ARGS ${amuse_BINARY_DIR}/Editor/platforms/freedesktop/mainicon_qt.bin
|
||||
DEPENDS
|
||||
${amuse_SOURCE_DIR}/Editor/platforms/freedesktop/128x128/apps/amuse.png
|
||||
${amuse_SOURCE_DIR}/Editor/platforms/freedesktop/64x64/apps/amuse.png
|
||||
${amuse_SOURCE_DIR}/Editor/platforms/freedesktop/48x48/apps/amuse.png
|
||||
${amuse_SOURCE_DIR}/Editor/platforms/freedesktop/32x32/apps/amuse.png
|
||||
${amuse_SOURCE_DIR}/Editor/platforms/freedesktop/16x16/apps/amuse.png
|
||||
${amuse_SOURCE_DIR}/Editor/platforms/freedesktop/128x128/apps/amuse-gui.png
|
||||
${amuse_SOURCE_DIR}/Editor/platforms/freedesktop/64x64/apps/amuse-gui.png
|
||||
${amuse_SOURCE_DIR}/Editor/platforms/freedesktop/48x48/apps/amuse-gui.png
|
||||
${amuse_SOURCE_DIR}/Editor/platforms/freedesktop/32x32/apps/amuse-gui.png
|
||||
${amuse_SOURCE_DIR}/Editor/platforms/freedesktop/16x16/apps/amuse-gui.png
|
||||
WORKING_DIRECTORY ${amuse_SOURCE_DIR}/Editor/platforms/freedesktop
|
||||
COMMENT "Generating mainicon_qt.bin")
|
||||
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
|
@ -1,9 +1,10 @@
|
|||
#!/usr/bin/env xdg-open
|
||||
[Desktop Entry]
|
||||
Name=Amuse
|
||||
GenericName=MusyX Game Audio Editor
|
||||
Comment=Edit Audio Data of MusyX Sound Groups
|
||||
Exec=amuse-gui
|
||||
Icon=amuse
|
||||
Icon=amuse-gui
|
||||
Terminal=false
|
||||
Type=Application
|
||||
Categories=Audio
|
|
@ -36,7 +36,7 @@ int main(int argc, char* argv[])
|
|||
printf("Rendering main icon @%dx%d\n", *d, *d);
|
||||
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");
|
||||
if (!fp)
|
||||
{
|
||||
|
|
|
@ -1687,70 +1687,70 @@
|
|||
<context>
|
||||
<name>SampleControls</name>
|
||||
<message>
|
||||
<location filename="../SampleEditor.cpp" line="400"/>
|
||||
<location filename="../SampleEditor.cpp" line="405"/>
|
||||
<source>Change %1</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../SampleEditor.cpp" line="442"/>
|
||||
<location filename="../SampleEditor.cpp" line="454"/>
|
||||
<location filename="../SampleEditor.cpp" line="681"/>
|
||||
<location filename="../SampleEditor.cpp" line="447"/>
|
||||
<location filename="../SampleEditor.cpp" line="459"/>
|
||||
<location filename="../SampleEditor.cpp" line="686"/>
|
||||
<source>Loop</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../SampleEditor.cpp" line="471"/>
|
||||
<location filename="../SampleEditor.cpp" line="476"/>
|
||||
<source>Loop Start</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../SampleEditor.cpp" line="488"/>
|
||||
<location filename="../SampleEditor.cpp" line="493"/>
|
||||
<source>Loop End</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../SampleEditor.cpp" line="505"/>
|
||||
<location filename="../SampleEditor.cpp" line="510"/>
|
||||
<source>Change Base Pitch</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../SampleEditor.cpp" line="577"/>
|
||||
<location filename="../SampleEditor.cpp" line="582"/>
|
||||
<source>Make WAV Version</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../SampleEditor.cpp" line="584"/>
|
||||
<location filename="../SampleEditor.cpp" line="589"/>
|
||||
<source>Make Compressed Version</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../SampleEditor.cpp" line="589"/>
|
||||
<location filename="../SampleEditor.cpp" line="594"/>
|
||||
<source>Up To Date</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../SampleEditor.cpp" line="654"/>
|
||||
<location filename="../SampleEditor.cpp" line="722"/>
|
||||
<location filename="../SampleEditor.cpp" line="659"/>
|
||||
<location filename="../SampleEditor.cpp" line="727"/>
|
||||
<source>Nothing Loaded</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../SampleEditor.cpp" line="674"/>
|
||||
<location filename="../SampleEditor.cpp" line="679"/>
|
||||
<source>Zoom</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../SampleEditor.cpp" line="688"/>
|
||||
<location filename="../SampleEditor.cpp" line="693"/>
|
||||
<source>Start</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../SampleEditor.cpp" line="695"/>
|
||||
<location filename="../SampleEditor.cpp" line="700"/>
|
||||
<source>End</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../SampleEditor.cpp" line="702"/>
|
||||
<location filename="../SampleEditor.cpp" line="707"/>
|
||||
<source>Base Pitch</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
|
|