diff options
| author | sansnom05 <sansnom05@users.sourceforge.net> | 2010-12-16 16:53:08 +0300 |
|---|---|---|
| committer | sansnom05 <sansnom05@users.sourceforge.net> | 2010-12-16 16:53:08 +0300 |
| commit | f0d88a6ff96770b10031dcc59447cca2c7dbc91c (patch) | |
| tree | e188e4e733fcf6fc9b00dc349618c19f4d47a7c9 /src/filters/source | |
| parent | 5067b0b48d4d15b24669c8032b28e90e45202801 (diff) | |
legacy branch: merge r2662-r2759
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/branches/legacy@2778 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/source')
| -rw-r--r-- | src/filters/source/ShoutcastSource/ShoutcastSource.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/filters/source/ShoutcastSource/ShoutcastSource.h b/src/filters/source/ShoutcastSource/ShoutcastSource.h index 03e911334..2c6a9e752 100644 --- a/src/filters/source/ShoutcastSource/ShoutcastSource.h +++ b/src/filters/source/ShoutcastSource/ShoutcastSource.h @@ -87,14 +87,18 @@ class CShoutcastStream : public CSourceStream mp3frame(DWORD len = 0) {this->len = len; pData = len ? DNew BYTE[len] : NULL; rtStart = rtStop = 0;}
mp3frame(const mp3frame& f) {*this = f;}
~mp3frame() {delete pData;}
- void operator = (const mp3frame& f)
+ mp3frame& operator = (const mp3frame& f)
{
- len = f.len;
- pData = f.pData;
- rtStart = f.rtStart;
- rtStop = f.rtStop;
- title = f.title;
- ((mp3frame*)&f)->pData = NULL;
+ if(this != &f)
+ {
+ len = f.len;
+ pData = f.pData;
+ rtStart = f.rtStart;
+ rtStop = f.rtStop;
+ title = f.title;
+ ((mp3frame*)&f)->pData = NULL;
+ }
+ return *this;
}
};
|