diff options
author | 2010-07-26 10:04:43 +0200 | |
---|---|---|
committer | 2010-07-26 10:04:43 +0200 | |
commit | fe3f99c92a8437a353ba12075d6c3273d04c4e3f (patch) | |
tree | 34d97babbe5696f21779866fafad217b60c2bead /plugins/adplug/adplug/mkj.h | |
parent | 4deca01c3a7edaf66374bd35e6fb50d4d9564b17 (diff) |
merged non-android-specific changes from android branch
Diffstat (limited to 'plugins/adplug/adplug/mkj.h')
-rw-r--r-- | plugins/adplug/adplug/mkj.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/adplug/adplug/mkj.h b/plugins/adplug/adplug/mkj.h index a7a2ffad..b82d33fe 100644 --- a/plugins/adplug/adplug/mkj.h +++ b/plugins/adplug/adplug/mkj.h @@ -32,13 +32,13 @@ public: ~CmkjPlayer() { if(songbuf) delete [] songbuf; } - bool load(const std::string &filename, const CFileProvider &fp); + bool load(const char * filename, const CFileProvider &fp); bool update(); void rewind(int subsong); float getrefresh(); - std::string gettype() - { return std::string("MKJamz Audio File"); } + const char * gettype() + { return "MKJamz Audio File"; } private: short maxchannel,maxnotes,*songbuf; |