8000 chore: improve cpp code. · flutter-robert/flutter-webrtc@0d4490b · GitHub
[go: up one dir, main page]
Skip to content

Commit 0d4490b

Browse files
cloudwebrtccloudwebrtc
committed
chore: improve cpp code.
1 parent 206c955 commit 0d4490b

File tree

7 files changed

+173
-191
lines changed

7 files changed

+173
-191
lines changed

‎windows/include/flutter_webrtc/flutter_web_r_t_c_plugin.h

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
1-
#ifndef FLUTTER_PLUGIN_FLUTTER_WEBRTC_PLUGIN_H_
2-
#define FLUTTER_PLUGIN_FLUTTER_WEBRTC_PLUGIN_H_
1+
#ifndef PLUGINS_FLUTTER_WEBRTC_PLUGIN_WINDOWS_H_
2+
#define PLUGINS_FLUTTER_WEBRTC_PLUGIN_WINDOWS_H_
33

44
#include <flutter_plugin_registrar.h>
55

6+
#if defined(_WINDOWS)
67
#ifdef FLUTTER_PLUGIN_IMPL
78
#define FLUTTER_PLUGIN_EXPORT __declspec(dllexport)
89
#else
910
#define FLUTTER_PLUGIN_EXPORT __declspec(dllimport)
1011
#endif
12+
#else
13+
#ifdef FLUTTER_PLUGIN_IMPL
14+
#define FLUTTER_PLUGIN_EXPORT __attribute__((visibility("default")))
15+
#else
16+
#define FLUTTER_PLUGIN_EXPORT
17+
#endif
18+
#endif
1119

1220
#if defined(__cplusplus)
1321
extern "C" {
@@ -20,4 +28,4 @@ FLUTTER_PLUGIN_EXPORT void FlutterWebRTCPluginRegisterWithRegistrar(
2028
} // extern "C"
2129
#endif
2230

23-
#endif // FLUTTER_PLUGIN_FLUTTER_WEBRTC_PLUGIN_H_
31+
#endif // PLUGINS_FLUTTER_WEBRTC_PLUGIN_WINDOWS_H_

‎windows/include/flutter_webrtc/flutter_webrtc_plugin.h

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎windows/src/flutter_data_channel.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ void FlutterDataChannel::DataChannelSend(
108108
std::string str = GetValue<std::string>(data);
109109
data_channel->Send(str, false);
110110
}
111-
result->Success(nullptr);
111+
result->Success();
112112
}
113113

