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

Side by Side Diff: webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer.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_H _ 11 #ifndef WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_INCLUDE_AUDIO_CONFERENCE_MIXER_H_
12 #define WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_INTERFACE_AUDIO_CONFERENCE_MIXER_H _ 12 #define WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_INCLUDE_AUDIO_CONFERENCE_MIXER_H_
13 13
14 #include "webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer _defines.h" 14 #pragma message("WARNING: audio_conference_mixer/interface is DEPRECATED; use in clude")
15 #include "webrtc/modules/interface/module.h" 15
16 #include "webrtc/modules/interface/module_common_types.h" 16 #include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_d efines.h"
17 #include "webrtc/modules/include/module.h"
18 #include "webrtc/modules/include/module_common_types.h"
17 19
18 namespace webrtc { 20 namespace webrtc {
19 class AudioMixerOutputReceiver; 21 class AudioMixerOutputReceiver;
20 class MixerParticipant; 22 class MixerParticipant;
21 class Trace; 23 class Trace;
22 24
23 class AudioConferenceMixer : public Module 25 class AudioConferenceMixer : public Module
24 { 26 {
25 public: 27 public:
26 enum {kMaximumAmountOfMixedParticipants = 3}; 28 enum {kMaximumAmountOfMixedParticipants = 3};
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 // Set the minimum sampling frequency at which to mix. The mixing algorithm 69 // Set the minimum sampling frequency at which to mix. The mixing algorithm
68 // may still choose to mix at a higher samling frequency to avoid 70 // may still choose to mix at a higher samling frequency to avoid
69 // downsampling of audio contributing to the mixed audio. 71 // downsampling of audio contributing to the mixed audio.
70 virtual int32_t SetMinimumMixingFrequency(Frequency freq) = 0; 72 virtual int32_t SetMinimumMixingFrequency(Frequency freq) = 0;
71 73
72 protected: 74 protected:
73 AudioConferenceMixer() {} 75 AudioConferenceMixer() {}
74 }; 76 };
75 } // namespace webrtc 77 } // namespace webrtc
76 78
77 #endif // WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_INTERFACE_AUDIO_CONFERENCE_MIXER _H_ 79 #endif // WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_INCLUDE_AUDIO_CONFERENCE_MIXER_H _
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698