diff --git a/CMakeLists.txt b/CMakeLists.txt index 151863e..6016cc5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,8 +38,8 @@ set(SOURCES lib/EffectChorus.cpp lib/EffectDelay.cpp lib/ContainerRegistry.cpp - lib/DSPCodec.c - lib/N64MusyXCodec.c) + lib/DSPCodec.cpp + lib/N64MusyXCodec.cpp) set(HEADERS include/amuse/AudioGroup.hpp @@ -70,8 +70,8 @@ set(HEADERS include/amuse/ContainerRegistry.hpp include/amuse/Common.hpp include/amuse/amuse.hpp - include/amuse/DSPCodec.h - include/amuse/N64MusyXCodec.h) + include/amuse/DSPCodec.hpp + include/amuse/N64MusyXCodec.hpp) unset(EXTRAS) if(TARGET boo) diff --git a/Editor/CMakeLists.txt b/Editor/CMakeLists.txt index 39ef6f1..23d5aac 100644 --- a/Editor/CMakeLists.txt +++ b/Editor/CMakeLists.txt @@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 3.10) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOUIC ON) +set(AUTORCC ON) find_package(Qt5Widgets) find_package(Qt5Network) @@ -11,7 +12,9 @@ find_package(Qt5Xml) if(WIN32) list(APPEND PLAT_SRCS platforms/win/amuse-gui.rc platforms/win/amuse-gui.manifest) elseif(APPLE) - list(APPEND PLAT_SRCS platforms/mac/mainicon.icns) + list(APPEND PLAT_SRCS platforms/mac/mainicon.icns MacOSExtras.mm) + find_library(APPKIT_LIBRARY AppKit) + list(APPEND PLAT_LIBS ${APPKIT_LIBRARY}) set_source_files_properties(platforms/mac/mainicon.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources) endif() @@ -20,8 +23,21 @@ add_subdirectory(platforms/freedesktop) declare_qticon_target() list(APPEND PLAT_SRCS mainicon_qt.cpp) +QT5_ADD_RESOURCES(qrc_resources.cpp resources/resources.qrc) + add_executable(amuse-gui WIN32 MACOSX_BUNDLE MainWindow.ui MainWindow.hpp MainWindow.cpp + KeyboardWidget.hpp KeyboardWidget.cpp + StatusBarWidget.hpp StatusBarWidget.cpp + ProjectModel.hpp ProjectModel.cpp + ProjectStatistics.hpp ProjectStatistics.cpp + SoundMacroEditor.hpp SoundMacroEditor.cpp + KeymapEditor.hpp KeymapEditor.cpp + LayersEditor.hpp LayersEditor.cpp + SampleEditor.hpp SampleEditor.cpp + SoundGroupEditor.hpp SoundGroupEditor.cpp + SongGroupEditor.hpp SongGroupEditor.cpp + resources/resources.qrc qrc_resources.cpp ${PLAT_SRCS} main.cpp) diff --git a/Editor/KeyboardWidget.cpp b/Editor/KeyboardWidget.cpp new file mode 100644 index 0000000..d1842d2 --- /dev/null +++ b/Editor/KeyboardWidget.cpp @@ -0,0 +1,7 @@ +#include "KeyboardWidget.hpp" + +KeyboardWidget::KeyboardWidget(QWidget* parent) +: QWidget(parent) +{ + +} diff --git a/Editor/KeyboardWidget.hpp b/Editor/KeyboardWidget.hpp new file mode 100644 index 0000000..06456e0 --- /dev/null +++ b/Editor/KeyboardWidget.hpp @@ -0,0 +1,14 @@ +#ifndef AMUSE_KEYBOARD_WIDGET_HPP +#define AMUSE_KEYBOARD_WIDGET_HPP + +#include + +class KeyboardWidget : public QWidget +{ + Q_OBJECT +public: + explicit KeyboardWidget(QWidget* parent = Q_NULLPTR); +}; + + +#endif //AMUSE_KEYBOARD_WIDGET_HPP diff --git a/Editor/KeymapEditor.cpp b/Editor/KeymapEditor.cpp new file mode 100644 index 0000000..5e8c7bb --- /dev/null +++ b/Editor/KeymapEditor.cpp @@ -0,0 +1,7 @@ +#include "KeymapEditor.hpp" + +KeymapEditor::KeymapEditor(QWidget* parent) +: QWidget(parent) +{ + +} diff --git a/Editor/KeymapEditor.hpp b/Editor/KeymapEditor.hpp new file mode 100644 index 0000000..3c18540 --- /dev/null +++ b/Editor/KeymapEditor.hpp @@ -0,0 +1,14 @@ +#ifndef AMUSE_KEYMAP_EDITOR_HPP +#define AMUSE_KEYMAP_EDITOR_HPP + +#include + +class KeymapEditor : public QWidget +{ + Q_OBJECT +public: + explicit KeymapEditor(QWidget* parent = Q_NULLPTR); +}; + + +#endif //AMUSE_KEYMAP_EDITOR_HPP diff --git a/Editor/LayersEditor.cpp b/Editor/LayersEditor.cpp new file mode 100644 index 0000000..8b5a3b2 --- /dev/null +++ b/Editor/LayersEditor.cpp @@ -0,0 +1,7 @@ +#include "LayersEditor.hpp" + +LayersEditor::LayersEditor(QWidget* parent) +: QWidget(parent) +{ + +} diff --git a/Editor/LayersEditor.hpp b/Editor/LayersEditor.hpp new file mode 100644 index 0000000..1638342 --- /dev/null +++ b/Editor/LayersEditor.hpp @@ -0,0 +1,14 @@ +#ifndef AMUSE_LAYERS_EDITOR_HPP +#define AMUSE_LAYERS_EDITOR_HPP + +#include + +class LayersEditor : public QWidget +{ + Q_OBJECT +public: + explicit LayersEditor(QWidget* parent = Q_NULLPTR); +}; + + +#endif //AMUSE_LAYERS_EDITOR_HPP diff --git a/Editor/MacOSExtras.mm b/Editor/MacOSExtras.mm new file mode 100644 index 0000000..0df0298 --- /dev/null +++ b/Editor/MacOSExtras.mm @@ -0,0 +1,9 @@ +#import + +void MacOSSetDarkAppearance() +{ +#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101400 + if ([NSApp respondsToSelector:@selector(setAppearance:)]) + [NSApp setAppearance:[NSAppearance appearanceNamed:NSAppearanceNameDarkAqua]]; +#endif +} diff --git a/Editor/MainWindow.cpp b/Editor/MainWindow.cpp index 93e4efa..aacacd5 100644 --- a/Editor/MainWindow.cpp +++ b/Editor/MainWindow.cpp @@ -1,5 +1,10 @@ -// -// Created by Jack Andersen on 3/5/18. -// - #include "MainWindow.hpp" +#include "ui_MainWindow.h" + +MainWindow::MainWindow(QWidget* parent) +: QMainWindow(parent), + m_ui(new Ui::MainWindow) +{ + m_ui->setupUi(this); +} + diff --git a/Editor/MainWindow.hpp b/Editor/MainWindow.hpp index 04e9ceb..8139c1f 100644 --- a/Editor/MainWindow.hpp +++ b/Editor/MainWindow.hpp @@ -1,15 +1,18 @@ -// -// Created by Jack Andersen on 3/5/18. -// +#ifndef AMUSE_MAINWINDOW_HPP +#define AMUSE_MAINWINDOW_HPP -#ifndef URDE_MAINWINDOW_HPP -#define URDE_MAINWINDOW_HPP +#include +namespace Ui { +class MainWindow; +} - -class MainWindow +class MainWindow : public QMainWindow { - + Q_OBJECT + Ui::MainWindow* m_ui; +public: + explicit MainWindow(QWidget* parent = Q_NULLPTR); }; -#endif //URDE_MAINWINDOW_HPP +#endif //AMUSE_MAINWINDOW_HPP diff --git a/Editor/MainWindow.ui b/Editor/MainWindow.ui index 9ae3b50..fe59316 100644 --- a/Editor/MainWindow.ui +++ b/Editor/MainWindow.ui @@ -1,10 +1,8 @@ - - - - + + MainWindow - - + + 0 0 @@ -12,13 +10,376 @@ 600 - - MainWindow + + Amuse - - - + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + Qt::Vertical + + + + + 0 + 3 + + + + + 200 + 0 + + + + + + + 0 + 2 + + + + + 200 + 0 + + + + + + + + 1 + 0 + + + + Qt::Vertical + + + + + 0 + 0 + + + + + 500 + 400 + + + + true + + + + + 0 + 0 + 538 + 450 + + + + + + + + 0 + 0 + + + + + 500 + 100 + + + + + 16777215 + 100 + + + + true + + + + + 0 + 0 + 538 + 98 + + + + + 16777215 + 16777215 + + + + + + + + + + + + + 0 + 0 + 800 + 22 + + + + + File + + + + + + + + + Project + + + + + + + + + + + Audio + + + + + + + + MIDI + + + + + + + Edit + + + + + + + + + + + + + + + + + + + New Project + + + Ctrl+N + + + + + Open Project + + + Ctrl+O + + + + + Duplicate Project + + + + + Quit + + + + + Undo + + + Ctrl+Z + + + + + Redo + + + Ctrl+Shift+Z + + + + + Cut + + + Ctrl+X + + + + + Copy + + + Ctrl+C + + + + + Paste + + + Ctrl+V + + + + + Delete + + + Del + + + + + Import Project + + + Ctrl+I + + + + + + :/icons/IconNewSoundGroup.svg:/icons/IconNewSoundGroup.svg + + + New Sound Group + + + + + + :/icons/IconNewSongGroup.svg:/icons/IconNewSongGroup.svg + + + New Song Group + + + + + + :/icons/IconNewSoundMacro.svg:/icons/IconNewSoundMacro.svg + + + New Sound Macro + + + + + + :/icons/IconNewKeymap.svg:/icons/IconNewKeymap.svg + + + New Keymap + + + + + + :/icons/IconNewLayers.svg:/icons/IconNewLayers.svg + + + New Layers + + + + + true + + + true + + + Auto-Play + + + + + false + + + Output Device: + + + + + false + + + Input Device: + + - + + + KeyboardWidget + QWidget +
KeyboardWidget.hpp
+ 1 + + + StatusBarWidget + QStatusBar +
StatusBarWidget.hpp
+ + + diff --git a/Editor/ProjectModel.cpp b/Editor/ProjectModel.cpp new file mode 100644 index 0000000..d122ce3 --- /dev/null +++ b/Editor/ProjectModel.cpp @@ -0,0 +1,7 @@ +#include "ProjectModel.hpp" + +ProjectModel::ProjectModel(QObject* parent) +: QAbstractItemModel(parent) +{ + +} diff --git a/Editor/ProjectModel.hpp b/Editor/ProjectModel.hpp new file mode 100644 index 0000000..5fd7623 --- /dev/null +++ b/Editor/ProjectModel.hpp @@ -0,0 +1,14 @@ +#ifndef AMUSE_PROJECT_MODEL_HPP +#define AMUSE_PROJECT_MODEL_HPP + +#include + +class ProjectModel : public QAbstractItemModel +{ + Q_OBJECT +public: + explicit ProjectModel(QObject* parent = Q_NULLPTR); +}; + + +#endif //AMUSE_PROJECT_MODEL_HPP diff --git a/Editor/ProjectStatistics.cpp b/Editor/ProjectStatistics.cpp new file mode 100644 index 0000000..9297d1d --- /dev/null +++ b/Editor/ProjectStatistics.cpp @@ -0,0 +1,7 @@ +#include "ProjectStatistics.hpp" + +ProjectStatistics::ProjectStatistics(QObject* parent) +: QAbstractTableModel(parent) +{ + +} diff --git a/Editor/ProjectStatistics.hpp b/Editor/ProjectStatistics.hpp new file mode 100644 index 0000000..ce1896f --- /dev/null +++ b/Editor/ProjectStatistics.hpp @@ -0,0 +1,14 @@ +#ifndef AMUSE_PROJECT_STATISTICS_HPP +#define AMUSE_PROJECT_STATISTICS_HPP + +#include + +class ProjectStatistics : public QAbstractTableModel +{ + Q_OBJECT +public: + explicit ProjectStatistics(QObject* parent = Q_NULLPTR); +}; + + +#endif //AMUSE_PROJECT_STATISTICS_HPP diff --git a/Editor/SampleEditor.cpp b/Editor/SampleEditor.cpp new file mode 100644 index 0000000..e95d44e --- /dev/null +++ b/Editor/SampleEditor.cpp @@ -0,0 +1,7 @@ +#include "SampleEditor.hpp" + +SampleEditor::SampleEditor(QWidget* parent) +: QWidget(parent) +{ + +} diff --git a/Editor/SampleEditor.hpp b/Editor/SampleEditor.hpp new file mode 100644 index 0000000..d796e1b --- /dev/null +++ b/Editor/SampleEditor.hpp @@ -0,0 +1,14 @@ +#ifndef AMUSE_SAMPLE_EDITOR_HPP +#define AMUSE_SAMPLE_EDITOR_HPP + +#include + +class SampleEditor : public QWidget +{ + Q_OBJECT +public: + explicit SampleEditor(QWidget* parent = Q_NULLPTR); +}; + + +#endif //AMUSE_SAMPLE_EDITOR_HPP diff --git a/Editor/SongGroupEditor.cpp b/Editor/SongGroupEditor.cpp new file mode 100644 index 0000000..6499e48 --- /dev/null +++ b/Editor/SongGroupEditor.cpp @@ -0,0 +1,7 @@ +#include "SongGroupEditor.hpp" + +SongGroupEditor::SongGroupEditor(QWidget* parent) +: QWidget(parent) +{ + +} diff --git a/Editor/SongGroupEditor.hpp b/Editor/SongGroupEditor.hpp new file mode 100644 index 0000000..5e0245e --- /dev/null +++ b/Editor/SongGroupEditor.hpp @@ -0,0 +1,14 @@ +#ifndef AMUSE_SONG_GROUP_EDITOR_HPP +#define AMUSE_SONG_GROUP_EDITOR_HPP + +#include + +class SongGroupEditor : public QWidget +{ + Q_OBJECT +public: + explicit SongGroupEditor(QWidget* parent = Q_NULLPTR); +}; + + +#endif //AMUSE_SONG_GROUP_EDITOR_HPP diff --git a/Editor/SoundGroupEditor.cpp b/Editor/SoundGroupEditor.cpp new file mode 100644 index 0000000..bf39856 --- /dev/null +++ b/Editor/SoundGroupEditor.cpp @@ -0,0 +1,7 @@ +#include "SoundGroupEditor.hpp" + +SoundGroupEditor::SoundGroupEditor(QWidget* parent) +: QWidget(parent) +{ + +} diff --git a/Editor/SoundGroupEditor.hpp b/Editor/SoundGroupEditor.hpp new file mode 100644 index 0000000..f680f79 --- /dev/null +++ b/Editor/SoundGroupEditor.hpp @@ -0,0 +1,14 @@ +#ifndef AMUSE_SOUND_GROUP_EDITOR_HPP +#define AMUSE_SOUND_GROUP_EDITOR_HPP + +#include + +class SoundGroupEditor : public QWidget +{ + Q_OBJECT +public: + explicit SoundGroupEditor(QWidget* parent = Q_NULLPTR); +}; + + +#endif //AMUSE_SOUND_GROUP_EDITOR_HPP diff --git a/Editor/SoundMacroEditor.cpp b/Editor/SoundMacroEditor.cpp new file mode 100644 index 0000000..6771ca8 --- /dev/null +++ b/Editor/SoundMacroEditor.cpp @@ -0,0 +1,7 @@ +#include "SoundMacroEditor.hpp" + +SoundMacroEditor::SoundMacroEditor(QWidget* parent) +: QWidget(parent) +{ + +} diff --git a/Editor/SoundMacroEditor.hpp b/Editor/SoundMacroEditor.hpp new file mode 100644 index 0000000..abbe9d3 --- /dev/null +++ b/Editor/SoundMacroEditor.hpp @@ -0,0 +1,14 @@ +#ifndef AMUSE_SOUND_MACRO_EDITOR_HPP +#define AMUSE_SOUND_MACRO_EDITOR_HPP + +#include + +class SoundMacroEditor : public QWidget +{ + Q_OBJECT +public: + explicit SoundMacroEditor(QWidget* parent = Q_NULLPTR); +}; + + +#endif //AMUSE_SOUND_MACRO_EDITOR_HPP diff --git a/Editor/StatusBarWidget.cpp b/Editor/StatusBarWidget.cpp new file mode 100644 index 0000000..0f02b87 --- /dev/null +++ b/Editor/StatusBarWidget.cpp @@ -0,0 +1,7 @@ +#include "StatusBarWidget.hpp" + +StatusBarWidget::StatusBarWidget(QWidget* parent) +: QStatusBar(parent) +{ + +} diff --git a/Editor/StatusBarWidget.hpp b/Editor/StatusBarWidget.hpp new file mode 100644 index 0000000..e79525b --- /dev/null +++ b/Editor/StatusBarWidget.hpp @@ -0,0 +1,14 @@ +#ifndef AMUSE_STATUSBAR_WIDGET_HPP +#define AMUSE_STATUSBAR_WIDGET_HPP + +#include + +class StatusBarWidget : public QStatusBar +{ + Q_OBJECT +public: + explicit StatusBarWidget(QWidget* parent = Q_NULLPTR); +}; + + +#endif //AMUSE_STATUSBAR_WIDGET_HPP diff --git a/Editor/main.cpp b/Editor/main.cpp index 17553bf..0f02ade 100644 --- a/Editor/main.cpp +++ b/Editor/main.cpp @@ -1,8 +1,70 @@ -// -// Created by Jack Andersen on 3/5/18. -// +#include +#include +#include +#include "MainWindow.hpp" + +#ifdef __APPLE__ +void MacOSSetDarkAppearance(); +#endif + +extern "C" const uint8_t MAINICON_QT[]; + +static QIcon MakeAppIcon() +{ + QIcon ret; + + const uint8_t* ptr = MAINICON_QT; + for (int i = 0; i < 6; ++i) + { + uint32_t size = *reinterpret_cast(ptr); + ptr += 4; + + QPixmap pm; + pm.loadFromData(ptr, size); + ret.addPixmap(pm); + ptr += size; + } + + return ret; +} int main(int argc, char* argv[]) { - // TODO: Do +#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)) + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); +#endif + QApplication::setStyle(QStyleFactory::create("Fusion")); + QApplication a(argc, argv); + QApplication::setWindowIcon(MakeAppIcon()); + + QPalette darkPalette; + darkPalette.setColor(QPalette::Window, QColor(53,53,53)); + darkPalette.setColor(QPalette::WindowText, Qt::white); + darkPalette.setColor(QPalette::Base, QColor(42,42,42)); + darkPalette.setColor(QPalette::Disabled, QPalette::Base, QColor(25,25,25,53)); + darkPalette.setColor(QPalette::AlternateBase, QColor(53,53,53)); + darkPalette.setColor(QPalette::ToolTipBase, QColor(42,42,42)); + darkPalette.setColor(QPalette::ToolTipText, Qt::white); + darkPalette.setColor(QPalette::Text, Qt::white); + darkPalette.setColor(QPalette::Disabled, QPalette::Text, QColor(255,255,255,120)); + darkPalette.setColor(QPalette::Button, QColor(53,53,53)); + darkPalette.setColor(QPalette::Disabled, QPalette::Button, QColor(53,53,53,53)); + darkPalette.setColor(QPalette::ButtonText, Qt::white); + darkPalette.setColor(QPalette::Disabled, QPalette::ButtonText, QColor(255,255,255,120)); + darkPalette.setColor(QPalette::BrightText, Qt::red); + darkPalette.setColor(QPalette::Link, QColor(42,130,218)); + darkPalette.setColor(QPalette::Highlight, QColor(42,130,218)); + darkPalette.setColor(QPalette::Disabled, QPalette::Highlight, QColor(42,130,218,53)); + darkPalette.setColor(QPalette::HighlightedText, Qt::white); + darkPalette.setColor(QPalette::Disabled, QPalette::HighlightedText, QColor(255,255,255,120)); + a.setPalette(darkPalette); + +#ifdef __APPLE__ + MacOSSetDarkAppearance(); +#endif + + MainWindow w; + w.show(); + return a.exec(); } diff --git a/Editor/resources/IconImport.svg b/Editor/resources/IconImport.svg new file mode 100644 index 0000000..bcb6c43 --- /dev/null +++ b/Editor/resources/IconImport.svg @@ -0,0 +1,104 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/Editor/resources/IconKeymap.svg b/Editor/resources/IconKeymap.svg new file mode 100644 index 0000000..60eb696 --- /dev/null +++ b/Editor/resources/IconKeymap.svg @@ -0,0 +1,95 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/Editor/resources/IconLayers.svg b/Editor/resources/IconLayers.svg new file mode 100644 index 0000000..daeef8d --- /dev/null +++ b/Editor/resources/IconLayers.svg @@ -0,0 +1,83 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/Editor/resources/IconNew.svg b/Editor/resources/IconNew.svg new file mode 100644 index 0000000..a0887b7 --- /dev/null +++ b/Editor/resources/IconNew.svg @@ -0,0 +1,80 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/Editor/resources/IconNewKeymap.svg b/Editor/resources/IconNewKeymap.svg new file mode 100644 index 0000000..e038629 --- /dev/null +++ b/Editor/resources/IconNewKeymap.svg @@ -0,0 +1,100 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/Editor/resources/IconNewLayers.svg b/Editor/resources/IconNewLayers.svg new file mode 100644 index 0000000..e577e94 --- /dev/null +++ b/Editor/resources/IconNewLayers.svg @@ -0,0 +1,88 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/Editor/resources/IconNewSongGroup.svg b/Editor/resources/IconNewSongGroup.svg new file mode 100644 index 0000000..526ee29 --- /dev/null +++ b/Editor/resources/IconNewSongGroup.svg @@ -0,0 +1,78 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/Editor/resources/IconNewSoundGroup.svg b/Editor/resources/IconNewSoundGroup.svg new file mode 100644 index 0000000..0eda093 --- /dev/null +++ b/Editor/resources/IconNewSoundGroup.svg @@ -0,0 +1,78 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/Editor/resources/IconNewSoundMacro.svg b/Editor/resources/IconNewSoundMacro.svg new file mode 100644 index 0000000..0fc0d57 --- /dev/null +++ b/Editor/resources/IconNewSoundMacro.svg @@ -0,0 +1,79 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/Editor/resources/IconOpen.svg b/Editor/resources/IconOpen.svg new file mode 100644 index 0000000..526c195 --- /dev/null +++ b/Editor/resources/IconOpen.svg @@ -0,0 +1,92 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/Editor/resources/IconSongGroup.svg b/Editor/resources/IconSongGroup.svg new file mode 100644 index 0000000..5082420 --- /dev/null +++ b/Editor/resources/IconSongGroup.svg @@ -0,0 +1,74 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/Editor/resources/IconSoundGroup.svg b/Editor/resources/IconSoundGroup.svg new file mode 100644 index 0000000..d38db5b --- /dev/null +++ b/Editor/resources/IconSoundGroup.svg @@ -0,0 +1,74 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/Editor/resources/IconSoundMacro.svg b/Editor/resources/IconSoundMacro.svg new file mode 100644 index 0000000..d422445 --- /dev/null +++ b/Editor/resources/IconSoundMacro.svg @@ -0,0 +1,74 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/Editor/resources/resources.qrc b/Editor/resources/resources.qrc new file mode 100644 index 0000000..3adf384 --- /dev/null +++ b/Editor/resources/resources.qrc @@ -0,0 +1,17 @@ + + + IconImport.svg + IconKeymap.svg + IconLayers.svg + IconNew.svg + IconNewKeymap.svg + IconNewLayers.svg + IconNewSongGroup.svg + IconNewSoundGroup.svg + IconNewSoundMacro.svg + IconOpen.svg + IconSongGroup.svg + IconSoundGroup.svg + IconSoundMacro.svg + + diff --git a/include/amuse/DSPCodec.h b/include/amuse/DSPCodec.hpp similarity index 93% rename from include/amuse/DSPCodec.h rename to include/amuse/DSPCodec.hpp index 5485f9d..0c0bc1c 100644 --- a/include/amuse/DSPCodec.h +++ b/include/amuse/DSPCodec.hpp @@ -1,11 +1,7 @@ #ifndef _DSPCODEC_h #define _DSPCODEC_h -#ifdef __cplusplus -extern "C" { -#endif - -#include +#include static inline int16_t DSPSampClamp(int32_t val) { @@ -32,8 +28,4 @@ unsigned DSPDecompressFrameStateOnly(const uint8_t* in, const int16_t coefs[8][2], int16_t* prev1, int16_t* prev2, unsigned lastSample); -#ifdef __cplusplus -} -#endif - #endif // _DSPCODEC_h diff --git a/include/amuse/N64MusyXCodec.h b/include/amuse/N64MusyXCodec.hpp similarity index 87% rename from include/amuse/N64MusyXCodec.h rename to include/amuse/N64MusyXCodec.hpp index 4282bec..ccf29be 100644 --- a/include/amuse/N64MusyXCodec.h +++ b/include/amuse/N64MusyXCodec.hpp @@ -1,11 +1,7 @@ #ifndef _N64MUSYXCODEC_h #define _N64MUSYXCODEC_h -#ifdef __cplusplus -extern "C" { -#endif - -#include +#include static inline int16_t N64MusyXSampClamp(int32_t val) { @@ -22,8 +18,4 @@ unsigned N64MusyXDecompressFrameRanged(int16_t* out, const uint8_t* in, const int16_t coefs[8][2][8], unsigned firstSample, unsigned lastSample); -#ifdef __cplusplus -} -#endif - #endif // _N64MUSYXCODEC_h diff --git a/lib/DSPCodec.c b/lib/DSPCodec.cpp similarity index 99% rename from lib/DSPCodec.c rename to lib/DSPCodec.cpp index b3000ce..21f657b 100644 --- a/lib/DSPCodec.c +++ b/lib/DSPCodec.cpp @@ -1,4 +1,4 @@ -#include "amuse/DSPCodec.h" +#include "amuse/DSPCodec.hpp" static const int32_t NibbleToInt[16] = {0,1,2,3,4,5,6,7,-8,-7,-6,-5,-4,-3,-2,-1}; diff --git a/lib/N64MusyXCodec.c b/lib/N64MusyXCodec.cpp similarity index 99% rename from lib/N64MusyXCodec.c rename to lib/N64MusyXCodec.cpp index 99fd562..92098ca 100644 --- a/lib/N64MusyXCodec.c +++ b/lib/N64MusyXCodec.cpp @@ -1,4 +1,4 @@ -#include "amuse/N64MusyXCodec.h" +#include "amuse/N64MusyXCodec.hpp" #include #include #include diff --git a/lib/Voice.cpp b/lib/Voice.cpp index 3c9f8ed..bd49427 100644 --- a/lib/Voice.cpp +++ b/lib/Voice.cpp @@ -5,8 +5,8 @@ #include "amuse/AudioGroup.hpp" #include "amuse/Common.hpp" #include "amuse/Engine.hpp" -#include "amuse/DSPCodec.h" -#include "amuse/N64MusyXCodec.h" +#include "amuse/DSPCodec.hpp" +#include "amuse/N64MusyXCodec.hpp" #include #include