diff options
| -rwxr-xr-x | main.cpp | 4 | ||||
| -rw-r--r-- | ofxMaxim/ofxMaxim/libs/stb_vorbis.c | 8 |
2 files changed, 6 insertions, 6 deletions
@@ -4,9 +4,9 @@ maxiSample beats; //We give our sample a name. It's called beats this time. We c 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 an ogg file if ogg enabled (uncomment #define VORBIS and add the stb_vorbis files). + 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.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/ofxMaxim/ofxMaxim/libs/stb_vorbis.c b/ofxMaxim/ofxMaxim/libs/stb_vorbis.c index 822253d..d98b4a8 100644 --- a/ofxMaxim/ofxMaxim/libs/stb_vorbis.c +++ b/ofxMaxim/ofxMaxim/libs/stb_vorbis.c @@ -895,12 +895,12 @@ static void neighbors(uint16 *x, int n, int *plow, int *phigh) typedef struct
{
uint16 x,y;
-} Point;
+} VorbisPoint;
int point_compare(const void *p, const void *q)
{
- Point *a = (Point *) p;
- Point *b = (Point *) q;
+ VorbisPoint *a = (VorbisPoint *) p;
+ VorbisPoint *b = (VorbisPoint *) q;
return a->x < b->x ? -1 : a->x > b->x;
}
@@ -3543,7 +3543,7 @@ static int start_decoder(vorb *f) g->book_list[j] = get_bits(f,8);
return error(f, VORBIS_feature_not_supported);
} else {
- Point p[31*8+2];
+ VorbisPoint p[31*8+2];
Floor1 *g = &f->floor_config[i].floor1;
int max_class = -1;
g->partitions = get_bits(f, 5);
|
