diff options
author | Alexey Yakovenko <wakeroid@gmail.com> | 2010-07-26 10:04:43 +0200 |
---|---|---|
committer | Alexey Yakovenko <wakeroid@gmail.com> | 2010-07-26 10:04:43 +0200 |
commit | fe3f99c92a8437a353ba12075d6c3273d04c4e3f (patch) | |
tree | 34d97babbe5696f21779866fafad217b60c2bead /plugins/adplug/adplug/ksm.h | |
parent | 4deca01c3a7edaf66374bd35e6fb50d4d9564b17 (diff) |
merged non-android-specific changes from android branch
Diffstat (limited to 'plugins/adplug/adplug/ksm.h')
-rw-r--r-- | plugins/adplug/adplug/ksm.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/adplug/adplug/ksm.h b/plugins/adplug/adplug/ksm.h index 98d643ea..85f19a31 100644 --- a/plugins/adplug/adplug/ksm.h +++ b/plugins/adplug/adplug/ksm.h @@ -32,17 +32,17 @@ public: ~CksmPlayer() { if(note) delete [] note; }; - 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() { return 240.0f; }; - std::string gettype() - { return std::string("Ken Silverman's Music Format"); }; + const char * gettype() + { return "Ken Silverman's Music Format"; }; unsigned int getinstruments() { return 16; }; - std::string getinstrument(unsigned int n); + const char * getinstrument(unsigned int n); private: static const unsigned int adlibfreq[63]; |