summaryrefslogtreecommitdiff
path: root/menuApp
diff options
context:
space:
mode:
authortim <tim@eclectronics.org>2018-04-15 13:20:13 +0100
committertim <tim@eclectronics.org>2018-04-15 13:20:13 +0100
commit7c080ed914ad1291bc07cd8b6ce58e5093b14203 (patch)
tree666d951a667813f9757db91ac97ba65c01ef905a /menuApp
parent04e2b181ebb094d0e53d07b5fc9e838f1261e622 (diff)
remove instagram
Diffstat (limited to 'menuApp')
-rw-r--r--menuApp/bin/libs/libfmodex.sobin1532700 -> 0 bytes
-rw-r--r--menuApp/src/ofApp.cpp9
2 files changed, 6 insertions, 3 deletions
diff --git a/menuApp/bin/libs/libfmodex.so b/menuApp/bin/libs/libfmodex.so
deleted file mode 100644
index ac9d264..0000000
--- a/menuApp/bin/libs/libfmodex.so
+++ /dev/null
Binary files differ
diff --git a/menuApp/src/ofApp.cpp b/menuApp/src/ofApp.cpp
index 9e046eb..6f0206a 100644
--- a/menuApp/src/ofApp.cpp
+++ b/menuApp/src/ofApp.cpp
@@ -152,12 +152,12 @@ void ofApp::setup(){
background.load("images/background1080.png");
overlay.load("images/overlay1080.png");
- instagram.setup(hangdaitoken,"self");
- instagram.setCertFileLocation(ofToDataPath("ca-bundle.crt",false));
+ //instagram.setup(hangdaitoken,"self");
+ //instagram.setCertFileLocation(ofToDataPath("ca-bundle.crt",false));
menutag=MENUTAG;
- loadInstagramFeed();
+ //loadInstagramFeed();
/*
instagram.getUserRecentMedia("self");
@@ -196,6 +196,9 @@ void ofApp::draw(){
//ofTranslate(0*FACTOR,0*FACTOR);
}
+ player.draw();
+ return;
+
if (!player.draw()){
if(ofGetElapsedTimef()-lastPoll>POLL_INTERVAL) {