diff options
| author | Comment <tim@gray.(none)> | 2013-01-24 18:07:04 +0000 |
|---|---|---|
| committer | Comment <tim@gray.(none)> | 2013-01-24 18:07:04 +0000 |
| commit | 3bf0663e94b6335cb748a50a8b95e8a98d2a0630 (patch) | |
| tree | a82627776c3bdeedbc99e2b6dcf97b78328a5047 /liveengine/src/playlist.h | |
| parent | e54790009e0d7b6ae5cc4d3e54880ff0bdc63f86 (diff) | |
folded kinect into main branch
Diffstat (limited to 'liveengine/src/playlist.h')
| -rwxr-xr-x | liveengine/src/playlist.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/liveengine/src/playlist.h b/liveengine/src/playlist.h index 846de74..2790835 100755 --- a/liveengine/src/playlist.h +++ b/liveengine/src/playlist.h @@ -12,17 +12,17 @@ class playlist : public ofThread { playlist();
virtual ~playlist(); void loadimg(); - void loadsvg(); + void loadLayers(); void load(string _name); void threadedFunction();
- void makeThumbnail(); + void makeThumbnail(); - ofFbo thumbnail;
- bool thumbnailed;
+ ofFbo thumbnail;
+ bool thumbnailed;
ofxXmlSettings XML; map<int,layer*> layers;
- string name;
+ string name;
protected:
private:
};
|
