FileWrapper[Impl] modifications and actually remove the "Impl" class.

webrtc/modules/audio_device/test/func_test_manager.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 151 matching lines @@
 }
 
 // ----------------------------------------------------------------------------
 //      AudioTransportImpl::SetFilePlayout
 // ----------------------------------------------------------------------------
 
 int32_t AudioTransportImpl::SetFilePlayout(bool enable, const char* fileName)
 {
     _playFromFile = enable;
     if (enable)
-    {
-        return (_playFile.OpenFile(fileName, true, true, false));
-    } else
-    {
-        _playFile.Flush();
-        return (_playFile.CloseFile());
-    }
+      return (_playFile.OpenFile(fileName, true));
+    _playFile.CloseFile();
+    return 0;
 }
-;
 
 void AudioTransportImpl::SetFullDuplex(bool enable)
 {
     _fullDuplex = enable;
 
     for (AudioPacketList::iterator iter = _audioList.begin();
          iter != _audioList.end(); ++iter) {
             delete *iter;
     }
     _audioList.clear();
@@ skipping 264 matching lines @@
                             TEST_LOG("ERROR: unable to resample from %d to %d\n",
                                      samplesPerSecIn, samplesPerSec);
                     }
                 }
                 nSamplesOut = nSamples;
                 delete packet;
             }
         }
     }  // if (_fullDuplex)
 
-    if (_playFromFile && _playFile.Open())
+    if (_playFromFile && _playFile.is_open())
     {
         int16_t fileBuf[480];
 
         // read mono-file
         int32_t len = _playFile.Read((int8_t*) fileBuf, 2 * nSamples);
         if (len != 2 * (int32_t) nSamples)
         {
             _playFile.Rewind();
             _playFile.Read((int8_t*) fileBuf, 2 * nSamples);
         }
 
         // convert to stero if required
         if (nChannels == 1)
         {
             memcpy(audioSamples, fileBuf, 2 * nSamples);
         } else
         {
             // mono sample from file is duplicated and sent to left and right
             // channels
             int16_t* audio16 = (int16_t*) audioSamples;
             for (size_t i = 0; i < nSamples; i++)
             {
                 (*audio16) = fileBuf[i]; // left
                 audio16++;
                 (*audio16) = fileBuf[i]; // right
                 audio16++;
             }
         }
-    }  // if (_playFromFile && _playFile.Open())
+    }  // if (_playFromFile && _playFile.is_open())
 
     _playCount++;
 
     if (_playCount % 100 == 0)
     {
         bool addMarker(true);
 
         if (_speakerVolume)
         {
             uint32_t maxVolume(0);
@@ skipping 2232 matching lines @@
 
     TEST_LOG("\n");
     PRINT_TEST_RESULTS;
 
     return 0;
 }
 
 }  // namespace webrtc
 
 // EOF