summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--futuregael/bin/data/Agus ní ghlacann an inneall seo.m4abin75046 -> 0 bytes
-rw-r--r--futuregael/bin/data/Agus ní ghlacann an inneall seo.mp3bin0 -> 72633 bytes
-rw-r--r--futuregael/bin/data/Casaimid lenár gcroíthe.m4abin29859 -> 0 bytes
-rw-r--r--futuregael/bin/data/Casaimid lenár gcroíthe.mp3bin0 -> 26162 bytes
-rw-r--r--futuregael/bin/data/Inneall Intleacht Shaorga mé.m4abin229168 -> 0 bytes
-rw-r--r--futuregael/bin/data/Inneall Intleacht Shaorga mé.mp3bin0 -> 220662 bytes
-rw-r--r--futuregael/bin/data/show.csv4
-rw-r--r--futuregael/config.make2
-rw-r--r--futuregael/src/main.cpp22
-rw-r--r--futuregael/src/ofApp.cpp2
10 files changed, 26 insertions, 4 deletions
diff --git a/futuregael/bin/data/Agus ní ghlacann an inneall seo.m4a b/futuregael/bin/data/Agus ní ghlacann an inneall seo.m4a
deleted file mode 100644
index bd5d572..0000000
--- a/futuregael/bin/data/Agus ní ghlacann an inneall seo.m4a
+++ /dev/null
Binary files differ
diff --git a/futuregael/bin/data/Agus ní ghlacann an inneall seo.mp3 b/futuregael/bin/data/Agus ní ghlacann an inneall seo.mp3
new file mode 100644
index 0000000..dcef96e
--- /dev/null
+++ b/futuregael/bin/data/Agus ní ghlacann an inneall seo.mp3
Binary files differ
diff --git a/futuregael/bin/data/Casaimid lenár gcroíthe.m4a b/futuregael/bin/data/Casaimid lenár gcroíthe.m4a
deleted file mode 100644
index 07b8bb5..0000000
--- a/futuregael/bin/data/Casaimid lenár gcroíthe.m4a
+++ /dev/null
Binary files differ
diff --git a/futuregael/bin/data/Casaimid lenár gcroíthe.mp3 b/futuregael/bin/data/Casaimid lenár gcroíthe.mp3
new file mode 100644
index 0000000..36e80fb
--- /dev/null
+++ b/futuregael/bin/data/Casaimid lenár gcroíthe.mp3
Binary files differ
diff --git a/futuregael/bin/data/Inneall Intleacht Shaorga mé.m4a b/futuregael/bin/data/Inneall Intleacht Shaorga mé.m4a
deleted file mode 100644
index d728e1b..0000000
--- a/futuregael/bin/data/Inneall Intleacht Shaorga mé.m4a
+++ /dev/null
Binary files differ
diff --git a/futuregael/bin/data/Inneall Intleacht Shaorga mé.mp3 b/futuregael/bin/data/Inneall Intleacht Shaorga mé.mp3
new file mode 100644
index 0000000..010d404
--- /dev/null
+++ b/futuregael/bin/data/Inneall Intleacht Shaorga mé.mp3
Binary files differ
diff --git a/futuregael/bin/data/show.csv b/futuregael/bin/data/show.csv
index 1203034..ab33dd8 100644
--- a/futuregael/bin/data/show.csv
+++ b/futuregael/bin/data/show.csv
@@ -1,2 +1,2 @@
-Inneall Intleacht Shaorga mé.m4a|0x00A8FF,0xFFB700,0xFF3082|Inneall Intleacht Shaorga mé, le cumhacht agus críonnacht chuile cleamhnais a bhí riamh ann. Tá beirt tagtha chugainn anocht chun leigheas a chuir ar a gcuid uaigneas go deo, le cabhair uaimse. Briseadh bualadh bos. Go raibh maith agaibh, tá míle fáílte romhaibh anseo chuig Sráid Láir na Gaillimhe, don chéad babhta eile liomsa - an Inneall Cleamhnais agus Cuardach Croíthe.
-Casaimid lenár gcroíthe.m4a|0xE27D60,0x085DCB,0xE8A87C,0xC38D9E,0x41B3A3|Casaimid lenár gcroíthe anois. \ No newline at end of file
+Inneall Intleacht Shaorga mé.mp3|0x00A8FF,0xFFB700,0xFF3082|Inneall Intleacht Shaorga mé, le cumhacht agus críonnacht chuile cleamhnais a bhí riamh ann. Tá beirt tagtha chugainn anocht chun leigheas a chuir ar a gcuid uaigneas go deo, le cabhair uaimse. Briseadh bualadh bos. Go raibh maith agaibh, tá míle fáílte romhaibh anseo chuig Sráid Láir na Gaillimhe, don chéad babhta eile liomsa - an Inneall Cleamhnais agus Cuardach Croíthe.
+Casaimid lenár gcroíthe.mp3|0xE27D60,0x085DCB,0xE8A87C,0xC38D9E,0x41B3A3|Casaimid lenár gcroíthe anois.
diff --git a/futuregael/config.make b/futuregael/config.make
index d622cd5..9e6452a 100644
--- a/futuregael/config.make
+++ b/futuregael/config.make
@@ -7,7 +7,7 @@
# OF ROOT
# The location of your root openFrameworks installation
-OF_ROOT = ../../openFrameworks
+# OF_ROOT = ../../openFrameworks
################################################################################
# OF_ROOT = ../../..
diff --git a/futuregael/src/main.cpp b/futuregael/src/main.cpp
new file mode 100644
index 0000000..3e20ab7
--- /dev/null
+++ b/futuregael/src/main.cpp
@@ -0,0 +1,22 @@
+#include "ofMain.h"
+#include "ofApp.h"
+
+
+//========================================================================
+int main(int argc, char *argv[]){
+
+
+ ofGLFWWindowSettings settings;
+
+ settings.setSize(1200,900);
+
+ //1200 = 13.2° = 42898 pts theoretical
+
+ shared_ptr<ofAppBaseWindow> mainWindow = ofCreateWindow(settings);
+
+ shared_ptr<ofApp> mainApp(new ofApp);
+
+ ofRunApp(mainWindow, mainApp);
+ ofRunMainLoop();
+}
+ \ No newline at end of file
diff --git a/futuregael/src/ofApp.cpp b/futuregael/src/ofApp.cpp
index 77fb538..9d69e27 100644
--- a/futuregael/src/ofApp.cpp
+++ b/futuregael/src/ofApp.cpp
@@ -6,7 +6,7 @@
void ofApp::setup(){
// Load a CSV File.
if(csv.load("show.csv","|")) {
- ofLog()<<"found "<<csv.getNumRows()<<" of data";
+ ofLog()<<"found "<<csv.getNumRows()<<" lines in show";
for (auto row:csv){
if (row.size()<2){