mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-02-07 15:25:38 +00:00
Code Issues Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Mischa Spiegelmock
2018-04-05 21:47:23 -07:00
parent e4735008ff
commit f175751da0
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,10 +9,10 @@
/* Begin PBXBuildFile section */
161070DD1F705069001905AB /* Cg.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 161070DC1F705069001905AB /* Cg.framework */; };
169502001F7009E9008FAF86 /* pmSDL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 169501FE1F7009E9008FAF86 /* pmSDL.cpp */; };
16A9B64D20772F3F003DF747 /* libprojectM.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 16A9B64C20772F3F003DF747 /* libprojectM.a */; };
16A9B64F20772F71003DF747 /* libMilkdropPresetFactory.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 16A9B64E20772F71003DF747 /* libMilkdropPresetFactory.a */; };
16A9B65120772F7C003DF747 /* libNativePresetFactory.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 16A9B65020772F7C003DF747 /* libNativePresetFactory.a */; };
16A9B65320772F86003DF747 /* libRenderer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 16A9B65220772F85003DF747 /* libRenderer.a */; };
16A9B655207732FF003DF747 /* libprojectM.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 16A9B654207732FF003DF747 /* libprojectM.a */; };
C307DFD41D565B57002F6B9E /* presets in CopyFiles */ = {isa = PBXBuildFile; fileRef = C307DFD31D565B57002F6B9E /* presets */; };
C345214F1BF022A5001707D2 /* projectM_SDL_main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C345214E1BF022A5001707D2 /* projectM_SDL_main.cpp */; };
C345215C1BF025A9001707D2 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C345215B1BF025A9001707D2 /* OpenGL.framework */; };
@ -53,11 +53,10 @@
161070DC1F705069001905AB /* Cg.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cg.framework; path = ../../../../../../Library/Frameworks/Cg.framework; sourceTree = "<group>"; };
169501FE1F7009E9008FAF86 /* pmSDL.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pmSDL.cpp; sourceTree = "<group>"; };
169501FF1F7009E9008FAF86 /* pmSDL.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = pmSDL.hpp; sourceTree = "<group>"; };
16A9B64A20772F25003DF747 /* libprojectM.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libprojectM.a; path = ../libprojectM/.libs/libprojectM.a; sourceTree = "<group>"; };
16A9B64C20772F3F003DF747 /* libprojectM.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libprojectM.a; path = ../libprojectM/.libs/libprojectM.a; sourceTree = "<group>"; };
16A9B64E20772F71003DF747 /* libMilkdropPresetFactory.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libMilkdropPresetFactory.a; path = ../libprojectM/MilkdropPresetFactory/.libs/libMilkdropPresetFactory.a; sourceTree = "<group>"; };
16A9B65020772F7C003DF747 /* libNativePresetFactory.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libNativePresetFactory.a; path = ../libprojectM/NativePresetFactory/.libs/libNativePresetFactory.a; sourceTree = "<group>"; };
16A9B65220772F85003DF747 /* libRenderer.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libRenderer.a; path = ../libprojectM/Renderer/.libs/libRenderer.a; sourceTree = "<group>"; };
16A9B654207732FF003DF747 /* libprojectM.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libprojectM.a; path = ../libprojectM/.libs/libprojectM.a; sourceTree = "<group>"; };
C307DFD31D565B57002F6B9E /* presets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = presets; path = ../../presets; sourceTree = "<group>"; };
C34521441BF02294001707D2 /* SDLprojectM */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = SDLprojectM; sourceTree = BUILT_PRODUCTS_DIR; };
C345214E1BF022A5001707D2 /* projectM_SDL_main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = projectM_SDL_main.cpp; sourceTree = SOURCE_ROOT; };
@ -78,10 +77,10 @@
buildActionMask = 2147483647;
files = (
161070DD1F705069001905AB /* Cg.framework in Frameworks */,
16A9B655207732FF003DF747 /* libprojectM.a in Frameworks */,
16A9B64F20772F71003DF747 /* libMilkdropPresetFactory.a in Frameworks */,
C345215E1BF025CF001707D2 /* CoreFoundation.framework in Frameworks */,
16A9B65120772F7C003DF747 /* libNativePresetFactory.a in Frameworks */,
16A9B64D20772F3F003DF747 /* libprojectM.a in Frameworks */,
C345215C1BF025A9001707D2 /* OpenGL.framework in Frameworks */,
C34521651BF025E5001707D2 /* libbz2.a in Frameworks */,
C34521661BF025E5001707D2 /* libfreetype.a in Frameworks */,
@ -99,7 +98,6 @@
161070CE1F7041B0001905AB /* Frameworks */ = {
isa = PBXGroup;
children = (
16A9B64A20772F25003DF747 /* libprojectM.a */,
161070DC1F705069001905AB /* Cg.framework */,
C345215D1BF025CF001707D2 /* CoreFoundation.framework */,
C345215B1BF025A9001707D2 /* OpenGL.framework */,
@ -120,10 +118,10 @@
C34521621BF025E5001707D2 /* libGLEW.a */,
C34521631BF025E5001707D2 /* libpng15.a */,
C34521641BF025E5001707D2 /* libz.a */,
16A9B64C20772F3F003DF747 /* libprojectM.a */,
16A9B64E20772F71003DF747 /* libMilkdropPresetFactory.a */,
16A9B65020772F7C003DF747 /* libNativePresetFactory.a */,
16A9B65220772F85003DF747 /* libRenderer.a */,
16A9B654207732FF003DF747 /* libprojectM.a */,
161070CE1F7041B0001905AB /* Frameworks */,
C34521451BF02294001707D2 /* Products */,
C3D30B8F1BF02BE5009AAACD /* fonts */,

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

@ -31,16 +31,12 @@ void projectMSDL::audioInputCallbackS16(void *userdata, unsigned char *stream, i
SDL_AudioDeviceID projectMSDL::selectAudioInput(int count) {
// ask the user which capture device to use
// printf("Please select which audio input to use:\n");
printf("Detected devices\n");
printf("Detected devices:\n");
for (int i = 0; i < count; i++) {
printf("%i: 🎤%s", i, SDL_GetAudioDeviceName(i, true));
printf(" %i: 🎤%s\n", i, SDL_GetAudioDeviceName(i, true));
}
SDL_AudioDeviceID device_id;
return 0;
scanf("%u", &device_id);
return device_id;
}
int projectMSDL::openAudioInput() {