merged non-android-specific changes from android branch

1 files changed, 2 insertions, 2 deletions

diff --git a/plugins/adplug/adplug/lds.h b/plugins/adplug/adplug/lds.h
index 95f59606..2642a6a9 100644
--- a/plugins/adplug/adplug/lds.h
+++ b/plugins/adplug/adplug/lds.h
@@ -29,12 +29,12 @@ class CldsPlayer: public CPlayer
   CldsPlayer(Copl *newopl);
   virtual ~CldsPlayer();
 
-  bool load(const std::string &filename, const CFileProvider &fp);
+  bool load(const char *filename, const CFileProvider &fp);
   virtual bool update();
   virtual void rewind(int subsong = -1);
   float getrefresh() { return 70.0f; }
 
-  std::string gettype() { return std::string("LOUDNESS Sound System"); }
+  const char * gettype() { return "LOUDNESS Sound System"; }
   unsigned int getorders() { return numposi; }
   unsigned int getorder() { return posplay; }
   unsigned int getrow() { return pattplay; }