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/hybrid.h | |
| parent | 4deca01c3a7edaf66374bd35e6fb50d4d9564b17 (diff) | |
merged non-android-specific changes from android branch
Diffstat (limited to 'plugins/adplug/adplug/hybrid.h')
| -rw-r--r-- | plugins/adplug/adplug/hybrid.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/adplug/adplug/hybrid.h b/plugins/adplug/adplug/hybrid.h index 65d39d34..d727b84d 100644 --- a/plugins/adplug/adplug/hybrid.h +++ b/plugins/adplug/adplug/hybrid.h @@ -69,8 +69,8 @@ protected: void xadplayer_rewind(int subsong); void xadplayer_update(); float xadplayer_getrefresh(); - std::string xadplayer_gettype(); - std::string xadplayer_getinstrument(unsigned int i); + const char * xadplayer_gettype(); + const char * xadplayer_getinstrument(unsigned int i); unsigned int xadplayer_getinstruments(); private: |