mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-02-20 20:45:51 +00:00
Code Issues Projects Releases Wiki Activity

some fixes for itunes plugin support. still doesn't really work

Browse Source
This commit is contained in:
Mischa Spiegelmock
2018-08-04 11:03:22 +03:00
parent 4ef9b71fd9
commit 79f225c8d0
4 changed files with 76 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/projectM-iTunes/iprojectM.hpp
View File

@ -52,7 +52,7 @@
#include "libprojectM/projectM.hpp"
#include "getConfigFilename.h"
#include <time.h>
#include <OpenGL/gl.h>
#include <OpenGL/gl3.h>
#if TARGET_OS_MAC
#import <Cocoa/Cocoa.h>

13
src/projectM-iTunes/iprojectM.mm
View File

@ -31,12 +31,20 @@ void initProjectM( VisualPluginData * visualPluginData ) {
settings.menuFontURL = "/usr/local/share/projectM/fonts/VeraMono.ttf";
//projectM *pm = new projectM(settings, 0);
NSLog(@"GL_VERSION: %s", glGetString(GL_VERSION));
NSLog(@"GL_SHADING_LANGUAGE_VERSION: %s", glGetString(GL_SHADING_LANGUAGE_VERSION));
NSLog(@"GL_VENDOR: %s", glGetString(GL_VENDOR));
NSLog(@"opening config");
// use config file
projectM *pm = new projectM(cfg_path);
visualPluginData->pm = pm;
pm->selectRandom(true);
NSLog(@"random selected");
}
void keypressProjectM( VisualPluginData * visualPluginData, projectMEvent event, projectMKeycode keycode, projectMModifier mod ) {
@ -44,6 +52,8 @@ void keypressProjectM( VisualPluginData * visualPluginData, projectMEvent event,
}
void renderProjectMTexture( VisualPluginData * visualPluginData ){
// this needs to be updated for gl3 (see SDL version)
#if 0
static int textureHandle = visualPluginData->pm->initRenderToTexture();
glClear(GL_COLOR_BUFFER_BIT);
@ -82,6 +92,7 @@ void renderProjectMTexture( VisualPluginData * visualPluginData ){
glMatrixMode(GL_MODELVIEW);
glDisable(GL_DEPTH_TEST);
#endif
}
//-------------------------------------------------------------------------------------------------
@ -463,6 +474,6 @@ OSStatus RegisterVisualPlugin( PluginMessageInfo * messageInfo )
playerMessageInfo.u.registerVisualPluginMessage.maxHeight = 0; // no max height limit
status = PlayerRegisterVisualPlugin( messageInfo->u.initMessage.appCookie, messageInfo->u.initMessage.appProc, &playerMessageInfo );
return status;
}

31
src/projectM-iTunes/iprojectM_mac.mm
View File

@ -3,11 +3,12 @@
// based on the iTunes SDK example code
// https://www.fenestrated.net/mirrors/Apple%20Technotes%20(As%20of%202002)/tn/tn2016.html
#import "iprojectM.hpp"
#import <AppKit/AppKit.h>
#import <OpenGL/gl.h>
#import <OpenGL/glu.h>
#import <OpenGL/gl3.h>
#import <string.h>
#include "libprojectM/cocoatoprojectM.h"
@ -48,7 +49,6 @@ void DrawVisual( VisualPluginData * visualPluginData )
[[drawView openGLContext] makeCurrentContext];
#endif
if (visualPluginData->pm == NULL) {
initProjectM(visualPluginData);
@ -62,8 +62,9 @@ void DrawVisual( VisualPluginData * visualPluginData )
// render
visualPluginData->pm->renderFrame();
//renderProjectMTexture(visualPluginData);
glFlush();
[[drawView openGLContext] flushBuffer];
// glFlush();
return;
@ -250,6 +251,26 @@ OSStatus ConfigureVisual( VisualPluginData * visualPluginData )
@synthesize visualPluginData = _visualPluginData;
- (id)initWithFrame:(NSRect)frame
{
NSLog(@"initWithFrame called");
NSOpenGLPixelFormatAttribute pixelFormatAttributes[] =
{
NSOpenGLPFAOpenGLProfile, NSOpenGLProfileVersion3_2Core,
// NSOpenGLPFAOpenGLProfile, NSOpenGLProfileVersion4_1Core,
NSOpenGLPFAColorSize , 24 ,
NSOpenGLPFAAlphaSize , 8 ,
NSOpenGLPFADoubleBuffer ,
NSOpenGLPFAAccelerated ,
NSOpenGLPFANoRecovery ,
0
};
NSOpenGLPixelFormat *pixelFormat = [[NSOpenGLPixelFormat alloc] initWithAttributes:pixelFormatAttributes];
self = [super initWithFrame:frame pixelFormat:pixelFormat];
return self;
}
//-------------------------------------------------------------------------------------------------
// isOpaque
//-------------------------------------------------------------------------------------------------

64
src/projectM-iTunes/projectM Visualizer.xcodeproj/project.pbxproj
View File

@ -7,14 +7,10 @@
objects = {
/* Begin PBXBuildFile section */
16A4214820781836006F30CE /* libRenderer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 16A4214420781835006F30CE /* libRenderer.a */; };
16A4214920781836006F30CE /* libRenderer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 16A4214420781835006F30CE /* libRenderer.a */; };
16A4214A20781836006F30CE /* libMilkdropPresetFactory.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 16A4214520781835006F30CE /* libMilkdropPresetFactory.a */; };
16A4214B20781836006F30CE /* libMilkdropPresetFactory.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 16A4214520781835006F30CE /* libMilkdropPresetFactory.a */; };
16A4214C20781836006F30CE /* libNativePresetFactory.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 16A4214620781835006F30CE /* libNativePresetFactory.a */; };
16A4214D20781836006F30CE /* libNativePresetFactory.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 16A4214620781835006F30CE /* libNativePresetFactory.a */; };
16A4214E20781836006F30CE /* libprojectM.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 16A4214720781836006F30CE /* libprojectM.a */; };
16A4214F20781836006F30CE /* libprojectM.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 16A4214720781836006F30CE /* libprojectM.a */; };
16FE0B2121157D62005F170D /* libMilkdropPresetFactory.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 168F716D21125D85001806E7 /* libMilkdropPresetFactory.a */; };
16FE0B2221157D63005F170D /* libNativePresetFactory.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 168F716F21125D85001806E7 /* libNativePresetFactory.a */; };
16FE0B2321157D63005F170D /* libprojectM.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 168F716B21125D85001806E7 /* libprojectM.a */; };
16FE0B2421157D63005F170D /* libRenderer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 168F716921125D85001806E7 /* libRenderer.a */; };
C34E811C1956D0D4001AC5B5 /* libz.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C34E811B1956D0D4001AC5B5 /* libz.a */; };
C34E811E1956D0D6001AC5B5 /* libpng15.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C34E811D1956D0D6001AC5B5 /* libpng15.a */; };
C34E81201956D0D8001AC5B5 /* libftgl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C34E811F1956D0D8001AC5B5 /* libftgl.a */; };
@ -74,19 +70,23 @@
remoteGlobalIDString = 1612C9AC207A856A00862A3A;
remoteInfo = NativePresetFactory;
};
16FE0B1B21157D55005F170D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 168F716121125D85001806E7 /* libprojectM.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 16A49E56207A7C8C00E508EA;
remoteInfo = projectM;
};
16FE0B2521157D84005F170D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = C3F9D7A717B82CC3009E58CB /* Project object */;
proxyType = 1;
remoteGlobalIDString = C3F9D7AE17B82CC3009E58CB;
remoteInfo = iProjectM;
};
/* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */
C3C24430195764660021FCD4 /* Copy Files */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
);
name = "Copy Files";
runOnlyForDeploymentPostprocessing = 0;
};
C3FAE5A917B898BB00F4B110 /* plist */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
@ -176,10 +176,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
16A4214D20781836006F30CE /* libNativePresetFactory.a in Frameworks */,
16A4214920781836006F30CE /* libRenderer.a in Frameworks */,
16A4214B20781836006F30CE /* libMilkdropPresetFactory.a in Frameworks */,
16A4214F20781836006F30CE /* libprojectM.a in Frameworks */,
C37EBD2C19A0112900220265 /* Cocoa.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
@ -188,14 +184,14 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
16FE0B2121157D62005F170D /* libMilkdropPresetFactory.a in Frameworks */,
16FE0B2221157D63005F170D /* libNativePresetFactory.a in Frameworks */,
16FE0B2321157D63005F170D /* libprojectM.a in Frameworks */,
16FE0B2421157D63005F170D /* libRenderer.a in Frameworks */,
C3C24435195764870021FCD4 /* libGLEW.a in Frameworks */,
16A4214C20781836006F30CE /* libNativePresetFactory.a in Frameworks */,
C34E81241956D0DA001AC5B5 /* libbz2.a in Frameworks */,
C34E81221956D0D9001AC5B5 /* libfreetype.a in Frameworks */,
16A4214A20781836006F30CE /* libMilkdropPresetFactory.a in Frameworks */,
C34E81201956D0D8001AC5B5 /* libftgl.a in Frameworks */,
16A4214820781836006F30CE /* libRenderer.a in Frameworks */,
16A4214E20781836006F30CE /* libprojectM.a in Frameworks */,
C34E811E1956D0D6001AC5B5 /* libpng15.a in Frameworks */,
C34E811C1956D0D4001AC5B5 /* libz.a in Frameworks */,
C3F9D7CF17B831F3009E58CB /* OpenGL.framework in Frameworks */,
@ -366,6 +362,7 @@
buildRules = (
);
dependencies = (
16FE0B2621157D84005F170D /* PBXTargetDependency */,
);
name = "projectM Visualizer";
productName = "projectM Visualizer";
@ -379,13 +376,13 @@
C3F9D7AB17B82CC3009E58CB /* Sources */,
C3F9D7AC17B82CC3009E58CB /* Frameworks */,
C3FAE5A917B898BB00F4B110 /* plist */,
C3C24430195764660021FCD4 /* Copy Files */,
C3FAF97317B89F1700F4B110 /* share */,
C3FAE5AB17B898F800F4B110 /* Generate Installer Package */,
);
buildRules = (
);
dependencies = (
16FE0B1C21157D55005F170D /* PBXTargetDependency */,
);
name = iProjectM;
productName = iProjectM;
@ -527,6 +524,19 @@
};
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
16FE0B1C21157D55005F170D /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = projectM;
targetProxy = 16FE0B1B21157D55005F170D /* PBXContainerItemProxy */;
};
16FE0B2621157D84005F170D /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = C3F9D7AE17B82CC3009E58CB /* iProjectM */;
targetProxy = 16FE0B2521157D84005F170D /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
/* Begin PBXVariantGroup section */
C37EBD3019A0112900220265 /* InfoPlist.strings */ = {
isa = PBXVariantGroup;