summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxant <xant@dyne.org>2013-07-10 13:44:16 (GMT)
committer xant <xant@dyne.org>2013-07-10 13:44:16 (GMT)
commitc17c2950f22b243793afcfdc058674dae5b18edd (patch)
treebc7dc36ae651ab17317499a4f4d152a5702b6c7f
parent8a0dc30ae86c216c9947fc9eb1e51785274b6e2f (diff)
ensure initializing the alphafade filter
-rw-r--r--JMX.xcodeproj/project.pbxproj6
-rw-r--r--JMXAppDelegate.m2
2 files changed, 8 insertions, 0 deletions
diff --git a/JMX.xcodeproj/project.pbxproj b/JMX.xcodeproj/project.pbxproj
index 0818b30..9b0faef 100644
--- a/JMX.xcodeproj/project.pbxproj
+++ b/JMX.xcodeproj/project.pbxproj
@@ -129,6 +129,9 @@
AA447AC9178D7E8B00DA8700 /* libhttp_parser.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AA447AA2178D7CE500DA8700 /* libhttp_parser.a */; };
AA447ACC178D7F3700DA8700 /* libv8_base.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AA447ACA178D7F2900DA8700 /* libv8_base.a */; };
AA447ACE178D803900DA8700 /* libc++.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = AA447ACD178D803900DA8700 /* libc++.dylib */; };
+ AA447AD2178D9A1D00DA8700 /* CIAdditiveBlur.cikernel in Resources */ = {isa = PBXBuildFile; fileRef = AAEBBA1214FD65CE000DA6F9 /* CIAdditiveBlur.cikernel */; };
+ AA447AD3178D9A1D00DA8700 /* CIAlphaBlend.cikernel in Resources */ = {isa = PBXBuildFile; fileRef = AAEBB8AC14FC1839000DA6F9 /* CIAlphaBlend.cikernel */; };
+ AA447AD4178D9A1D00DA8700 /* CIAlphaFade.cikernel in Resources */ = {isa = PBXBuildFile; fileRef = AA555FC912AEF39600C882FF /* CIAlphaFade.cikernel */; };
AA490DD214CC5F8E00407C0D /* draw_pixels.js in Deploy JS examples */ = {isa = PBXBuildFile; fileRef = AA490DC314CC5F4900407C0D /* draw_pixels.js */; };
AA490DD314CC5F8E00407C0D /* filter_videofile.js in Deploy JS examples */ = {isa = PBXBuildFile; fileRef = AA490DC414CC5F4900407C0D /* filter_videofile.js */; };
AA490DD414CC5F8E00407C0D /* play_mp3dir.js in Deploy JS examples */ = {isa = PBXBuildFile; fileRef = AA490DC514CC5F4900407C0D /* play_mp3dir.js */; };
@@ -1220,6 +1223,9 @@
8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */,
AA54B28B12A1215000EC60B2 /* jmx-icon.icns in Resources */,
+ AA447AD2178D9A1D00DA8700 /* CIAdditiveBlur.cikernel in Resources */,
+ AA447AD3178D9A1D00DA8700 /* CIAlphaBlend.cikernel in Resources */,
+ AA447AD4178D9A1D00DA8700 /* CIAlphaFade.cikernel in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/JMXAppDelegate.m b/JMXAppDelegate.m
index 23362a7..270a47c 100644
--- a/JMXAppDelegate.m
+++ b/JMXAppDelegate.m
@@ -43,6 +43,7 @@
#import "JMXLibraryTableView.h"
#import "JMXHIDInputEntity.h"
#import "CIAlphaBlend.h"
+#import "CIAlphaFade.h"
#import "CIAdditiveBlur.h"
#import <QTKit/QTKit.h>
@@ -69,6 +70,7 @@
[sharedContext registerClass:[JMXHIDInputEntity class]];
[sharedContext registerClass:[JMXAudioToneGenerator class]];
//[QTMovie initialize];
+ [CIAlphaFade class];
[CIAlphaBlend class]; // trigger initialize to have the filter registered and available in the videomixer
[CIAdditiveBlur class];
// if (CPhidgetEncoder_create != NULL) {