combine all files?

bramtayl · Nov 18, 2024 · 22d0842 · 22d0842
1 parent d9254b4
commit 22d0842
Show file tree

Hide file tree

Showing 65 changed files with 4,821 additions and 5,617 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -53,7 +53,8 @@ if (NO_REALTIME_AUDIO)
 endif()
 
 add_subdirectory(include)
-add_subdirectory(src)
+
+target_sources(JustlyLibrary PRIVATE "src/justly.cpp")
 
 target_include_directories(JustlyLibrary PRIVATE src)
 

diff --git a/generate_coverage.sh b/generate_coverage.sh
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
@@ -1,10 +1,5 @@
 target_sources(JustlyLibrary PUBLIC
     FILE_SET justly_public_headers
     TYPE HEADERS
-    FILES
-    "justly/JUSTLY_EXPORT.hpp"
-    "justly/ChordColumn.hpp"
-    "justly/PitchedNoteColumn.hpp"
-    "justly/UnpitchedNoteColumn.hpp"
-    "justly/justly.hpp"
+    FILES "justly/justly.hpp"
 )
diff --git a/include/justly/ChordColumn.hpp b/include/justly/ChordColumn.hpp
diff --git a/include/justly/JUSTLY_EXPORT.hpp b/include/justly/JUSTLY_EXPORT.hpp
diff --git a/include/justly/PitchedNoteColumn.hpp b/include/justly/PitchedNoteColumn.hpp
diff --git a/include/justly/UnpitchedNoteColumn.hpp b/include/justly/UnpitchedNoteColumn.hpp
diff --git a/include/justly/justly.hpp b/include/justly/justly.hpp
@@ -1,15 +1,54 @@
 #pragma once
 
-#include "justly/JUSTLY_EXPORT.hpp"
 #include <QString>
 #include <QVariant>
+#include <QtCore/QtGlobal>
 
 struct SongEditor;
 class QAbstractItemModel;
 class QModelIndex;
 class QAbstractItemView;
 class QWidget;
 
+
+#if defined(JUSTLY_LIBRARY)
+#define JUSTLY_EXPORT Q_DECL_EXPORT
+#else
+#define JUSTLY_EXPORT Q_DECL_IMPORT
+#endif
+
+enum JUSTLY_EXPORT ChordColumn {
+  chord_instrument_column,
+  chord_percussion_set_column,
+  chord_percussion_instrument_column,
+  chord_interval_column,
+  chord_beats_column,
+  chord_velocity_ratio_column,
+  chord_tempo_ratio_column,
+  chord_words_column,
+  chord_pitched_notes_column,
+  chord_unpitched_notes_column,
+  number_of_chord_columns
+};
+
+enum JUSTLY_EXPORT PitchedNoteColumn {
+  pitched_note_instrument_column,
+  pitched_note_interval_column,
+  pitched_note_beats_column,
+  pitched_note_velocity_ratio_column,
+  pitched_note_words_column,
+  number_of_pitched_note_columns
+};
+
+enum JUSTLY_EXPORT UnpitchedNoteColumn {
+  unpitched_note_percussion_set_column,
+  unpitched_note_percussion_instrument_column,
+  unpitched_note_beats_column,
+  unpitched_note_velocity_ratio_column,
+  unpitched_note_words_column,
+  number_of_unpitched_note_columns
+};
+
 void JUSTLY_EXPORT set_up();
 [[nodiscard]] auto JUSTLY_EXPORT make_song_editor() -> SongEditor *;
 void JUSTLY_EXPORT show_song_editor(SongEditor *song_editor_pointer);

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
diff --git a/src/abstract_rational/AbstractRational.cpp b/src/abstract_rational/AbstractRational.cpp
diff --git a/src/abstract_rational/AbstractRational.hpp b/src/abstract_rational/AbstractRational.hpp
diff --git a/src/abstract_rational/CMakeLists.txt b/src/abstract_rational/CMakeLists.txt
diff --git a/src/abstract_rational/interval/CMakeLists.txt b/src/abstract_rational/interval/CMakeLists.txt
diff --git a/src/abstract_rational/interval/Interval.cpp b/src/abstract_rational/interval/Interval.cpp
diff --git a/src/abstract_rational/interval/Interval.hpp b/src/abstract_rational/interval/Interval.hpp
diff --git a/src/abstract_rational/rational/CMakeLists.txt b/src/abstract_rational/rational/CMakeLists.txt
diff --git a/src/abstract_rational/rational/Rational.cpp b/src/abstract_rational/rational/Rational.cpp
diff --git a/src/abstract_rational/rational/Rational.hpp b/src/abstract_rational/rational/Rational.hpp