From fe3f99c92a8437a353ba12075d6c3273d04c4e3f Mon Sep 17 00:00:00 2001 From: Alexey Yakovenko Date: Mon, 26 Jul 2010 10:04:43 +0200 Subject: merged non-android-specific changes from android branch --- plugins/adplug/adplug/hybrid.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins/adplug/adplug/hybrid.cpp') diff --git a/plugins/adplug/adplug/hybrid.cpp b/plugins/adplug/adplug/hybrid.cpp index cff08c88..2e545ba1 100644 --- a/plugins/adplug/adplug/hybrid.cpp +++ b/plugins/adplug/adplug/hybrid.cpp @@ -232,14 +232,14 @@ float CxadhybridPlayer::xadplayer_getrefresh() return 50.0f; } -std::string CxadhybridPlayer::xadplayer_gettype() +const char * CxadhybridPlayer::xadplayer_gettype() { - return (std::string("xad: hybrid player")); + return "xad: hybrid player"; } -std::string CxadhybridPlayer::xadplayer_getinstrument(unsigned int i) +const char * CxadhybridPlayer::xadplayer_getinstrument(unsigned int i) { - return (std::string(hyb.inst[i].name,7)); + return hyb.inst[i].name; } unsigned int CxadhybridPlayer::xadplayer_getinstruments() -- cgit v1.2.3