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/amd.h | |
parent | 4deca01c3a7edaf66374bd35e6fb50d4d9564b17 (diff) |
merged non-android-specific changes from android branch
Diffstat (limited to 'plugins/adplug/adplug/amd.h')
-rw-r--r-- | plugins/adplug/adplug/amd.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/plugins/adplug/adplug/amd.h b/plugins/adplug/adplug/amd.h index daa630b6..847ac037 100644 --- a/plugins/adplug/adplug/amd.h +++ b/plugins/adplug/adplug/amd.h @@ -30,19 +30,19 @@ public: : CmodPlayer(newopl) { }; - bool load(const std::string &filename, const CFileProvider &fp); + bool load(const char *filename, const CFileProvider &fp); float getrefresh(); - std::string gettype() - { return std::string("AMUSIC Adlib Tracker"); }; - std::string gettitle() - { return std::string(songname,0,24); }; - std::string getauthor() - { return std::string(author,0,24); }; + const char *gettype() + { return "AMUSIC Adlib Tracker"; }; + const char *gettitle() + { return songname; }; + const char *getauthor() + { return author; }; unsigned int getinstruments() { return 26; }; - std::string getinstrument(unsigned int n) - { return std::string(instname[n],0,23); }; + const char *getinstrument(unsigned int n) + { return instname[n]; }; private: char songname[24],author[24],instname[26][23]; |