* #9979: cleanup

daemon/src/audio/codecs/alaw.cpp

@@ -37,7 +37,7 @@ class Alaw : public sfl::AudioCodec {
 
     public:
         // 8 PCMA A 8000 1 [RFC3551]
-        Alaw(int payload = 8) : sfl::AudioCodec(payload, "PCMA") {
+        Alaw() : sfl::AudioCodec(8, "PCMA") {
             clockRate_ = 8000;
             frameSize_ = 160; // samples, 20 ms at 8kHz
             channel_   = 1;
@@ -131,7 +131,7 @@ class Alaw : public sfl::AudioCodec {
 // cppcheck-suppress unusedFunction
 extern "C" sfl::Codec* create()
 {
-    return new Alaw(8);
+    return new Alaw;
 }
 
 // cppcheck-suppress unusedFunction

daemon/src/audio/codecs/g722.cpp

@@ -41,7 +41,7 @@
 class G722 : public sfl::AudioCodec {
 
     public:
-        G722(int payload = 9) : sfl::AudioCodec(payload, "G722"), decode_state_(), encode_state_() {
+        G722() : sfl::AudioCodec(9, "G722"), decode_state_(), encode_state_() {
             clockRate_ = 16000;
             frameSize_ = 320; // samples, 20 ms at 16kHz
             channel_   = 1;
@@ -765,7 +765,7 @@ class G722 : public sfl::AudioCodec {
 // cppcheck-suppress unusedFunction
 extern "C" sfl::Codec* create()
 {
-    return new G722(9);
+    return new G722;
 }
 
 // cppcheck-suppress unusedFunction

daemon/src/audio/codecs/gsmcodec.cpp

@@ -31,6 +31,7 @@
 
 
 #include "audiocodec.h"
+#include "sfl_types.h"
 #include "noncopyable.h"
 #include <cassert>
 #include <stdexcept>
@@ -47,7 +48,7 @@ class Gsm : public sfl::AudioCodec {
 
     public:
         // _payload should be 3
-        Gsm(int payload=3) : sfl::AudioCodec(payload, "GSM"), decode_gsmhandle_(NULL), encode_gsmhandle_(NULL) {
+        Gsm() : sfl::AudioCodec(3, "GSM"), decode_gsmhandle_(NULL), encode_gsmhandle_(NULL) {
             clockRate_ = 8000;
             frameSize_ = 160; // samples, 20 ms at 8kHz
             channel_ = 1;
@@ -61,12 +62,14 @@ class Gsm : public sfl::AudioCodec {
                 throw std::runtime_error("ERROR: encode_gsm_create\n");
         }
 
-        virtual ~Gsm() {
+        virtual ~Gsm()
+        {
             gsm_destroy(decode_gsmhandle_);
             gsm_destroy(encode_gsmhandle_);
         }
 
-        virtual int	decode(short * dst, unsigned char * src, size_t buf_size) {
+        virtual int decode(SFLDataFormat * dst, unsigned char * src, size_t buf_size)
+        {
             assert(buf_size == 33);
 
             if (gsm_decode(decode_gsmhandle_, (gsm_byte*) src, (gsm_signal*) dst) < 0)
@@ -75,7 +78,8 @@ class Gsm : public sfl::AudioCodec {
             return frameSize_;
         }
 
-        virtual int	encode(unsigned char * dst, short * src, size_t buf_size) {
+        virtual int encode(unsigned char * dst, SFLDataFormat * src, size_t buf_size)
+        {
             assert(buf_size >= 33);
             gsm_encode(encode_gsmhandle_, (gsm_signal*) src, (gsm_byte*) dst);
             return 33;
@@ -90,7 +94,7 @@ class Gsm : public sfl::AudioCodec {
 // cppcheck-suppress unusedFunction
 extern "C" sfl::Codec* create()
 {
-    return new Gsm(3);
+    return new Gsm;
 }
 
 // cppcheck-suppress unusedFunction

daemon/src/audio/codecs/ulaw.cpp

@@ -36,8 +36,7 @@
 class Ulaw : public sfl::AudioCodec {
     public:
         // 0 PCMU A 8000 1 [RFC3551]
-        Ulaw(int payload=0)
-            : sfl::AudioCodec(payload, "PCMU") {
+        Ulaw() : sfl::AudioCodec(0, "PCMU") {
             clockRate_ = 8000;
             frameSize_ = 160; // samples, 20 ms at 8kHz
             channel_   = 1;
@@ -126,7 +125,7 @@ class Ulaw : public sfl::AudioCodec {
 // cppcheck-suppress unusedFunction
 extern "C" sfl::Codec* create()
 {
-    return new Ulaw(0);
+    return new Ulaw;
 }
 
 // cppcheck-suppress unusedFunction