From e44a45b9e2ca3f4e03338f4175023f91b5990ea3 Mon Sep 17 00:00:00 2001 From: mick Date: Thu, 14 Jun 2012 11:16:31 +0100 Subject: Fixed errors with ogg loading that was causing windows project to fail --- main.cpp | 2 +- maximilian.cpp | 6 ++++-- .../UserInterfaceState.xcuserstate | Bin 39835 -> 39740 bytes 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/main.cpp b/main.cpp index 6448fce..9a0c632 100755 --- a/main.cpp +++ b/main.cpp @@ -6,7 +6,7 @@ void setup() {//some inits // beats.loadOgg("/Users/mickgrierson/Documents/workspace/vorbis_test/ogg_test/thingy2.ogg");//load in your samples. Provide the full path to a wav file. -// 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.load("/Users/mickgrierson/Documents/workspace/vorbis_test/ogg_test/thingy.wav");//load in your samples. Provide the full path to a wav file. printf("Summary:\n%s", beats.getSummary());//get info on samples if you like. diff --git a/maximilian.cpp b/maximilian.cpp index 4407de2..ea8775f 100644 --- a/maximilian.cpp +++ b/maximilian.cpp @@ -37,9 +37,10 @@ /* Maximilian can be configured to load ogg vorbis format files using the * loadOgg() method. -* Uncomment the following to include Sean Barrett's Ogg Vorbis decoder.*/ +* Uncomment the following to include Sean Barrett's Ogg Vorbis decoder. +* If you're on windows, make sure to add the files std_vorbis.c and std_vorbis.h to your project*/ -#define VORBIS +//#define VORBIS #ifdef VORBIS #include "stb_vorbis.h" @@ -395,6 +396,7 @@ bool maxiSample::loadOgg(char *fileName, int channel) { } return result; // this should probably be something more descriptive #endif + return 0; } void maxiSample::trigger() { diff --git a/maximilianTest.xcodeproj/project.xcworkspace/xcuserdata/mickgrierson.xcuserdatad/UserInterfaceState.xcuserstate b/maximilianTest.xcodeproj/project.xcworkspace/xcuserdata/mickgrierson.xcuserdatad/UserInterfaceState.xcuserstate index 7a16b49..314a90a 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