Clean project structure.

apps/notes_tk/CMakeLists.txt

@@ -61,7 +61,7 @@ target_include_directories(${APP_NAME} PUBLIC
     "${CMAKE_CURRENT_SOURCE_DIR}/canvas"
     "${CMAKE_CURRENT_SOURCE_DIR}/mesh_viewer"
                               )
-target_link_libraries(${APP_NAME} PUBLIC client windows console core network database geometry audio web)
+target_link_libraries(${APP_NAME} PUBLIC ui_controls client windows console core network database geometry audio web)
 set_property(TARGET ${APP_NAME} PROPERTY FOLDER apps)
 endif()
 

apps/notes_tk/NotesTk.cpp

@@ -59,13 +59,13 @@ void NotesTk::initializeViews()
     mesh->setName("MeshViewer");
     tabbedPanel->addPanel(std::move(mesh), "Mesh Viewer");
 
-    auto topBar = TopBar::Create();
+    //auto topBar = TopBar::Create();
     //auto statusBar = StatusBar::Create();
 
-    auto horizontal_spacer = HorizontalSpacer::Create();
-    horizontal_spacer->addWidgetWithScale(std::move(topBar), 1);
-    horizontal_spacer->addWidgetWithScale(std::move(tabbedPanel), 20);
+    //auto horizontal_spacer = HorizontalSpacer::Create();
+    //horizontal_spacer->addWidgetWithScale(std::move(topBar), 1);
+    //horizontal_spacer->addWidgetWithScale(std::move(tabbedPanel), 20);
     //horizontal_spacer->addWidgetWithScale(std::move(statusBar), 1);
 
-    mainWindow->setWidget(std::move(horizontal_spacer));
+    mainWindow->setWidget(std::move(tabbedPanel));
 }

plugins/CMakeLists.txt

@@ -1,5 +1,6 @@
 add_subdirectory(circuits)
 add_subdirectory(math)
+add_subdirectory(music)
 add_subdirectory(machine_learning)
 add_subdirectory(physics_simulation)
 add_subdirectory(quantum_computing)

plugins/music/CMakeLists.txt

@@ -0,0 +1,2 @@
+add_subdirectory(src)
+add_subdirectory(test)

plugins/music/src/CMakeLists.txt

@@ -0,0 +1,36 @@
+set(PLUGIN_NAME music)
+
+list(APPEND HEADERS 
+    midi/reader/MidiReader.h
+    midi/MidiTrack.h
+    midi/MidiDocument.h
+    midi/MidiElements.h
+    midi/MidiEvent.h
+    midi/MetaMidiEvent.h
+    midi/MidiChannelEvent.h
+	)
+
+list(APPEND LIB_INCLUDES 
+    midi/reader/MidiReader.cpp
+    midi/reader/MidiTimeAdapter.cpp
+    midi/reader/MidiMetaEventAdapter.cpp
+    midi/reader/MidiChannelEventAdapter.cpp
+    midi/MidiTrack.cpp
+    midi/MidiDocument.cpp
+    midi/MidiEvent.cpp
+    midi/MetaMidiEvent.cpp
+    midi/MidiChannelEvent.cpp
+	)
+   
+add_library(${PLUGIN_NAME} SHARED ${LIB_INCLUDES} ${HEADERS})
+
+target_include_directories(${PLUGIN_NAME} PUBLIC 
+							${CMAKE_CURRENT_SOURCE_DIR}
+							${CMAKE_CURRENT_SOURCE_DIR}/midi
+							${CMAKE_CURRENT_SOURCE_DIR}/midi/reader
+	)
+
+
+target_link_libraries(${PLUGIN_NAME} PUBLIC core audio)
+set_property(TARGET ${PLUGIN_NAME} PROPERTY FOLDER plugins)
+set_target_properties( ${PLUGIN_NAME} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON )  

plugins/music/test/CMakeLists.txt

@@ -0,0 +1,8 @@
+
+list(APPEND UNIT_TEST_FILES
+	TestMidiReader.cpp
+)
+
+add_executable(music_unit_tests ${CMAKE_SOURCE_DIR}/test/test_runner.cpp ${UNIT_TEST_FILES})
+target_link_libraries(music_unit_tests PUBLIC test_utils music)
+set_property(TARGET music_unit_tests PROPERTY FOLDER plugins)

src/CMakeLists.txt

@@ -1,19 +1,7 @@
-add_subdirectory(core)
-add_subdirectory(compiler)
-add_subdirectory(compression)
-add_subdirectory(database)
-add_subdirectory(network)
-add_subdirectory(geometry)
-add_subdirectory(mesh)
-add_subdirectory(audio)
-add_subdirectory(fonts)
-add_subdirectory(image)
+add_subdirectory(base)
 add_subdirectory(console)
