commit 89df0928071d156777aa82755e701755b4829576
author andrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Thu Sep 12 01:27:43 2013 +0000
committer andrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Thu Sep 12 01:27:43 2013 +0000
tree f7502c9f05a7351b5fbc15df889d151f57b6641e
parent 5eb997a2fdd161a09b160baed7c9e0167b8f0e59

Make the destructor of AudioCodingModule public.

This allows the type to be used with a scoped_ptr. Remove all calls to
the deprecated Destroy() from tests.

R=turaj@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/2200006

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4731 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/modules/audio_coding/main/test/TwoWayCommunication.cc

diff --git a/webrtc/modules/audio_coding/main/test/TwoWayCommunication.cc b/webrtc/modules/audio_coding/main/test/TwoWayCommunication.cc
index 6b058fd..1b74a95 100644
--- a/webrtc/modules/audio_coding/main/test/TwoWayCommunication.cc
+++ b/webrtc/modules/audio_coding/main/test/TwoWayCommunication.cc
@@ -30,16 +30,15 @@
 
 #define MAX_FILE_NAME_LENGTH_BYTE 500
 
-TwoWayCommunication::TwoWayCommunication(int testMode) {
-  _testMode = testMode;
+TwoWayCommunication::TwoWayCommunication(int testMode)
+    : _acmA(AudioCodingModule::Create(1)),
+      _acmB(AudioCodingModule::Create(2)),
+      _acmRefA(AudioCodingModule::Create(3)),
+      _acmRefB(AudioCodingModule::Create(4)),
+      _testMode(testMode) {
 }
 
 TwoWayCommunication::~TwoWayCommunication() {
-  AudioCodingModule::Destroy(_acmA);
-  AudioCodingModule::Destroy(_acmB);
-  AudioCodingModule::Destroy(_acmRefA);
-  AudioCodingModule::Destroy(_acmRefB);
-
   delete _channel_A2B;
   delete _channel_B2A;
   delete _channelRef_A2B;
@@ -62,7 +61,7 @@
 
 void TwoWayCommunication::ChooseCodec(uint8_t* codecID_A,
                                       uint8_t* codecID_B) {
-  AudioCodingModule* tmpACM = AudioCodingModule::Create(0);
+  scoped_ptr<AudioCodingModule> tmpACM(AudioCodingModule::Create(0));
   uint8_t noCodec = tmpACM->NumberOfCodecs();
   CodecInst codecInst;
   printf("List of Supported Codecs\n");
@@ -80,17 +79,10 @@
   EXPECT_TRUE(fgets(myStr, 10, stdin) != NULL);
   *codecID_B = (uint8_t) atoi(myStr);
 
-  AudioCodingModule::Destroy(tmpACM);
   printf("\n");
 }
 
 void TwoWayCommunication::SetUp() {
-  _acmA = AudioCodingModule::Create(1);
-  _acmB = AudioCodingModule::Create(2);
-
-  _acmRefA = AudioCodingModule::Create(3);
-  _acmRefB = AudioCodingModule::Create(4);
-
   uint8_t codecID_A;
   uint8_t codecID_B;
 
@@ -164,20 +156,20 @@
   //--- Set A-to-B channel
   _channel_A2B = new Channel;
   _acmA->RegisterTransportCallback(_channel_A2B);
-  _channel_A2B->RegisterReceiverACM(_acmB);
+  _channel_A2B->RegisterReceiverACM(_acmB.get());
   //--- Do the same for the reference
   _channelRef_A2B = new Channel;
   _acmRefA->RegisterTransportCallback(_channelRef_A2B);
-  _channelRef_A2B->RegisterReceiverACM(_acmRefB);
+  _channelRef_A2B->RegisterReceiverACM(_acmRefB.get());
 
   //--- Set B-to-A channel
   _channel_B2A = new Channel;
   _acmB->RegisterTransportCallback(_channel_B2A);
-  _channel_B2A->RegisterReceiverACM(_acmA);
+  _channel_B2A->RegisterReceiverACM(_acmA.get());
   //--- Do the same for reference
   _channelRef_B2A = new Channel;
   _acmRefB->RegisterTransportCallback(_channelRef_B2A);
-  _channelRef_B2A->RegisterReceiverACM(_acmRefA);
+  _channelRef_B2A->RegisterReceiverACM(_acmRefA.get());
 
   // The clicks will be more obvious when we
   // are in FAX mode.
@@ -186,12 +178,6 @@
 }
 
 void TwoWayCommunication::SetUpAutotest() {
-  _acmA = AudioCodingModule::Create(1);
-  _acmB = AudioCodingModule::Create(2);
-
-  _acmRefA = AudioCodingModule::Create(3);
-  _acmRefB = AudioCodingModule::Create(4);
-
   CodecInst codecInst_A;
   CodecInst codecInst_B;
   CodecInst dummyCodec;
@@ -252,20 +238,20 @@
   //--- Set A-to-B channel
   _channel_A2B = new Channel;
   _acmA->RegisterTransportCallback(_channel_A2B);
-  _channel_A2B->RegisterReceiverACM(_acmB);
+  _channel_A2B->RegisterReceiverACM(_acmB.get());
   //--- Do the same for the reference
   _channelRef_A2B = new Channel;
   _acmRefA->RegisterTransportCallback(_channelRef_A2B);
-  _channelRef_A2B->RegisterReceiverACM(_acmRefB);
+  _channelRef_A2B->RegisterReceiverACM(_acmRefB.get());
 
   //--- Set B-to-A channel
   _channel_B2A = new Channel;
   _acmB->RegisterTransportCallback(_channel_B2A);
-  _channel_B2A->RegisterReceiverACM(_acmA);
+  _channel_B2A->RegisterReceiverACM(_acmA.get());
   //--- Do the same for reference
   _channelRef_B2A = new Channel;
   _acmRefB->RegisterTransportCallback(_channelRef_B2A);
-  _channelRef_B2A->RegisterReceiverACM(_acmRefA);
+  _channelRef_B2A->RegisterReceiverACM(_acmRefA.get());
 
   // The clicks will be more obvious when we
   // are in FAX mode.