From e4789999f60de941942eb6cdffa2c630bb2e823d Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Wed, 29 Jun 2011 15:11:10 -0400
Subject: [PATCH] * #6295: re-removed clone methods
This was only failing on the test machine because the tests were running
againt an outdated version of our plugins.
---
sflphone-common/src/Codec.h | 4 +---
sflphone-common/src/audio/codecs/alaw.cpp | 9 ---------
sflphone-common/src/audio/codecs/audiocodec.h | 2 +-
sflphone-common/src/audio/codecs/celtcodec.cpp | 8 --------
sflphone-common/src/audio/codecs/g722.cpp | 8 --------
sflphone-common/src/audio/codecs/gsmcodec.cpp | 8 --------
sflphone-common/src/audio/codecs/speexcodec_nb.cpp | 8 --------
sflphone-common/src/audio/codecs/speexcodec_ub.cpp | 8 --------
sflphone-common/src/audio/codecs/speexcodec_wb.cpp | 7 -------
sflphone-common/src/audio/codecs/ulaw.cpp | 2 ++
10 files changed, 4 insertions(+), 60 deletions(-)
diff --git a/sflphone-common/src/Codec.h b/sflphone-common/src/Codec.h
index b903443fe7..a1dccbaf5c 100644
--- a/sflphone-common/src/Codec.h
+++ b/sflphone-common/src/Codec.h
@@ -32,8 +32,6 @@
#include "MimeParameters.h" // TODO Move to some higher directory
-#include <tr1/memory>
-
#include <cc++/digest.h>
/**
@@ -64,7 +62,7 @@ class Codec : public virtual MimeParameters
/**
* @return A copy of the current codec.
*/
- virtual Codec* clone() const = 0;
+ //virtual Codec* clone() const = 0;
/**
* Build a unique hash code for identifying the codec uniquely.
diff --git a/sflphone-common/src/audio/codecs/alaw.cpp b/sflphone-common/src/audio/codecs/alaw.cpp
index f6826269eb..e38931c7a0 100644
--- a/sflphone-common/src/audio/codecs/alaw.cpp
+++ b/sflphone-common/src/audio/codecs/alaw.cpp
@@ -135,15 +135,6 @@ class Alaw : public sfl::AudioCodec
std::string getDescription() const {
return "audio/PCMA 8000 (\"alaw\") codec.";
}
-
- /**
- * @Override
- */
- Alaw* clone() const {
- return new Alaw (*this);
- }
-
-
};
// the class factories
diff --git a/sflphone-common/src/audio/codecs/audiocodec.h b/sflphone-common/src/audio/codecs/audiocodec.h
index 20558f0527..195cf1bdfd 100644
--- a/sflphone-common/src/audio/codecs/audiocodec.h
+++ b/sflphone-common/src/audio/codecs/audiocodec.h
@@ -136,7 +136,7 @@ class AudioCodec : public Codec
/**
* @Override
*/
- virtual AudioCodec* clone() const = 0;
+ //virtual AudioCodec* clone() const = 0;
protected:
/** Holds SDP-compliant codec name */
diff --git a/sflphone-common/src/audio/codecs/celtcodec.cpp b/sflphone-common/src/audio/codecs/celtcodec.cpp
index 4ce2b45f20..69d156e505 100644
--- a/sflphone-common/src/audio/codecs/celtcodec.cpp
+++ b/sflphone-common/src/audio/codecs/celtcodec.cpp
@@ -156,14 +156,6 @@ class Celt : public sfl::AudioCodec
return "audio/celt 32000 (\"HD\") codec. Based on libcelt, by Jean-Marc Valin.";
}
- /**
- * @Override
- */
- Celt* clone() const {
- return new Celt (*this);
- }
-
-
private:
CELTMode *_mode;
diff --git a/sflphone-common/src/audio/codecs/g722.cpp b/sflphone-common/src/audio/codecs/g722.cpp
index 41ec89a9e1..3390101482 100644
--- a/sflphone-common/src/audio/codecs/g722.cpp
+++ b/sflphone-common/src/audio/codecs/g722.cpp
@@ -829,14 +829,6 @@ class G722 : public sfl::AudioCodec
return "G722 codec. Most of the code comes from Steve Underwood (<steveu@coppice.org>) for the Asterisk project.";
}
- /**
- * @Override
- */
- G722* clone() const {
- return new G722 (*this);
- }
-
-
private:
g722_decode_state_t *decode_s;
diff --git a/sflphone-common/src/audio/codecs/gsmcodec.cpp b/sflphone-common/src/audio/codecs/gsmcodec.cpp
index 8be02bc61c..5c43b39cb8 100644
--- a/sflphone-common/src/audio/codecs/gsmcodec.cpp
+++ b/sflphone-common/src/audio/codecs/gsmcodec.cpp
@@ -93,14 +93,6 @@ class Gsm : public sfl::AudioCodec
return "GSM codec. Based on libgsm, (C) Jutta Degener and Carsten Bormann, Technische Universitaet Berlin.";
}
- /**
- * @Override
- */
- Gsm* clone() const {
- return new Gsm (*this);
- }
-
-
private:
gsm _decode_gsmhandle;
gsm _encode_gsmhandle;
diff --git a/sflphone-common/src/audio/codecs/speexcodec_nb.cpp b/sflphone-common/src/audio/codecs/speexcodec_nb.cpp
index e0fcd2a815..7c3c076788 100644
--- a/sflphone-common/src/audio/codecs/speexcodec_nb.cpp
+++ b/sflphone-common/src/audio/codecs/speexcodec_nb.cpp
@@ -121,14 +121,6 @@ class Speex : public sfl::AudioCodec
return "audio/speex 8000 (\"narrow band\") codec. Based on libspeex, by Jean-Marc Valin.";
}
- /**
- * @Override
- */
- Speex* clone() const {
- return new Speex (*this);
- }
-
-
private:
const SpeexMode* _speexModePtr;
SpeexBits _speex_dec_bits;
diff --git a/sflphone-common/src/audio/codecs/speexcodec_ub.cpp b/sflphone-common/src/audio/codecs/speexcodec_ub.cpp
index 36a8cd1f42..ebffda8a71 100644
--- a/sflphone-common/src/audio/codecs/speexcodec_ub.cpp
+++ b/sflphone-common/src/audio/codecs/speexcodec_ub.cpp
@@ -123,14 +123,6 @@ class Speex : public sfl::AudioCodec
return "audio/speex 32000 (\"ultra wide band\") codec. Based on libspeex, by Jean-Marc Valin.";
}
- /**
- * @Override
- */
- Speex* clone() const {
- return new Speex (*this);
- }
-
-
private:
const SpeexMode* _speexModePtr;
SpeexBits _speex_dec_bits;
diff --git a/sflphone-common/src/audio/codecs/speexcodec_wb.cpp b/sflphone-common/src/audio/codecs/speexcodec_wb.cpp
index e4fcd41462..6e974e3e77 100644
--- a/sflphone-common/src/audio/codecs/speexcodec_wb.cpp
+++ b/sflphone-common/src/audio/codecs/speexcodec_wb.cpp
@@ -122,13 +122,6 @@ class Speex : public sfl::AudioCodec
return "audio/speex 16000 (\"wide band\") codec. Based on libspeex, by Jean-Marc Valin.";
}
- /**
- * @Override
- */
- Speex* clone() const {
- return new Speex (*this);
- }
-
private:
const SpeexMode* _speexModePtr;
SpeexBits _speex_dec_bits;
diff --git a/sflphone-common/src/audio/codecs/ulaw.cpp b/sflphone-common/src/audio/codecs/ulaw.cpp
index 56d6571742..f203ecd479 100644
--- a/sflphone-common/src/audio/codecs/ulaw.cpp
+++ b/sflphone-common/src/audio/codecs/ulaw.cpp
@@ -134,9 +134,11 @@ class Ulaw : public sfl::AudioCodec
/**
* @Override
*/
+#if 0
Ulaw* clone() const {
return new Ulaw (*this);
}
+#endif
};
--
GitLab