diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f8b16a2 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +example/*.xcconfig +example/bin/* +example/bin/*.app +!example/bin/data/ +example/*.xcodeproj/ +example/*.plist \ No newline at end of file diff --git a/example/Makefile b/example/Makefile new file mode 100644 index 0000000..8d8e4c0 --- /dev/null +++ b/example/Makefile @@ -0,0 +1,13 @@ +# Attempt to load a config.make file. +# If none is found, project defaults in config.project.make will be used. +ifneq ($(wildcard config.make),) + include config.make +endif + +# make sure the the OF_ROOT location is defined +ifndef OF_ROOT + OF_ROOT=$(realpath ../../..) +endif + +# call the project makefile! +include $(OF_ROOT)/libs/openFrameworksCompiled/project/makefileCommon/compile.project.mk diff --git a/example/addons.make b/example/addons.make new file mode 100644 index 0000000..ee616de --- /dev/null +++ b/example/addons.make @@ -0,0 +1 @@ +ofxAVFVideoPlayer diff --git a/example/bin/data/.gitkeep b/example/bin/data/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/example/bin/data/movies/d4n1.mov b/example/bin/data/movies/d4n1.mov new file mode 100644 index 0000000..8e6e78f Binary files /dev/null and b/example/bin/data/movies/d4n1.mov differ diff --git a/example/bin/data/movies/d4n2.mov b/example/bin/data/movies/d4n2.mov new file mode 100644 index 0000000..ae8c192 Binary files /dev/null and b/example/bin/data/movies/d4n2.mov differ diff --git a/example/bin/data/movies/fingers.mov b/example/bin/data/movies/fingers.mov new file mode 100644 index 0000000..768d45e Binary files /dev/null and b/example/bin/data/movies/fingers.mov differ diff --git a/example/bin/data/movies/fingers2.mov b/example/bin/data/movies/fingers2.mov new file mode 100644 index 0000000..3cd4cba Binary files /dev/null and b/example/bin/data/movies/fingers2.mov differ diff --git a/example/bin/data/movies/infinite-self.mov b/example/bin/data/movies/infinite-self.mov new file mode 100644 index 0000000..612e488 Binary files /dev/null and b/example/bin/data/movies/infinite-self.mov differ diff --git a/example/config.make b/example/config.make new file mode 100644 index 0000000..df10f64 --- /dev/null +++ b/example/config.make @@ -0,0 +1,142 @@ +################################################################################ +# CONFIGURE PROJECT MAKEFILE (optional) +# This file is where we make project specific configurations. +################################################################################ + +################################################################################ +# OF ROOT +# The location of your root openFrameworks installation +# (default) OF_ROOT = ../../.. +################################################################################ +# OF_ROOT = ../../.. + +################################################################################ +# PROJECT ROOT +# The location of the project - a starting place for searching for files +# (default) PROJECT_ROOT = . (this directory) +# +################################################################################ +# PROJECT_ROOT = . + +################################################################################ +# PROJECT SPECIFIC CHECKS +# This is a project defined section to create internal makefile flags to +# conditionally enable or disable the addition of various features within +# this makefile. For instance, if you want to make changes based on whether +# GTK is installed, one might test that here and create a variable to check. +################################################################################ +# None + +################################################################################ +# PROJECT EXTERNAL SOURCE PATHS +# These are fully qualified paths that are not within the PROJECT_ROOT folder. +# Like source folders in the PROJECT_ROOT, these paths are subject to +# exlclusion via the PROJECT_EXLCUSIONS list. +# +# (default) PROJECT_EXTERNAL_SOURCE_PATHS = (blank) +# +# Note: Leave a leading space when adding list items with the += operator +################################################################################ +# PROJECT_EXTERNAL_SOURCE_PATHS = + +################################################################################ +# PROJECT EXCLUSIONS +# These makefiles assume that all folders in your current project directory +# and any listed in the PROJECT_EXTERNAL_SOURCH_PATHS are are valid locations +# to look for source code. The any folders or files that match any of the +# items in the PROJECT_EXCLUSIONS list below will be ignored. +# +# Each item in the PROJECT_EXCLUSIONS list will be treated as a complete +# string unless teh user adds a wildcard (%) operator to match subdirectories. +# GNU make only allows one wildcard for matching. The second wildcard (%) is +# treated literally. +# +# (default) PROJECT_EXCLUSIONS = (blank) +# +# Will automatically exclude the following: +# +# $(PROJECT_ROOT)/bin% +# $(PROJECT_ROOT)/obj% +# $(PROJECT_ROOT)/%.xcodeproj +# +# Note: Leave a leading space when adding list items with the += operator +################################################################################ +# PROJECT_EXCLUSIONS = + +################################################################################ +# PROJECT LINKER FLAGS +# These flags will be sent to the linker when compiling the executable. +# +# (default) PROJECT_LDFLAGS = -Wl,-rpath=./libs +# +# Note: Leave a leading space when adding list items with the += operator +################################################################################ + +# Currently, shared libraries that are needed are copied to the +# $(PROJECT_ROOT)/bin/libs directory. The following LDFLAGS tell the linker to +# add a runtime path to search for those shared libraries, since they aren't +# incorporated directly into the final executable application binary. +# TODO: should this be a default setting? +# PROJECT_LDFLAGS=-Wl,-rpath=./libs + +################################################################################ +# PROJECT DEFINES +# Create a space-delimited list of DEFINES. The list will be converted into +# CFLAGS with the "-D" flag later in the makefile. +# +# (default) PROJECT_DEFINES = (blank) +# +# Note: Leave a leading space when adding list items with the += operator +################################################################################ +# PROJECT_DEFINES = + +################################################################################ +# PROJECT CFLAGS +# This is a list of fully qualified CFLAGS required when compiling for this +# project. These CFLAGS will be used IN ADDITION TO the PLATFORM_CFLAGS +# defined in your platform specific core configuration files. These flags are +# presented to the compiler BEFORE the PROJECT_OPTIMIZATION_CFLAGS below. +# +# (default) PROJECT_CFLAGS = (blank) +# +# Note: Before adding PROJECT_CFLAGS, note that the PLATFORM_CFLAGS defined in +# your platform specific configuration file will be applied by default and +# further flags here may not be needed. +# +# Note: Leave a leading space when adding list items with the += operator +################################################################################ +# PROJECT_CFLAGS = + +################################################################################ +# PROJECT OPTIMIZATION CFLAGS +# These are lists of CFLAGS that are target-specific. While any flags could +# be conditionally added, they are usually limited to optimization flags. +# These flags are added BEFORE the PROJECT_CFLAGS. +# +# PROJECT_OPTIMIZATION_CFLAGS_RELEASE flags are only applied to RELEASE targets. +# +# (default) PROJECT_OPTIMIZATION_CFLAGS_RELEASE = (blank) +# +# PROJECT_OPTIMIZATION_CFLAGS_DEBUG flags are only applied to DEBUG targets. +# +# (default) PROJECT_OPTIMIZATION_CFLAGS_DEBUG = (blank) +# +# Note: Before adding PROJECT_OPTIMIZATION_CFLAGS, please note that the +# PLATFORM_OPTIMIZATION_CFLAGS defined in your platform specific configuration +# file will be applied by default and further optimization flags here may not +# be needed. +# +# Note: Leave a leading space when adding list items with the += operator +################################################################################ +# PROJECT_OPTIMIZATION_CFLAGS_RELEASE = +# PROJECT_OPTIMIZATION_CFLAGS_DEBUG = + +################################################################################ +# PROJECT COMPILERS +# Custom compilers can be set for CC and CXX +# (default) PROJECT_CXX = (blank) +# (default) PROJECT_CC = (blank) +# Note: Leave a leading space when adding list items with the += operator +################################################################################ +# PROJECT_CXX = +# PROJECT_CC = diff --git a/example/main.cpp b/example/src/main.cpp similarity index 100% rename from example/main.cpp rename to example/src/main.cpp diff --git a/example/testApp.cpp b/example/src/testApp.cpp similarity index 85% rename from example/testApp.cpp rename to example/src/testApp.cpp index 6bc2d06..30285ec 100644 --- a/example/testApp.cpp +++ b/example/src/testApp.cpp @@ -4,7 +4,7 @@ void testApp::setup(){ for(int i=0; iloadMovie("EmeliSande_NextToMe.mov"); + videoPlayers[i]->loadMovie("movies/fingers.mov"); } @@ -39,16 +39,16 @@ void testApp::draw(){ void testApp::keyPressed(int key){ switch(key) { case '1': - videoPlayers[0]->loadMovie("IntroVideo7.mov"); + videoPlayers[0]->loadMovie("movies/fingers2.mov"); break; case '2': - videoPlayers[1]->loadMovie("TheLumineers_1.mov"); + videoPlayers[1]->loadMovie("movies/d4n1.mov"); break; case '3': - videoPlayers[2]->loadMovie("EmeliSande_NextToMe.mov"); + videoPlayers[2]->loadMovie("movies/d4n2.mov"); break; case '4': - videoPlayers[3]->loadMovie("iHRMF2012_SwedishHouseMafia_DontWorryChild.mov"); + videoPlayers[3]->loadMovie("movies/infinite-self.mov"); break; } // videoPlayer2.loadMovie("IntroVideo7.mov"); @@ -92,4 +92,4 @@ void testApp::gotMessage(ofMessage msg){ //-------------------------------------------------------------- void testApp::dragEvent(ofDragInfo dragInfo){ -} \ No newline at end of file +} diff --git a/example/testApp.h b/example/src/testApp.h similarity index 100% rename from example/testApp.h rename to example/src/testApp.h