merged non-android-specific changes from android branch

1 files changed, 4 insertions, 4 deletions

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()