diff --git a/.github/workflows/build_emscripten.yml b/.github/workflows/build_emscripten.yml index 1b36960a7..4edb75a7e 100644 --- a/.github/workflows/build_emscripten.yml +++ b/.github/workflows/build_emscripten.yml @@ -33,7 +33,9 @@ jobs: run: emcc -v - name: Install Packages - run: sudo apt-get install -y libgl1-mesa-dev mesa-common-dev libsdl2-dev libglm-dev llvm-dev ninja-build + run: | + sudo apt-get update + sudo apt-get install -y libgl1-mesa-dev mesa-common-dev libsdl2-dev libglm-dev llvm-dev ninja-build - name: Build GoogleTest From Source run: | diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml index 76c304ca8..350578699 100644 --- a/.github/workflows/build_linux.yml +++ b/.github/workflows/build_linux.yml @@ -20,7 +20,9 @@ jobs: - uses: actions/checkout@v3 - name: Install Packages - run: sudo apt-get install -y libgl1-mesa-dev mesa-common-dev libsdl2-dev libglm-dev llvm-dev libgtest-dev libgmock-dev ninja-build + run: | + sudo apt-get update + sudo apt-get install -y libgl1-mesa-dev mesa-common-dev libsdl2-dev libglm-dev llvm-dev libgtest-dev libgmock-dev ninja-build - name: Configure Build run: cmake -G "Ninja Multi-Config" -S "${{ github.workspace }}" -B "${{ github.workspace }}/cmake-build" -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/install" -DCMAKE_VERBOSE_MAKEFILE=YES -DBUILD_TESTING=YES diff --git a/src/api/include/libprojectM/projectM.h b/src/api/include/libprojectM/projectM.h index d1b2534e6..8b688738d 100644 --- a/src/api/include/libprojectM/projectM.h +++ b/src/api/include/libprojectM/projectM.h @@ -1,4 +1,6 @@ -/* +/** + * @file projectM.h + * * projectM -- Milkdrop-esque visualisation SDK * Copyright (C)2003-2021 projectM Team * @@ -87,7 +89,7 @@ PROJECTM_EXPORT char* projectm_alloc_string(unsigned int length); * *

Do not use free() to delete the pointer!

* - * @param settings A pointer returned by projectm_alloc_string(). + * @param str A pointer returned by projectm_alloc_string(). */ PROJECTM_EXPORT void projectm_free_string(const char* str); diff --git a/src/libprojectM/TimeKeeper.cpp b/src/libprojectM/TimeKeeper.cpp index 5594c705d..839401e6c 100644 --- a/src/libprojectM/TimeKeeper.cpp +++ b/src/libprojectM/TimeKeeper.cpp @@ -103,7 +103,6 @@ int TimeKeeper::PresetTimeA() double TimeKeeper::sampledPresetDuration() { - return std::max(1, std::min(60, RandomNumberGenerators::gaussian - (m_presetDuration, m_easterEgg))); + return std::max(1, RandomNumberGenerators::gaussian(m_presetDuration, m_easterEgg)); } diff --git a/src/playlist/playlist.h b/src/playlist/playlist.h index 975ffa7e4..365c89dbb 100644 --- a/src/playlist/playlist.h +++ b/src/playlist/playlist.h @@ -1,3 +1,8 @@ +/** + * @file playlist.h + * + * Optional playlist API for libprojectM. + */ #pragma once #include "libprojectM/projectM.h" @@ -93,8 +98,8 @@ typedef void (*projectm_playlist_preset_switch_failed_event)(const char* preset_ * * To switch to another playlist, use the projectm_playlist_connect() method. * - * @param instance The projectM instance to connect to. Can be a null pointer to leave the newly - * created playlist instance unconnected. + * @param projectm_instance The projectM instance to connect to. Can be a null pointer to leave the newly + * created playlist instance unconnected. * @return An opaque pointer to the newly created playlist manager instance. Null if creation failed. */ PROJECTM_PLAYLIST_EXPORT projectm_playlist_handle projectm_playlist_create(projectm_handle projectm_instance);