diff options
author | Robin Gareus <robin@gareus.org> | 2016-04-14 12:45:02 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2016-04-14 12:45:02 +0200 |
commit | eda1508da1c7fadc7683fe1e6940d09237278d40 (patch) | |
tree | dfa8b53813083ca2538c4dc68a98c80bde7cfbb7 /libs/ptformat/ptfformat.h | |
parent | 5bbfd0d1bd7d0fc443b25ed16a6df38d8937b19d (diff) |
Revert "remove C++11'isms from libptformat. back to C++98 compat."
This reverts commit 48532baaa7eeda99e9b5ea880f52308570dc3181.
Diffstat (limited to 'libs/ptformat/ptfformat.h')
-rw-r--r-- | libs/ptformat/ptfformat.h | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/libs/ptformat/ptfformat.h b/libs/ptformat/ptfformat.h index 8b2f58de73..f2c51d9830 100644 --- a/libs/ptformat/ptfformat.h +++ b/libs/ptformat/ptfformat.h @@ -39,12 +39,12 @@ public: int64_t posabsolute; int64_t length; - bool operator <(const struct wav& other) const { + bool operator <(const struct wav& other) { return (strcasecmp(this->filename.c_str(), other.filename.c_str()) < 0); } - bool operator ==(const struct wav& other) const { + bool operator ==(const struct wav& other) { return (this->filename == other.filename || this->index == other.index); } @@ -65,25 +65,6 @@ public: } region_t; typedef struct track { - track () - : index (0) - , playlist (0) - { - memset ((void*)®, 0, sizeof(region_t)); - } - - track (std::string n, uint16_t i, uint8_t p, region_t *r) - : name (n) - , index (i) - , playlist (p) - { - set_region (r); - } - - void set_region (region_t *r) { - memcpy ((void*)®, (void*)r, sizeof(region_t)); - } - std::string name; uint16_t index; uint8_t playlist; |