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/imf.h | |
parent | 4deca01c3a7edaf66374bd35e6fb50d4d9564b17 (diff) |
merged non-android-specific changes from android branch
Diffstat (limited to 'plugins/adplug/adplug/imf.h')
-rw-r--r-- | plugins/adplug/adplug/imf.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/plugins/adplug/adplug/imf.h b/plugins/adplug/adplug/imf.h index 4c7d0daf..9969958c 100644 --- a/plugins/adplug/adplug/imf.h +++ b/plugins/adplug/adplug/imf.h @@ -35,18 +35,18 @@ public: ~CimfPlayer() { if(data) delete [] data; if(footer) delete [] footer; }; - 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 timer; }; - std::string gettype() - { return std::string("IMF File Format"); } - std::string gettitle(); - std::string getauthor() + const char * gettype() + { return "IMF File Format"; } + const char * gettitle(); + const char * getauthor() { return author_name; } - std::string getdesc(); + const char * getdesc(); protected: unsigned long pos, size; @@ -54,7 +54,9 @@ protected: bool songend; float rate, timer; char *footer; - std::string track_name, game_name, author_name, remarks; + char track_name[100], game_name[100], author_name[100], remarks[100]; + char title[100]; + char desc[100]; struct Sdata { unsigned char reg, val; @@ -62,7 +64,7 @@ protected: } *data; private: - float getrate(const std::string &filename, const CFileProvider &fp, binistream *f); + float getrate(const char *filename, const CFileProvider &fp, binistream *f); }; #endif |