Remove the copy constructors from SBNK, SDAT and SSEQ.
(They were probably holdovers from copying the code from the NCSF creation tools.)
--- a/src/in_ncsf/SSEQPlayer/SBNK.cpp
+++ b/src/in_ncsf/SSEQPlayer/SBNK.cpp
@@ -84,24 +84,6 @@
memset(this->waveArc, 0, sizeof(this->waveArc));
}
-SBNK::SBNK(const SBNK &sbnk) : filename(sbnk.filename), instruments(sbnk.instruments), info(sbnk.info)
-{
- memcpy(this->waveArc, sbnk.waveArc, sizeof(this->waveArc));
-}
-
-SBNK &SBNK::operator=(const SBNK &sbnk)
-{
- if (this != &sbnk)
- {
- this->filename = sbnk.filename;
- this->instruments = sbnk.instruments;
-
- memcpy(this->waveArc, sbnk.waveArc, sizeof(this->waveArc));
- this->info = sbnk.info;
- }
- return *this;
-}
-
void SBNK::Read(PseudoFile &file)
{
uint32_t startOfSBNK = file.pos;
--- a/src/in_ncsf/SSEQPlayer/SBNK.h
+++ b/src/in_ncsf/SSEQPlayer/SBNK.h
@@ -50,8 +50,6 @@
INFOEntryBANK info;
SBNK(const std::string &fn = "");
- SBNK(const SBNK &sbnk);
- SBNK &operator=(const SBNK &sbnk);
void Read(PseudoFile &file);
};
--- a/src/in_ncsf/SSEQPlayer/SDAT.h
+++ b/src/in_ncsf/SSEQPlayer/SDAT.h
@@ -22,8 +22,5 @@
INFOEntryPLAYER player;
SDAT(PseudoFile &file, uint32_t sseqToLoad);
-private:
- SDAT(const SDAT &);
- SDAT &operator=(const SDAT &);
};
--- a/src/in_ncsf/SSEQPlayer/SSEQ.cpp
+++ b/src/in_ncsf/SSEQPlayer/SSEQ.cpp
@@ -12,23 +12,6 @@
SSEQ::SSEQ(const std::string &fn) : filename(fn), data(), bank(nullptr), info()
{
-}
-
-SSEQ::SSEQ(const SSEQ &sseq) : filename(sseq.filename), data(sseq.data), bank(sseq.bank), info(sseq.info)
-{
-}
-
-SSEQ &SSEQ::operator=(const SSEQ &sseq)
-{
- if (this != &sseq)
- {
- this->filename = sseq.filename;
- this->data = sseq.data;
-
- this->bank = sseq.bank;
- this->info = sseq.info;
- }
- return *this;
}
void SSEQ::Read(PseudoFile &file)
--- a/src/in_ncsf/SSEQPlayer/SSEQ.h
+++ b/src/in_ncsf/SSEQPlayer/SSEQ.h
@@ -21,8 +21,6 @@
INFOEntrySEQ info;
SSEQ(const std::string &fn = "");
- SSEQ(const SSEQ &sseq);
- SSEQ &operator=(const SSEQ &sseq);
void Read(PseudoFile &file);
};