mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-03-06 15:35:04 +00:00
Code Issues Projects Releases Wiki Activity

revise

Browse Source
This commit is contained in:
Robert Pancoast
2020-02-28 09:24:28 -05:00
parent 3d437b6b94
commit 11a9c7b041
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
src/projectM-sdl/projectM-SDL/config.h → mac/config.h
View File

4
src/libprojectM/libprojectM.xcodeproj/project.pbxproj
View File

@ -921,7 +921,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
"$(SRCROOT)/../projectM-sdl/projectM-SDL",
"$(SRCROOT)/../../mac",
"$(SRCROOT)/../..",
"$(SRCROOT)/Renderer",
"$(SRCROOT)/",
@ -983,7 +983,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
"$(SRCROOT)/../projectM-sdl/projectM-SDL",
"$(SRCROOT)/../../mac",
"$(SRCROOT)/../..",
"$(SRCROOT)/Renderer",
"$(SRCROOT)/",

4
src/projectM-sdl/SDLprojectM.xcodeproj/project.pbxproj
View File

@ -643,7 +643,7 @@
HEADER_SEARCH_PATHS = (
"$(SRCROOT)/../libprojectM",
/usr/local/include,
"$(SRCROOT)/projectM-SDL",
"$(SRCROOT)/../../mac",
);
INFOPLIST_FILE = "$(SRCROOT)/projectM-SDL/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "@executable_path/ @loader_path/../Frameworks/ @loader_path/Frameworks/";
@ -668,7 +668,7 @@
HEADER_SEARCH_PATHS = (
"$(SRCROOT)/../libprojectM",
/usr/local/include,
"$(SRCROOT)/projectM-SDL",
"$(SRCROOT)/../../mac",
);
INFOPLIST_FILE = "$(SRCROOT)/projectM-SDL/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "@executable_path/ @loader_path/../Frameworks/ @loader_path/Frameworks/";

6
src/projectM-sdl/pmSDL.cpp
View File

@ -81,11 +81,11 @@ int projectMSDL::toggleAudioInput() {
if (CurAudioDevice >= NumAudioDevices)
CurAudioDevice = 0;
selectedAudioDevice = CurAudioDevice;
InitAudioInput();
initAudioInput();
return 1;
}
int projectMSDL::InitAudioInput() {
int projectMSDL::initAudioInput() {
// params for audio input
@ -149,7 +149,7 @@ int projectMSDL::openAudioInput() {
}
}
InitAudioInput();
initAudioInput();
return 1;
}

2
src/projectM-sdl/pmSDL.hpp
View File

@ -93,7 +93,7 @@ public:
void init(SDL_Window *window, SDL_GLContext *glCtx, const bool renderToTexture = false);
int openAudioInput();
int toggleAudioInput();
int InitAudioInput();
int initAudioInput();
void beginAudioCapture();
void endAudioCapture();
void stretchMonitors();