use bundled presets, skip config file. make self-contained

Author: revmischa

src/projectM-iTunes/iprojectM.hpp

@@ -80,18 +80,14 @@
 
 struct VisualPluginData;
 
-#if TARGET_OS_MAC
 #import <Cocoa/Cocoa.h>
 #import <AppKit/AppKit.h>
 
 // "namespace" our ObjC classname to avoid load conflicts between multiple visualizer plugins
 #define VisualView		iProjectM_VisualView
-#define GLVisualView	iProjectM_GLVisualView
 
 @class VisualView;
-@class GLVisualView;
 
-#endif
 
 #define kInfoTimeOutInSeconds		10							// draw info/artwork for N seconds when it changes or playback starts
 #define kPlayingPulseRateInHz		60							// when iTunes is playing, draw N times a second
@@ -162,7 +158,7 @@ void		InvalidateVisual( VisualPluginData * visualPluginData );
 
 OSStatus	ConfigureVisual( VisualPluginData * visualPluginData );
 
-void        initProjectM( VisualPluginData * visualPluginData );
+void        initProjectM( VisualPluginData * visualPluginData, std::string presetPath );
 void        renderProjectMTexture( VisualPluginData * visualPluginData );
 void        keypressProjectM( VisualPluginData * visualPluginData, projectMEvent event, projectMKeycode keycode, projectMModifier mod );
 

src/projectM-iTunes/iprojectM.mm

@@ -7,7 +7,7 @@
 
 
 // projectM
-void initProjectM( VisualPluginData * visualPluginData ) {
+void initProjectM( VisualPluginData * visualPluginData, std::string presetPath ) {
 //    std::string config_filename = getConfigFilename();
     std::string cfg_path = "/usr/local/share/projectM/config.inp";
 
@@ -20,23 +20,24 @@ void initProjectM( VisualPluginData * visualPluginData ) {
     settings.windowWidth = 1920;
     settings.windowHeight = 1280;
     settings.smoothPresetDuration = 1; // seconds
-    settings.presetDuration = 5; // seconds
+    settings.presetDuration = 1; // seconds
     settings.beatSensitivity = 0.8;
     settings.aspectCorrection = 1;
     settings.easterEgg = 0; // ???
     settings.shuffleEnabled = 1;
     settings.softCutRatingsEnabled = 1; // ???
-    settings.presetURL = "/usr/local/share/projectM/presets";
+
+    settings.presetURL = presetPath;
     settings.titleFontURL = "/usr/local/share/projectM/fonts/Vera.ttf";
     settings.menuFontURL = "/usr/local/share/projectM/fonts/VeraMono.ttf";
-    //projectM *pm = new projectM(settings, 0);
+    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));
 
     // use config file
-    projectM *pm = new projectM(cfg_path);
+//    projectM *pm = new projectM(cfg_path);
 
     visualPluginData->pm = pm;
 

src/projectM-iTunes/iprojectM_mac.mm

@@ -55,7 +55,7 @@ void DrawVisual( VisualPluginData * visualPluginData )
 //    [[drawView openGLContext] flushBuffer];
     glFlush();
 
-    return;
+//    return;
 
     // TODO: artwork overlay
 
@@ -166,7 +166,13 @@ OSStatus ActivateVisual( VisualPluginData * visualPluginData, VISUAL_PLATFORM_VI
 #endif
     NSLog(@"activate visual");
     if (visualPluginData->pm == NULL) {
-        initProjectM(visualPluginData);
+        
+        NSBundle* me = [NSBundle bundleForClass: VisualView.class];
+        NSLog(@"main bundle: %@", [me bundlePath]);
+        NSString* presetsPath = [me pathForResource:@"presets" ofType:nil];
+        NSLog(@"presets path %@", presetsPath);
+        
+        initProjectM(visualPluginData, std::string([presetsPath UTF8String]));
 
         // correctly size it
         ResizeVisual(visualPluginData);

src/projectM-iTunes/projectM Visualizer.xcodeproj/project.pbxproj

@@ -495,7 +495,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/bash;
-			shellScript = "mkdir -p \"$DSTROOT/usr/local/share/projectM/presets\"\n#cp -r \"$SRCROOT\"/../../presets/custom/* \"$DSTROOT/usr/local/share/projectM/presets/\"\ncp -r \"$SRCROOT\"/../../presets/presets_tryptonaut/* \"$DSTROOT/usr/local/share/projectM/presets/\"\ncp -r \"$SRCROOT\"/../../presets/presets_bltc201/* \"$DSTROOT/usr/local/share/projectM/presets/\"\n#rm -rf \"$SRCROOT/iProjectM.bundle\"\n#cp -r \"$DSTROOT/Library/iTunes/iTunes Plug-ins/iProjectM.bundle\" $SRCROOT/\ninstall_name_tool -change @executable_path/../Frameworks/Cg.framework/Cg @loader_path/../Frameworks/Cg.framework/Cg \"$DSTROOT/Library/iTunes/iTunes Plug-ins/iProjectM.bundle/Contents/MacOS/iProjectM\"\ncp -r $CONFIGURATION_BUILD_DIR/share/* \"$DSTROOT/usr/local/share/projectM\"\npkgbuild --component-plist \"$SRCROOT/iProjectM-pkg.plist\" --root \"$DSTROOT\" \"$SRCROOT/iProjectM.pkg\"\n";
+			shellScript = "POUT=\"$BUILT_PRODUCTS_DIR\"/\"$CONTENTS_FOLDER_PATH/Resources/presets\"\nPIN=\"$SRCROOT\"/../../presets\n\nmkdir -p \"$POUT\"\nfor preset_dir in \"$PIN/\"*; do\ncp \"$preset_dir/\"* \"$POUT/\"\ndone\necho \"Copied presets to $POUT\"\n\n\npkgbuild --component-plist \"$SRCROOT/iProjectM-pkg.plist\" --root \"$DSTROOT\" \"$SRCROOT/iTunes Visualizer.pkg\"\n";
 		};
 /* End PBXShellScriptBuildPhase section */