Skip to content

Commit bd67325

Browse files
revmischarevmischa
committed
Load presets and play them with playlist (#4)
* Load presets and play them with playlist * CI: build projectM with playlist * CI: build projectM with playlist * CMAKE_MODULE_PATH * projectM4Playlist cmake file * projectM4Playlist cmake file * projectM4Playlist cmake file * projectM4Playlist cmake file * Add shuffle presets property * Add shuffle presets property * Add shuffle presets property * Add option to disable playlist entirely * retry CI * retry CI * formatting * debug * readme
1 parent 6c6403d commit bd67325

File tree

19 files changed

+266
-19
lines changed

19 files changed

+266
-19
lines changed

‎.github/workflows/build_linux.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
- name: Get ProjectM Git Hash
2727
id: git-hash
28-
run: echo "hash=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
28+
run: echo "hash=$(git rev-parse HEAD)v2" >> $GITHUB_OUTPUT
2929

3030
- name: Cache Install
3131
id: cache-install
@@ -42,7 +42,7 @@ jobs:
4242
if: steps.cache-install.outputs.cache-hit != 'true'
4343

4444
- name: Configure Build
45-
run: cmake -G "Ninja" -S "${{ github.workspace }}" -B "${{ github.workspace }}/cmake-build" -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/install" -DCMAKE_VERBOSE_MAKEFILE=YES -DBUILD_SHARED_LIBS=ON
45+
run: cmake -G "Ninja" -S "${{ github.workspace }}" -B "${{ github.workspace }}/cmake-build" -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/install" -DCMAKE_VERBOSE_MAKEFILE=YES -DBUILD_SHARED_LIBS=ON -DENABLE_PLAYLIST=ON
4646
if: steps.cache-install.outputs.cache-hit != 'true'
4747

4848
- name: Build Release
@@ -88,6 +88,8 @@ jobs:
8888
8989
- name: Configure Build
9090
run: cmake -G "Ninja" -S "${{ github.workspace }}" -B "${{ github.workspace }}/cmake-build" -DCMAKE_VERBOSE_MAKEFILE=YES -DprojectM4_DIR="artifacts/lib/cmake/projectM4"
91+
env:
92+
projectM4Playlist_DIR: "${{ github.workspace }}/artifacts/lib/cmake/projectM4Playlist"
9193

9294
- name: Build Release
9395
id: build

‎.github/workflows/build_osx.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
if: steps.cache-install.outputs.cache-hit != 'true'
4444

4545
- name: Configure Build
46-
run: cmake -G "Ninja" -S "${{ github.workspace }}" -B "${{ github.workspace }}/cmake-build" -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/install" -DCMAKE_VERBOSE_MAKEFILE=YES -DBUILD_SHARED_LIBS=ON
46+
run: cmake -G "Ninja" -S "${{ github.workspace }}" -B "${{ github.workspace }}/cmake-build" -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/install" -DCMAKE_VERBOSE_MAKEFILE=YES -DBUILD_SHARED_LIBS=ON -DENABLE_PLAYLIST=ON
4747
if: steps.cache-install.outputs.cache-hit != 'true'
4848

4949
- name: Build Release
@@ -89,6 +89,8 @@ jobs:
8989
9090
- name: Configure Build
9191
run: cmake -G "Ninja" -S "${{ github.workspace }}" -B "${{ github.workspace }}/cmake-build" -DCMAKE_VERBOSE_MAKEFILE=YES -DprojectM4_DIR="artifacts/lib/cmake/projectM4"
92+
env:
93+
projectM4Playlist_DIR: "${{ github.workspace }}/artifacts/lib/cmake/projectM4Playlist"
9294

9395
- name: Build Release
9496
id: build

‎.github/workflows/build_windows.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
3535
- name: Get ProjectM Git Hash
3636
id: git-hash
37-
run: echo "hash=$(git rev-parse HEAD)" >> $Env:GITHUB_OUTPUT
37+
run: echo "hash=$(git rev-parse HEAD)v2" >> $Env:GITHUB_OUTPUT
3838

3939
- name: Cache Install
4040
id: cache-install
@@ -45,7 +45,7 @@ jobs:
4545
key: install-${{ runner.os }}-projectm-${{ steps.git-hash.outputs.hash }}
4646

4747
- name: Configure Build
48-
run: cmake -G "Visual Studio 17 2022" -A "X64" -S "${{ github.workspace }}" -B "${{ github.workspace }}/cmake-build" -DCMAKE_TOOLCHAIN_FILE="${Env:VCPKG_INSTALLATION_ROOT}/scripts/buildsystems/vcpkg.cmake" -DVCPKG_TARGET_TRIPLET=x64-windows -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/install" -DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded$<$<CONFIG:Debug>:Debug>DLL" -DCMAKE_VERBOSE_MAKEFILE=YES -DBUILD_SHARED_LIBS=ON
48+
run: cmake -G "Visual Studio 17 2022" -A "X64" -S "${{ github.workspace }}" -B "${{ github.workspace }}/cmake-build" -DCMAKE_TOOLCHAIN_FILE="${Env:VCPKG_INSTALLATION_ROOT}/scripts/buildsystems/vcpkg.cmake" -DVCPKG_TARGET_TRIPLET=x64-windows -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/install" -DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded$<$<CONFIG:Debug>:Debug>DLL" -DCMAKE_VERBOSE_MAKEFILE=YES -DBUILD_SHARED_LIBS=ON -DENABLE_PLAYLIST=ON
4949
if: steps.cache-install.outputs.cache-hit != 'true'
5050

5151
- name: Build Release
@@ -97,6 +97,8 @@ jobs:
9797

9898
- name: Configure Build
9999
run: cmake -G "Visual Studio 17 2022" -A "X64" -S "${{ github.workspace }}" -B "${{ github.workspace }}/cmake-build" -DCMAKE_TOOLCHAIN_FILE="${Env:VCPKG_INSTALLATION_ROOT}/scripts/buildsystems/vcpkg.cmake" -DVCPKG_TARGET_TRIPLET=x64-windows -DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded$<$<CONFIG:Debug>:Debug>" -DCMAKE_VERBOSE_MAKEFILE=YES -DprojectM4_DIR="artifacts/lib/cmake/projectM4"
100+
env:
101+
projectM4Playlist_DIR: "${{ github.workspace }}/artifacts/lib/cmake/projectM4Playlist"
100102

101103
- name: Build Release
102104
id: build

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,6 @@
44
build
55
dist
66
docs/TODO.md
7-
test/output
7+
test/output
8+
cmake-build-*
9+
out/

‎.idea/.gitignore‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/.name‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/editor.xml‎

Lines changed: 103 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/gst-projectm.iml‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/modules.xml‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)