Make AudioParameters a class instead of a struct

media/audio/linux/alsa_output_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/message_loop.h"
 #include "base/stringprintf.h"
 #include "media/audio/linux/alsa_output.h"
 #include "media/audio/linux/alsa_wrapper.h"
 #include "media/audio/linux/audio_manager_linux.h"
 #include "media/base/data_buffer.h"
@@ skipping 640 matching lines @@
                                         AlsaPcmOutputStream::kDefaultDevice,
                                         kSurround40, kSurround50, kSurround51,
                                         kSurround70, kSurround71,
                                         AlsaPcmOutputStream::kDefaultDevice };
   bool kExpectedDownmix[] = { false, false, false, false, false, true,
                               false, false, false, false };
   ChannelLayout kExpectedLayouts[] = { CHANNEL_LAYOUT_NONE,
                                        CHANNEL_LAYOUT_MONO,
                                        CHANNEL_LAYOUT_STEREO,
                                        CHANNEL_LAYOUT_SURROUND,
-                                       CHANNEL_LAYOUT_4POINT0,
-                                       CHANNEL_LAYOUT_5POINT0,
-                                       CHANNEL_LAYOUT_5POINT1,
-                                       CHANNEL_LAYOUT_7POINT0,
-                                       CHANNEL_LAYOUT_7POINT1 };
+                                       CHANNEL_LAYOUT_4_0,
+                                       CHANNEL_LAYOUT_5_0,
+                                       CHANNEL_LAYOUT_5_1,
+                                       CHANNEL_LAYOUT_7_0,
+                                       CHANNEL_LAYOUT_7_1 };
 
 
   for (int i = 1; i < 9; ++i) {
     if (i == 3 || i == 4 || i == 5)  // invalid number of channels
       continue;
     SCOPED_TRACE(base::StringPrintf("Attempting %d Channel", i));
 
     // Hints will only be grabbed for channel numbers that have non-default
     // devices associated with them.
     if (kExpectedDeviceName[i] != AlsaPcmOutputStream::kDefaultDevice) {
@@ skipping 63 matching lines @@
   InSequence s;
   EXPECT_CALL(mock_alsa_wrapper_, PcmOpen(_, StrEq(first_try.c_str()), _, _))
       .WillOnce(Return(kTestFailedErrno));
   EXPECT_CALL(mock_alsa_wrapper_, PcmOpen(_, StrEq(second_try.c_str()), _, _))
       .WillOnce(Return(kTestFailedErrno));
   EXPECT_CALL(mock_alsa_wrapper_, PcmOpen(_, StrEq(third_try.c_str()), _, _))
       .WillOnce(Return(kTestFailedErrno));
   EXPECT_CALL(mock_alsa_wrapper_, PcmOpen(_, StrEq(fourth_try.c_str()), _, _))
       .WillOnce(Return(kTestFailedErrno));
 
-  AlsaPcmOutputStream* test_stream = CreateStream(CHANNEL_LAYOUT_5POINT0);
+  AlsaPcmOutputStream* test_stream = CreateStream(CHANNEL_LAYOUT_5_0);
   EXPECT_FALSE(test_stream->AutoSelectDevice(5));
   test_stream->Close();
 }
 
 TEST_F(AlsaPcmOutputStreamTest, AutoSelectDevice_HintFail) {
   // Should get |kDefaultDevice|, and force a 2-channel downmix on a failure to
   // enumerate devices.
   EXPECT_CALL(mock_alsa_wrapper_, DeviceNameHint(_, _, _))
       .WillRepeatedly(Return(kTestFailedErrno));
   EXPECT_CALL(mock_alsa_wrapper_,
               PcmOpen(_, StrEq(AlsaPcmOutputStream::kDefaultDevice), _, _))
       .WillOnce(DoAll(SetArgumentPointee<0>(kFakeHandle), Return(0)));
   EXPECT_CALL(mock_alsa_wrapper_,
               PcmSetParams(kFakeHandle, _, _, 2, _, _, _))
       .WillOnce(Return(0));
   EXPECT_CALL(mock_alsa_wrapper_, StrError(kTestFailedErrno))
       .WillOnce(Return(kDummyMessage));
 
-  AlsaPcmOutputStream* test_stream = CreateStream(CHANNEL_LAYOUT_5POINT0);
+  AlsaPcmOutputStream* test_stream = CreateStream(CHANNEL_LAYOUT_5_0);
   EXPECT_TRUE(test_stream->AutoSelectDevice(5));
   EXPECT_TRUE(test_stream->should_downmix_);
   test_stream->Close();
 }
 
 TEST_F(AlsaPcmOutputStreamTest, BufferPacket_StopStream) {
   AlsaPcmOutputStream* test_stream = CreateStream(kTestChannelLayout);
   InitBuffer(test_stream);
   test_stream->stop_stream_ = true;
   bool source_exhausted;
@@ skipping 38 matching lines @@
   test_stream->stop_stream_ = true;
   test_stream->ScheduleNextWrite(true);
 
   // TODO(ajwong): Find a way to test whether or not another task has been
   // posted so we can verify that the Alsa code will indeed break the task
   // posting loop.
 
   test_stream->TransitionTo(AlsaPcmOutputStream::kIsClosed);
   test_stream->Close();
 }