114114
void FlutterDataChannel::DataChannelClose(
@@ -119,7 +119,7 @@ void FlutterDataChannel::DataChannelClose(
119119
auto it = base_->data_channel_observers_.find(id);
120120
if (it != base_->data_channel_observers_.end())
121121
base_->data_channel_observers_.erase(it);
122-
result->Success(nullptr);
122+
result->Success();
123123
}
124124

125125
RTCDataChannel *FlutterDataChannel::DataChannelFormId(int id) {

‎windows/src/flutter_media_stream.cc

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ void FlutterMediaStream::GetUserMedia(
1414
base_->factory_->CreateStream(uuid.c_str());
1515

1616
EncodableMap params;
17-
params[EncodableValue("streamId")] = uuid;
17+
params[EncodableValue("streamId")] = EncodableValue(uuid);
1818

1919
auto it = constraints.find(EncodableValue("audio"));
2020
if (it != constraints.end()) {
@@ -93,10 +93,10 @@ void FlutterMediaStream::GetUserAudio(const EncodableMap& constraints,
9393
std::string track_id = track->id().std_string();
9494

9595
EncodableMap track_info;
96-
track_info[EncodableValue("id")] = track->id().std_string();
97-
track_info[EncodableValue("label")] = track->id().std_string();
98-
track_info[EncodableValue("kind")] = track->kind().std_string();
99-
track_info[EncodableValue("enabled")] = track->enabled();
96+
track_info[EncodableValue("id")] = EncodableValue(track->id().std_string());
97+
track_info[EncodableValue("label")] = EncodableValue(track->id().std_string());
98+
track_info[EncodableValue("kind")] = EncodableValue(track->kind().std_string());
99+
track_info[EncodableValue("enabled")] = EncodableValue(track->enabled());
100100

101101
EncodableList audioTracks;
102102
audioTracks.push_back(EncodableValue(track_info));
@@ -206,10 +206,10 @@ void FlutterMediaStream::GetUserVideo(const EncodableMap& constraints,
206206

207207
EncodableList videoTracks;
208208
EncodableMap info;
209-
info[EncodableValue("id")] = track->id().std_string();
210-
info[EncodableValue("label")] = track->id().std_string();
211-
info[EncodableValue("kind")] = track->kind().std_string();
212-
info[EncodableValue("enabled")] = track->enabled();
209+
info[EncodableValue("id")] = EncodableValue(track->id().std_string());
210+
info[EncodableValue("label")] = EncodableValue(track->id().std_string());
211+
info[EncodableValue("kind")] = EncodableValue(track->kind().std_string());
212+
info[EncodableValue("enabled")] = EncodableValue(track->enabled());
213213
videoTracks.push_back(EncodableValue(info));
214214
params[EncodableValue("videoTracks")] = EncodableValue(videoTracks);
215215

@@ -229,8 +229,8 @@ void FlutterMediaStream::GetSources(
229229
for (uint16_t i = 0; i < nb_audio_devices; i++) {
230230
base_->audio_device_->RecordingDeviceName(i, strNameUTF8, strGuidUTF8);
231231
EncodableMap audio;
232-
audio[EncodableValue("label")] = std::string(strNameUTF8);
233-
audio[EncodableValue("deviceId")] = std::string(strGuidUTF8);
232+
audio[EncodableValue("label")] = EncodableValue(std::string(strNameUTF8));
233+
audio[EncodableValue("deviceId")] = EncodableValue(std::string(strGuidUTF8));
234234
audio[EncodableValue("facing")] = "";
235235
audio[EncodableValue("kind")] = "audioinput";
236236
sources.push_back(EncodableValue(audio));
@@ -240,8 +240,8 @@ void FlutterMediaStream::GetSources(
240240
for (uint16_t i = 0; i < nb_audio_devices; i++) {
241241
base_->audio_device_->PlayoutDeviceName(i, strNameUTF8, strGuidUTF8);
242242
EncodableMap audio;
243-
audio[EncodableValue("label")] = std::string(strGuidUTF8);
244-
audio[EncodableValue("deviceId")] = std::string(strNameUTF8);
243+
audio[EncodableValue("label")] = EncodableValue(std::string(strGuidUTF8));
244+
audio[EncodableValue("deviceId")] = EncodableValue(std::string(strNameUTF8));
245245
audio[EncodableValue("facing")] = "";
246246
audio[EncodableValue("kind")] = "audiooutput";
247247
sources.push_back(EncodableValue(audio));
@@ -251,14 +251,14 @@ void FlutterMediaStream::GetSources(
251251
for (int i = 0; i < nb_video_devices; i++) {
252252
base_->video_device_->GetDeviceName(i, strNameUTF8, 128, strGuidUTF8, 128);
253253
EncodableMap video;
254-
video[EncodableValue("label")] = std::string(strGuidUTF8);
255-
video[EncodableValue("deviceId")] = std::string(strNameUTF8);
254+
video[EncodableValue("label")] = EncodableValue(std::string(strGuidUTF8));
255+
video[EncodableValue("deviceId")] = EncodableValue(std::string(strNameUTF8));
256256
video[EncodableValue("facing")] = i == 1 ? "front" : "back";
257257
video[EncodableValue("kind")] = "videoinput";
258258
sources.push_back(EncodableValue(video));
259259
}
260260
EncodableMap params;
261-
params[EncodableValue("sources")] = sources;
261+
params[EncodableValue("sources")] = EncodableValue(sources);
262262
result->Success(EncodableValue(params));
263263
}
264264

@@ -275,31 +275,31 @@ void FlutterMediaStream::MediaStreamGetTracks(
275275
for (auto track : audio_tracks.std_vector()) {
276276
base_->local_tracks_[track->id().std_string()] = track;
277277
EncodableMap info;
278-
info[EncodableValue("id")] = track->id().std_string();
279-
info[EncodableValue("label")] = track->id().std_string();
280-
info[EncodableValue("kind")] = track->kind().std_string();
281-
info[EncodableValue("enabled")] = track->enabled();
282-
info[EncodableValue("remote")] = true;
278+
info[EncodableValue("id")] = EncodableValue(track->id().std_string());
279+
info[EncodableValue("label")] = EncodableValue(track->id().std_string());
280+
info[EncodableValue("kind")] = EncodableValue(track->kind().std_string());
281+
info[EncodableValue("enabled")] = EncodableValue(track->enabled());
282+
info[EncodableValue("remote")] = EncodableValue(true);
283283
info[EncodableValue("readyState")] = "live";
284284
audioTracks.push_back(EncodableValue(info));
285285
}
286-
params[EncodableValue("audioTracks")] = audioTracks;
286+
params[EncodableValue("audioTracks")] = EncodableValue(audioTracks);
287287

288288
EncodableList videoTracks;
289289
auto video_tracks = stream->video_tracks();
290290
for (auto track : video_tracks.std_vector()) {
291291
base_->local_tracks_[track->id().std_string()] = track;
292292
EncodableMap info;
293-
info[EncodableValue("id")] = track->id().std_string();
294-
info[EncodableValue("label")] = track->id().std_string();
295-
info[EncodableValue("kind")] = track->kind().std_string();
296-
info[EncodableValue("enabled")] = track->enabled();
297-
info[EncodableValue("remote")] = true;
293+
info[EncodableValue("id")] = EncodableValue(track->id().std_string());
294+
info[EncodableValue("label")] = EncodableValue(track->id().std_string());
295+
info[EncodableValue("kind")] = EncodableValue(track->kind().std_string());
296+
info[EncodableValue("enabled")] = EncodableValue(track->enabled());
297+
info[EncodableValue("remote")] = EncodableValue(true);
298298
info[EncodableValue("readyState")] = "live";
299299
videoTracks.push_back(EncodableValue("info"));
300300
}
301301

302-
params[EncodableValue("videoTracks")] = videoTracks;
302+
params[EncodableValue("videoTracks")] = EncodableValue(videoTracks);
303303

304304
result->Success(EncodableValue("params"));
305305
} else {

0 commit comments

Comments
 (0)