diff options
Diffstat (limited to 'plugins/adplug/adplug/player.h')
| -rw-r--r-- | plugins/adplug/adplug/player.h | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/plugins/adplug/adplug/player.h b/plugins/adplug/adplug/player.h index 8c474daa..c83eda79 100644 --- a/plugins/adplug/adplug/player.h +++ b/plugins/adplug/adplug/player.h @@ -22,8 +22,6 @@ #ifndef H_ADPLUG_PLAYER #define H_ADPLUG_PLAYER -#include <string> - #include "fprovide.h" #include "opl.h" #include "database.h" @@ -37,7 +35,7 @@ public: /***** Operational methods *****/ void seek(unsigned long ms); - virtual bool load(const std::string &filename, // loads file + virtual bool load(const char *filename, // loads file const CFileProvider &fp = CProvider_Filesystem()) = 0; virtual bool update() = 0; // executes replay code for 1 tick virtual void rewind(int subsong = -1) = 0; // rewinds to specified subsong @@ -46,13 +44,13 @@ public: /***** Informational methods *****/ unsigned long songlength(int subsong = -1); - virtual std::string gettype() = 0; // returns file type - virtual std::string gettitle() // returns song title - { return std::string(); } - virtual std::string getauthor() // returns song author name - { return std::string(); } - virtual std::string getdesc() // returns song description - { return std::string(); } + virtual const char *gettype() = 0; // returns file type + virtual const char *gettitle() // returns song title + { return ""; } + virtual const char *getauthor() // returns song author name + { return ""; } + virtual const char *getdesc() // returns song description + { return ""; } virtual unsigned int getpatterns() // returns number of patterns { return 0; } virtual unsigned int getpattern() // returns currently playing pattern @@ -71,12 +69,12 @@ public: { return 0; } virtual unsigned int getinstruments() // returns number of instruments { return 0; } - virtual std::string getinstrument(unsigned int n) // returns n-th instrument name - { return std::string(); } + virtual const char *getinstrument(unsigned int n) // returns n-th instrument name + { return ""; } protected: Copl *opl; // our OPL chip - CAdPlugDatabase *db; // AdPlug Database + //CAdPlugDatabase *db; // AdPlug Database static const unsigned short note_table[12]; // standard adlib note table static const unsigned char op_table[9]; // the 9 operators as expected by the OPL |