From 490fca94917ac77d5bc4510bcbac285460c5aa16 Mon Sep 17 00:00:00 2001 From: "arthur.jamet" Date: Fri, 21 May 2021 13:52:29 +0200 Subject: [PATCH] fix music stream playing state check function --- CMakeLists.txt | 1 + lib/Ray/CMakeLists.txt | 2 -- lib/Ray/sources/Audio/Music.cpp | 5 ++--- lib/Ray/sources/Audio/Music.hpp | 4 ++-- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4695180e..0485dd55 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,6 +4,7 @@ project(bomberman) set(CMAKE_CXX_STANDARD 20) include_directories(bomberman lib/Ray/sources) +include_directories(bomberman lib/wal/sources) set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/lib/raylib) add_subdirectory(${PROJECT_SOURCE_DIR}/lib/wal) diff --git a/lib/Ray/CMakeLists.txt b/lib/Ray/CMakeLists.txt index 9cc4db6d..acdb612f 100644 --- a/lib/Ray/CMakeLists.txt +++ b/lib/Ray/CMakeLists.txt @@ -11,8 +11,6 @@ if (CMAKE_COMPILER_IS_GNUCXX) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_COVERAGE_COMPILE_FLAGS}") endif () -#find_package(raylib REQUIRED) - set(HEADERS sources/Canvas.hpp sources/Color.hpp diff --git a/lib/Ray/sources/Audio/Music.cpp b/lib/Ray/sources/Audio/Music.cpp index 8a9682ae..f7e0b962 100644 --- a/lib/Ray/sources/Audio/Music.cpp +++ b/lib/Ray/sources/Audio/Music.cpp @@ -6,6 +6,7 @@ */ #include "Audio/Music.hpp" +#include RAY::Audio::Music::Music(const std::string &path): _music(LoadMusicStream(path.c_str())) @@ -35,9 +36,7 @@ bool RAY::Audio::Music::unload(void) bool RAY::Audio::Music::isPlaying(void) { - // TODO fix it - return false; - //return IsMusicPlaying(_music); + return IsMusicStreamPlaying(_music); } RAY::Audio::Music &RAY::Audio::Music::play(void) diff --git a/lib/Ray/sources/Audio/Music.hpp b/lib/Ray/sources/Audio/Music.hpp index 26244da0..13f84174 100644 --- a/lib/Ray/sources/Audio/Music.hpp +++ b/lib/Ray/sources/Audio/Music.hpp @@ -5,8 +5,8 @@ ** Music */ -#ifndef Music_HPP_ -#define Music_HPP_ +#ifndef MUSIC_HPP_ +#define MUSIC_HPP_ #include "Audio/IAudio.hpp"