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/mad.h | |
| parent | 4deca01c3a7edaf66374bd35e6fb50d4d9564b17 (diff) | |
merged non-android-specific changes from android branch
Diffstat (limited to 'plugins/adplug/adplug/mad.h')
| -rw-r--r-- | plugins/adplug/adplug/mad.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/adplug/adplug/mad.h b/plugins/adplug/adplug/mad.h index 98d2a445..c9272924 100644 --- a/plugins/adplug/adplug/mad.h +++ b/plugins/adplug/adplug/mad.h @@ -28,12 +28,12 @@ public: CmadLoader(Copl *newopl) : CmodPlayer(newopl) { }; - bool load(const std::string &filename, const CFileProvider &fp); + bool load(const char *filename, const CFileProvider &fp); void rewind(int subsong); float getrefresh(); - std::string gettype(); - std::string getinstrument(unsigned int n); + const char * gettype(); + const char * getinstrument(unsigned int n); unsigned int getinstruments(); private: |