merged non-android-specific changes from android branch

1 files changed, 2 insertions, 2 deletions

diff --git a/plugins/adplug/adplug/adl.h b/plugins/adplug/adplug/adl.h
index 203692b0..6a47a1a9 100644
--- a/plugins/adplug/adplug/adl.h
+++ b/plugins/adplug/adplug/adl.h
@@ -36,7 +36,7 @@ class CadlPlayer: public CPlayer
   CadlPlayer(Copl *newopl);
   ~CadlPlayer();
 
-  bool load(const std::string &filename, const CFileProvider &fp);
+  bool load(const char *filename, const CFileProvider &fp);
   bool update();
   void rewind(int subsong = -1);
 
@@ -48,7 +48,7 @@ class CadlPlayer: public CPlayer
 
   unsigned int getsubsongs();
   unsigned int getsubsong() { return cursubsong; }
-  std::string gettype() { return std::string("Westwood ADL"); }
+  const char *gettype() { return "Westwood ADL"; }
 
  private:
   int numsubsongs, cursubsong;