From 9f7b9ffe0436541a0ae282cd19c1daffb86e9d1d Mon Sep 17 00:00:00 2001 From: mick Date: Mon, 20 Aug 2012 17:48:37 +0100 Subject: blaa --- main.cpp | 6 ++++++ .../UserInterfaceState.xcuserstate | Bin 15607 -> 15711 bytes 2 files changed, 6 insertions(+) diff --git a/main.cpp b/main.cpp index 0ba5209..2ca0cc6 100755 --- a/main.cpp +++ b/main.cpp @@ -4,9 +4,15 @@ maxiSample beats; //We give our sample a name. It's called beats this time. We c void setup() {//some inits +<<<<<<< HEAD beats.loadOgg("/Users/mickgrierson/Documents/workspace/vorbis_test/ogg_test/thingy2.ogg");//load in your samples. Provide the full path to an ogg file if ogg enabled (uncomment #define VORBIS and add the stb_vorbis files). // beats.load("/Users/mickgrierson/Documents/workspace/vorbis_test/ogg_test/thingy.wav");//load in your samples. Provide the full path to a wav file. +======= + beats.loadOgg("/Users/mickgrierson/Documents/workspace/vorbis_test/ogg_test/thingy2.ogg");//load in your samples. Provide the full path to an ogg file if ogg enabled (uncomment #define VORBIS and add the stb_vorbis files). + + //beats.load("/Users/mickgrierson/Documents/workspace/vorbis_test/ogg_test/thingy.wav");//load in your samples. Provide the full path to a wav file. +>>>>>>> blaa printf("Summary:\n%s", beats.getSummary());//get info on samples if you like. diff --git a/maximilianTest.xcodeproj/project.xcworkspace/xcuserdata/mickgrierson.xcuserdatad/UserInterfaceState.xcuserstate b/maximilianTest.xcodeproj/project.xcworkspace/xcuserdata/mickgrierson.xcuserdatad/UserInterfaceState.xcuserstate index ed64af6..3bbd188 100644 Binary files a/maximilianTest.xcodeproj/project.xcworkspace/xcuserdata/mickgrierson.xcuserdatad/UserInterfaceState.xcuserstate and b/maximilianTest.xcodeproj/project.xcworkspace/xcuserdata/mickgrierson.xcuserdatad/UserInterfaceState.xcuserstate differ -- cgit v1.3