-add_subdirectory(client)
-add_subdirectory(graphics)
+add_subdirectory(media)
 add_subdirectory(publishing)
-add_subdirectory(video)
-add_subdirectory(windows)
+add_subdirectory(rendering)
+add_subdirectory(ui)
 add_subdirectory(web)
-add_subdirectory(ui_elements)
-add_subdirectory(visual_elements)

src/base/CMakeLists.txt

@@ -0,0 +1,6 @@
+add_subdirectory(compiler)
+add_subdirectory(compression)
+add_subdirectory(core)
+add_subdirectory(database)
+add_subdirectory(geometry)
+add_subdirectory(network)

src/base/compiler/CMakeLists.txt

@@ -1,6 +1,6 @@
 set(MODULE_NAME compiler)
 
-list(APPEND TARGET_HEADERS 
+list(APPEND HEADERS 
     Lexer.h
     template_engine/TemplatingEngine.h
     template_engine/TemplateFile.h
@@ -8,7 +8,7 @@ list(APPEND TARGET_HEADERS
     template_engine/TemplateElements.h
     )
 
-list(APPEND TARGET_SOURCES 
+list(APPEND SOURCES 
     Lexer.cpp
     template_engine/TemplatingEngine.cpp
     template_engine/TemplateFile.cpp
@@ -16,7 +16,7 @@ list(APPEND TARGET_SOURCES
     template_engine/TemplateElements.cpp
     )
 
-add_library(${MODULE_NAME} SHARED ${TARGET_SOURCES} ${TARGET_HEADERS})
+add_library(${MODULE_NAME} SHARED ${HEADERS} ${SOURCES})
 
 target_include_directories(${MODULE_NAME} PUBLIC
                           ${CMAKE_CURRENT_SOURCE_DIR}
@@ -25,4 +25,4 @@ target_include_directories(${MODULE_NAME} PUBLIC
 target_link_libraries( ${MODULE_NAME} PUBLIC core)
 
 set_target_properties( ${MODULE_NAME} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON ) 
-set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER src)
+set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER src/base)

src/base/compression/CMakeLists.txt

@@ -1,5 +1,6 @@
+set(MODULE_NAME compression)
 
-list(APPEND compression_LIB_INCLUDES 
+list(APPEND SOURCES 
     StreamCompressor.cpp
     huffman/HuffmanEncoder.cpp
     huffman/HuffmanStream.cpp
@@ -13,14 +14,14 @@ list(APPEND compression_LIB_INCLUDES
     CyclicRedundancyChecker.cpp
     )
 
-add_library(compression SHARED ${compression_LIB_INCLUDES})
+add_library(${MODULE_NAME} SHARED ${SOURCES})
 
-target_include_directories(compression PUBLIC
+target_include_directories(${MODULE_NAME} PUBLIC
                           ${CMAKE_CURRENT_SOURCE_DIR}
                           ${CMAKE_CURRENT_SOURCE_DIR}/deflate
                           ${CMAKE_CURRENT_SOURCE_DIR}/huffman
                           )
                           
-target_link_libraries(compression PUBLIC core)
-set_property(TARGET compression PROPERTY FOLDER src)
-set_target_properties( compression PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON )
+target_link_libraries(${MODULE_NAME} PUBLIC core)
+set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER src/base)
+set_target_properties( ${MODULE_NAME} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON )

src/base/core/CMakeLists.txt

@@ -26,7 +26,7 @@ list(APPEND HEADERS
 	Win32BaseIncludes.h
 )   
 
-list(APPEND LIB_INCLUDES 
+list(APPEND SOURCES 
     Event.cpp
     Dictionary.cpp
     Color.cpp
@@ -53,7 +53,7 @@ list(APPEND LIB_INCLUDES
     http/HttpRequest.cpp
     serializers/TomlReader.cpp)
 
-add_library(${MODULE_NAME} SHARED ${LIB_INCLUDES} ${HEADERS})
+add_library(${MODULE_NAME} SHARED ${SOURCES} ${HEADERS})
 
 target_include_directories(${MODULE_NAME} PUBLIC
                           ${CMAKE_CURRENT_SOURCE_DIR}
@@ -67,4 +67,4 @@ target_include_directories(${MODULE_NAME} PUBLIC
                           ${CMAKE_CURRENT_SOURCE_DIR}/serializers
                           )
 set_target_properties( ${MODULE_NAME} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON )
-set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER src)
+set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER src/base)