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

Side by Side Diff: talk/app/webrtc/dtmfsender.h

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 | « no previous file | talk/app/webrtc/java/jni/androidvideocapturer_jni.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 * libjingle 2 * libjingle
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 void StopSending(); 109 void StopSending();
110 110
111 rtc::scoped_refptr<AudioTrackInterface> track_; 111 rtc::scoped_refptr<AudioTrackInterface> track_;
112 DtmfSenderObserverInterface* observer_; 112 DtmfSenderObserverInterface* observer_;
113 rtc::Thread* signaling_thread_; 113 rtc::Thread* signaling_thread_;
114 DtmfProviderInterface* provider_; 114 DtmfProviderInterface* provider_;
115 std::string tones_; 115 std::string tones_;
116 int duration_; 116 int duration_;
117 int inter_tone_gap_; 117 int inter_tone_gap_;
118 118
119 DISALLOW_COPY_AND_ASSIGN(DtmfSender); 119 RTC_DISALLOW_COPY_AND_ASSIGN(DtmfSender);
120 }; 120 };
121 121
122 // Define proxy for DtmfSenderInterface. 122 // Define proxy for DtmfSenderInterface.
123 BEGIN_PROXY_MAP(DtmfSender) 123 BEGIN_PROXY_MAP(DtmfSender)
124 PROXY_METHOD1(void, RegisterObserver, DtmfSenderObserverInterface*) 124 PROXY_METHOD1(void, RegisterObserver, DtmfSenderObserverInterface*)
125 PROXY_METHOD0(void, UnregisterObserver) 125 PROXY_METHOD0(void, UnregisterObserver)
126 PROXY_METHOD0(bool, CanInsertDtmf) 126 PROXY_METHOD0(bool, CanInsertDtmf)
127 PROXY_METHOD3(bool, InsertDtmf, const std::string&, int, int) 127 PROXY_METHOD3(bool, InsertDtmf, const std::string&, int, int)
128 PROXY_CONSTMETHOD0(const AudioTrackInterface*, track) 128 PROXY_CONSTMETHOD0(const AudioTrackInterface*, track)
129 PROXY_CONSTMETHOD0(std::string, tones) 129 PROXY_CONSTMETHOD0(std::string, tones)
130 PROXY_CONSTMETHOD0(int, duration) 130 PROXY_CONSTMETHOD0(int, duration)
131 PROXY_CONSTMETHOD0(int, inter_tone_gap) 131 PROXY_CONSTMETHOD0(int, inter_tone_gap)
132 END_PROXY() 132 END_PROXY()
133 133
134 // Get DTMF code from the DTMF event character. 134 // Get DTMF code from the DTMF event character.
135 bool GetDtmfCode(char tone, int* code); 135 bool GetDtmfCode(char tone, int* code);
136 136
137 } // namespace webrtc 137 } // namespace webrtc
138 138
139 #endif // TALK_APP_WEBRTC_DTMFSENDER_H_ 139 #endif // TALK_APP_WEBRTC_DTMFSENDER_H_
OLDNEW
« no previous file with comments | « no previous file | talk/app/webrtc/java/jni/androidvideocapturer_jni.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698