music test

This commit is contained in:
Frank DeMarco 2019-04-20 03:12:27 -04:00
parent 1954d63ecd
commit 0c2b22017e
2 changed files with 28 additions and 8 deletions

View File

@ -36,13 +36,8 @@ glew.o : glew/glew.c
main.o : main.cpp
$(CPPC_LINUX) $(CFLAGS) --std=c++17 $^
demo-linux : main.o glew.o SDL2_rotozoom.o SDL2_gfxPrimitives.o
$(CPPC_LINUX) $(LFLAGS) -D__LINUX__ $^ -lGL -lSDL2_image -lSDL2_ttf -lstdc++fs -o main
linux :
clang++-7 -std=c++17 -c $(CFLAGS) $(INC) -D__LINUX__ main.cpp \
sdl2-gfx/SDL2_gfxPrimitives.c sdl2-gfx/SDL2_rotozoom.c glew/glew.c
clang++-7 $(LFLAGS) SDL2_gfxPrimitives.o SDL2_rotozoom.o glew.o main.o -lGL -lSDL2_image -lSDL2_ttf -lstdc++fs -o main
linux : main.o glew.o SDL2_rotozoom.o SDL2_gfxPrimitives.o
$(CPPC_LINUX) $(LFLAGS) -D__LINUX__ $^ -lGL -lSDL2_image -lSDL2_ttf -lSDL2_mixer -lstdc++fs -o main
android :
if [ ! -d $(BUILDDIR) ]; then mkdir $(BUILDDIR); fi;

View File

@ -23,6 +23,7 @@ namespace fs = std::filesystem;
#include <SDL_image.h>
#include <SDL_ttf.h>
#include <SDL2_gfxPrimitives.h>
#include <SDL_mixer.h>
// #if defined(__LINUX__) or defined(__MINGW32__)
// #define GL_GLEXT_PROTOTYPES
@ -330,7 +331,7 @@ struct Game : Node
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 2);
print_gl_attributes();
if (SDL_Init(SDL_INIT_VIDEO) < 0)
if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO) < 0)
{
print_sdl_error("SDL could not initialize");
flag_to_end();
@ -352,6 +353,28 @@ struct Game : Node
print_sdl_error("Could not initialize SDL ttf");
flag_to_end();
}
else
{
printf("initialized SDL ttf %d.%d.%d\n", SDL_TTF_MAJOR_VERSION,
SDL_TTF_MINOR_VERSION, SDL_TTF_PATCHLEVEL);
}
if (Mix_Init(MIX_INIT_FLAC) == 0)
{
print_sdl_error("Could not initialize SDL mixer");
flag_to_end();
}
else
{
printf("initialized SDL mixer %d.%d.%d\n", SDL_MIXER_MAJOR_VERSION,
SDL_MIXER_MINOR_VERSION, SDL_MIXER_PATCHLEVEL);
}
if (Mix_OpenAudio(MIX_DEFAULT_FREQUENCY, MIX_DEFAULT_FORMAT,
MIX_DEFAULT_CHANNELS, 1024) < 0)
{
print_sdl_error("Could not set up audio");
}
Mix_Music *music = Mix_LoadMUS("resource/Leper.mp3");
Mix_PlayMusic(music, -1);
load_gl_context();
}
@ -798,6 +821,8 @@ struct Game : Node
{
TTF_Quit();
}
Mix_CloseAudio();
Mix_Quit();
SDL_Quit();
}