Port to DUH

Daft-Freak · Feb 6, 2021 · d525032 · d525032
1 parent f698f9d
commit d525032
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 281 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -56,6 +56,7 @@ jobs:
       uses: actions/checkout@v2
       with:
         path: main
+        submodules: true
 
     # Check out the 32Blit API we build against
     - name: Checkout 32Blit API

diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "DUH"]
+	path = DUH
+	url = https://github.com/Daft-Freak/DUH
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,8 +5,6 @@ project(mjpeg-player)
 set(32BLIT_PATH "../" CACHE PATH "Path to 32blit.cmake")
 set(PROJECT_SOURCE
     avi-file.cpp
-    control-icons.cpp
-    file-browser.cpp
     mjpeg-player.cpp
 )
 
@@ -24,7 +22,11 @@ if(NOT EXISTS ${32BLIT_PATH}/32blit.cmake)
   message(FATAL_ERROR "Define location of 32Blit API with -D32BLIT_PATH=<path to 32blit.cmake>")
 endif()
 include (${32BLIT_PATH}/32blit.cmake)
+add_subdirectory(DUH)
+
 blit_executable (${PROJECT_NAME} ${PROJECT_SOURCE})
 blit_assets_yaml (${PROJECT_NAME} assets.yml)
 blit_metadata (${PROJECT_NAME} metadata.yml)
+target_link_libraries (${PROJECT_NAME} DUH)
+
 add_custom_target (flash DEPENDS ${PROJECT_NAME}.flash)
diff --git a/DUH b/DUH
diff --git a/assets.yml b/assets.yml
@@ -1,6 +1,5 @@
 assets.cpp:
   prefix: asset_
-  assets/buttons.png: buttons
   assets/12x8font.png:
     name: tall_font
     type: font/image

diff --git a/assets/buttons.png b/assets/buttons.png
diff --git a/control-icons.cpp b/control-icons.cpp
diff --git a/control-icons.hpp b/control-icons.hpp
diff --git a/file-browser.cpp b/file-browser.cpp
diff --git a/file-browser.hpp b/file-browser.hpp
diff --git a/mjpeg-player.cpp b/mjpeg-player.cpp
@@ -31,7 +31,7 @@ ffmpeg -i 2020-02-19\ 12-14-08.mkv -vcodec mjpeg -q:v 2 -pix_fmt yuvj420p -vf sc
 */
 
 const blit::Font tallFont(asset_tall_font);
-FileBrowser fileBrowser(tallFont);
+duh::FileBrowser fileBrowser(tallFont);
 std::string fileToLoad;
 bool renderedLoadMessage = false;