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

Side by Side Diff: webrtc/sound/pulseaudiosoundsystem.cc

Issue 1345433002: Add RTC_ prefix to contructormagic macros. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Formatting fix. Created 5 years, 3 months 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
« no previous file with comments | « webrtc/sound/pulseaudiosoundsystem.h ('k') | webrtc/sound/sounddevicelocator.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2010 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2010 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
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 199
200 void Unlock() { 200 void Unlock() {
201 pulse()->Unlock(); 201 pulse()->Unlock();
202 } 202 }
203 203
204 private: 204 private:
205 PulseAudioSoundSystem *pulse_; 205 PulseAudioSoundSystem *pulse_;
206 pa_stream *stream_; 206 pa_stream *stream_;
207 int flags_; 207 int flags_;
208 208
209 DISALLOW_COPY_AND_ASSIGN(PulseAudioStream); 209 RTC_DISALLOW_COPY_AND_ASSIGN(PulseAudioStream);
210 }; 210 };
211 211
212 // Implementation of an input stream. See soundinputstreaminterface.h regarding 212 // Implementation of an input stream. See soundinputstreaminterface.h regarding
213 // thread-safety. 213 // thread-safety.
214 class PulseAudioInputStream : 214 class PulseAudioInputStream :
215 public SoundInputStreamInterface, 215 public SoundInputStreamInterface,
216 private rtc::Worker { 216 private rtc::Worker {
217 217
218 struct GetVolumeCallbackData { 218 struct GetVolumeCallbackData {
219 PulseAudioInputStream *instance; 219 PulseAudioInputStream *instance;
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
563 if (!success) { 563 if (!success) {
564 LOG(LS_ERROR) << "Failed to change capture volume"; 564 LOG(LS_ERROR) << "Failed to change capture volume";
565 } 565 }
566 } 566 }
567 567
568 PulseAudioStream stream_; 568 PulseAudioStream stream_;
569 // Temporary storage for passing data between threads. 569 // Temporary storage for passing data between threads.
570 const void *temp_sample_data_; 570 const void *temp_sample_data_;
571 size_t temp_sample_data_size_; 571 size_t temp_sample_data_size_;
572 572
573 DISALLOW_COPY_AND_ASSIGN(PulseAudioInputStream); 573 RTC_DISALLOW_COPY_AND_ASSIGN(PulseAudioInputStream);
574 }; 574 };
575 575
576 // Implementation of an output stream. See soundoutputstreaminterface.h 576 // Implementation of an output stream. See soundoutputstreaminterface.h
577 // regarding thread-safety. 577 // regarding thread-safety.
578 class PulseAudioOutputStream : 578 class PulseAudioOutputStream :
579 public SoundOutputStreamInterface, 579 public SoundOutputStreamInterface,
580 private rtc::Worker { 580 private rtc::Worker {
581 581
582 struct GetVolumeCallbackData { 582 struct GetVolumeCallbackData {
583 PulseAudioOutputStream *instance; 583 PulseAudioOutputStream *instance;
(...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
947 if (!success) { 947 if (!success) {
948 LOG(LS_ERROR) << "Failed to change playback volume"; 948 LOG(LS_ERROR) << "Failed to change playback volume";
949 } 949 }
950 } 950 }
951 951
952 PulseAudioStream stream_; 952 PulseAudioStream stream_;
953 int configured_latency_; 953 int configured_latency_;
954 // Temporary storage for passing data between threads. 954 // Temporary storage for passing data between threads.
955 size_t temp_buffer_space_; 955 size_t temp_buffer_space_;
956 956
957 DISALLOW_COPY_AND_ASSIGN(PulseAudioOutputStream); 957 RTC_DISALLOW_COPY_AND_ASSIGN(PulseAudioOutputStream);
958 }; 958 };
959 959
960 PulseAudioSoundSystem::PulseAudioSoundSystem() 960 PulseAudioSoundSystem::PulseAudioSoundSystem()
961 : mainloop_(NULL), context_(NULL) { 961 : mainloop_(NULL), context_(NULL) {
962 } 962 }
963 963
964 PulseAudioSoundSystem::~PulseAudioSoundSystem() { 964 PulseAudioSoundSystem::~PulseAudioSoundSystem() {
965 Terminate(); 965 Terminate();
966 } 966 }
967 967
(...skipping 564 matching lines...) Expand 10 before | Expand all | Expand 10 after
1532 1532
1533 // Must be called with the lock held. 1533 // Must be called with the lock held.
1534 const char *PulseAudioSoundSystem::LastError() { 1534 const char *PulseAudioSoundSystem::LastError() {
1535 return symbol_table_.pa_strerror()(symbol_table_.pa_context_errno()( 1535 return symbol_table_.pa_strerror()(symbol_table_.pa_context_errno()(
1536 context_)); 1536 context_));
1537 } 1537 }
1538 1538
1539 } // namespace rtc 1539 } // namespace rtc
1540 1540
1541 #endif // HAVE_LIBPULSE 1541 #endif // HAVE_LIBPULSE
OLDNEW
« no previous file with comments | « webrtc/sound/pulseaudiosoundsystem.h ('k') | webrtc/sound/sounddevicelocator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698