Index: chromecast/public/media/audio_pipeline_device.h |
diff --git a/chromecast/media/cma/backend/audio_pipeline_device.h b/chromecast/public/media/audio_pipeline_device.h |
similarity index 73% |
rename from chromecast/media/cma/backend/audio_pipeline_device.h |
rename to chromecast/public/media/audio_pipeline_device.h |
index 84c1af1fe1d9c1fb42bfe3db3a514b25f5eba4a5..bdf5da3bddee151a0306f923d2c3ef940d0986ea 100644 |
--- a/chromecast/media/cma/backend/audio_pipeline_device.h |
+++ b/chromecast/public/media/audio_pipeline_device.h |
@@ -2,11 +2,10 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef CHROMECAST_MEDIA_CMA_BACKEND_AUDIO_PIPELINE_DEVICE_H_ |
-#define CHROMECAST_MEDIA_CMA_BACKEND_AUDIO_PIPELINE_DEVICE_H_ |
+#ifndef CHROMECAST_PUBLIC_MEDIA_AUDIO_PIPELINE_DEVICE_H_ |
+#define CHROMECAST_PUBLIC_MEDIA_AUDIO_PIPELINE_DEVICE_H_ |
-#include "base/macros.h" |
-#include "chromecast/media/cma/backend/media_component_device.h" |
+#include "media_component_device.h" |
namespace chromecast { |
namespace media { |
@@ -15,8 +14,8 @@ struct AudioConfig; |
class AudioPipelineDevice : public MediaComponentDevice { |
public: |
- AudioPipelineDevice(); |
- ~AudioPipelineDevice() override; |
+ AudioPipelineDevice() {} |
byungchul
2015/07/27 18:22:23
not necessary?
halliwell
2015/07/28 02:19:35
removed.
|
+ ~AudioPipelineDevice() override {} |
servolk
2015/07/27 21:25:47
Nit: Have you tried building this on clang? AFAIR
halliwell
2015/07/28 02:19:35
Yes, it builds fine (and meets presubmit checks).
|
// Provide the audio configuration. |
// Must be called before switching from |kStateUninitialized| to |kStateIdle|. |
@@ -27,9 +26,6 @@ class AudioPipelineDevice : public MediaComponentDevice { |
// Sets the volume multiplier. |
// The multiplier must be in the range [0.0, 1.0]. |
virtual void SetStreamVolumeMultiplier(float multiplier) = 0; |
- |
- private: |
- DISALLOW_COPY_AND_ASSIGN(AudioPipelineDevice); |
}; |
} // namespace media |