Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Side by Side Diff: webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer_defines.h

Issue 1417683006: modules: more interface -> include renames (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fix last incorrectly wrapped pragma message Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_INTERFACE_AUDIO_CONFERENCE_MIXER_D EFINES_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_INCLUDE_AUDIO_CONFERENCE_MIXER_DEF INES_H_
12 #define WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_INTERFACE_AUDIO_CONFERENCE_MIXER_D EFINES_H_ 12 #define WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_INCLUDE_AUDIO_CONFERENCE_MIXER_DEF INES_H_
13 13
14 #include "webrtc/modules/interface/module_common_types.h" 14 #pragma message("WARNING: audio_conference_mixer/interface is DEPRECATED; use in clude")
15
16 #include "webrtc/modules/include/module_common_types.h"
15 #include "webrtc/typedefs.h" 17 #include "webrtc/typedefs.h"
16 18
17 namespace webrtc { 19 namespace webrtc {
18 class MixHistory; 20 class MixHistory;
19 21
20 // A callback class that all mixer participants must inherit from/implement. 22 // A callback class that all mixer participants must inherit from/implement.
21 class MixerParticipant 23 class MixerParticipant
22 { 24 {
23 public: 25 public:
24 // The implementation of this function should update audioFrame with new 26 // The implementation of this function should update audioFrame with new
(...skipping 25 matching lines...) Expand all
50 virtual void NewMixedAudio(const int32_t id, 52 virtual void NewMixedAudio(const int32_t id,
51 const AudioFrame& generalAudioFrame, 53 const AudioFrame& generalAudioFrame,
52 const AudioFrame** uniqueAudioFrames, 54 const AudioFrame** uniqueAudioFrames,
53 const uint32_t size) = 0; 55 const uint32_t size) = 0;
54 protected: 56 protected:
55 AudioMixerOutputReceiver() {} 57 AudioMixerOutputReceiver() {}
56 virtual ~AudioMixerOutputReceiver() {} 58 virtual ~AudioMixerOutputReceiver() {}
57 }; 59 };
58 } // namespace webrtc 60 } // namespace webrtc
59 61
60 #endif // WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_INTERFACE_AUDIO_CONFERENCE_MIXER _DEFINES_H_ 62 #endif // WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_INCLUDE_AUDIO_CONFERENCE_MIXER_D EFINES_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698