From db128cb2b7a78b240f580e4c12d9d74be6633694 Mon Sep 17 00:00:00 2001
From: JW Wang <jwwang@mozilla.com>
Date: Wed, 22 Mar 2017 15:03:38 +0800
Subject: [PATCH] Bug 1349485. P4 - rename DecodedAudioDataSink.* to
 AudioSink.*. r=kikuo

MozReview-Commit-ID: KYbJwTpUiHZ

--HG--
rename : dom/media/mediasink/DecodedAudioDataSink.cpp => dom/media/mediasink/AudioSink.cpp
rename : dom/media/mediasink/DecodedAudioDataSink.h => dom/media/mediasink/AudioSink.h
extra : rebase_source : 414effaad950578dead21401f7e868d4a09a1099
---
 dom/media/MediaDecoderStateMachine.cpp                          | 2 +-
 dom/media/mediasink/{DecodedAudioDataSink.cpp => AudioSink.cpp} | 2 +-
 dom/media/mediasink/{DecodedAudioDataSink.h => AudioSink.h}     | 0
 dom/media/mediasink/AudioSinkWrapper.cpp                        | 2 +-
 dom/media/mediasink/moz.build                                   | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename dom/media/mediasink/{DecodedAudioDataSink.cpp => AudioSink.cpp} (99%)
 rename dom/media/mediasink/{DecodedAudioDataSink.h => AudioSink.h} (100%)

diff --git a/dom/media/MediaDecoderStateMachine.cpp b/dom/media/MediaDecoderStateMachine.cpp
index 3199827054c9..0b25f0459559 100644
--- a/dom/media/MediaDecoderStateMachine.cpp
+++ b/dom/media/MediaDecoderStateMachine.cpp
@@ -15,8 +15,8 @@
 
 #include "gfx2DGlue.h"
 
+#include "mediasink/AudioSink.h"
 #include "mediasink/AudioSinkWrapper.h"
-#include "mediasink/DecodedAudioDataSink.h"
 #include "mediasink/DecodedStream.h"
 #include "mediasink/OutputStreamManager.h"
 #include "mediasink/VideoSink.h"
diff --git a/dom/media/mediasink/DecodedAudioDataSink.cpp b/dom/media/mediasink/AudioSink.cpp
similarity index 99%
rename from dom/media/mediasink/DecodedAudioDataSink.cpp
rename to dom/media/mediasink/AudioSink.cpp
index d3737fb17184..a92d8294d708 100644
--- a/dom/media/mediasink/DecodedAudioDataSink.cpp
+++ b/dom/media/mediasink/AudioSink.cpp
@@ -6,7 +6,7 @@
 
 #include "nsPrintfCString.h"
 #include "MediaQueue.h"
-#include "DecodedAudioDataSink.h"
+#include "AudioSink.h"
 #include "VideoUtils.h"
 #include "AudioConverter.h"
 
diff --git a/dom/media/mediasink/DecodedAudioDataSink.h b/dom/media/mediasink/AudioSink.h
similarity index 100%
rename from dom/media/mediasink/DecodedAudioDataSink.h
rename to dom/media/mediasink/AudioSink.h
diff --git a/dom/media/mediasink/AudioSinkWrapper.cpp b/dom/media/mediasink/AudioSinkWrapper.cpp
index 517e8483b753..d7994c45ca24 100644
--- a/dom/media/mediasink/AudioSinkWrapper.cpp
+++ b/dom/media/mediasink/AudioSinkWrapper.cpp
@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#include "AudioSink.h"
 #include "AudioSinkWrapper.h"
-#include "DecodedAudioDataSink.h"
 
 namespace mozilla {
 namespace media {
diff --git a/dom/media/mediasink/moz.build b/dom/media/mediasink/moz.build
index c09341374456..b534c93b37c1 100644
--- a/dom/media/mediasink/moz.build
+++ b/dom/media/mediasink/moz.build
@@ -5,8 +5,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 UNIFIED_SOURCES += [
+    'AudioSink.cpp',
     'AudioSinkWrapper.cpp',
-    'DecodedAudioDataSink.cpp',
     'DecodedStream.cpp',
     'OutputStreamManager.cpp',
     'VideoSink.cpp',