From 11a9c7b0413ce2ceea17cd830de90dece40869c1 Mon Sep 17 00:00:00 2001 From: Robert Pancoast Date: Fri, 28 Feb 2020 09:24:28 -0500 Subject: [PATCH] revise --- {src/projectM-sdl/projectM-SDL => mac}/config.h | 0 src/libprojectM/libprojectM.xcodeproj/project.pbxproj | 4 ++-- src/projectM-sdl/SDLprojectM.xcodeproj/project.pbxproj | 4 ++-- src/projectM-sdl/pmSDL.cpp | 6 +++--- src/projectM-sdl/pmSDL.hpp | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) rename {src/projectM-sdl/projectM-SDL => mac}/config.h (100%) diff --git a/src/projectM-sdl/projectM-SDL/config.h b/mac/config.h similarity index 100% rename from src/projectM-sdl/projectM-SDL/config.h rename to mac/config.h diff --git a/src/libprojectM/libprojectM.xcodeproj/project.pbxproj b/src/libprojectM/libprojectM.xcodeproj/project.pbxproj index c7fb26cda..25b8f3e9d 100644 --- a/src/libprojectM/libprojectM.xcodeproj/project.pbxproj +++ b/src/libprojectM/libprojectM.xcodeproj/project.pbxproj @@ -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)/", diff --git a/src/projectM-sdl/SDLprojectM.xcodeproj/project.pbxproj b/src/projectM-sdl/SDLprojectM.xcodeproj/project.pbxproj index c47a9b4a0..54432b922 100644 --- a/src/projectM-sdl/SDLprojectM.xcodeproj/project.pbxproj +++ b/src/projectM-sdl/SDLprojectM.xcodeproj/project.pbxproj @@ -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/"; diff --git a/src/projectM-sdl/pmSDL.cpp b/src/projectM-sdl/pmSDL.cpp index e5e4163a9..70324645e 100644 --- a/src/projectM-sdl/pmSDL.cpp +++ b/src/projectM-sdl/pmSDL.cpp @@ -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; } diff --git a/src/projectM-sdl/pmSDL.hpp b/src/projectM-sdl/pmSDL.hpp index 55fa59d1e..bd55ac0a2 100644 --- a/src/projectM-sdl/pmSDL.hpp +++ b/src/projectM-sdl/pmSDL.hpp @@ -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();