Skip to content

Commit 1d42165

Browse files
authored
fix compile for linux, where clang fails to resolve methods via the type-aliases from flutter's encodable_value.h for EncodableList and EncodableMap (flutter-webrtc#1132)
1 parent 0d7f117 commit 1d42165

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

common/cpp/src/flutter_peerconnection.cc

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -810,12 +810,12 @@ void FlutterPeerConnection::GetStats(
810810
pc->GetStats(
811811
receiver,
812812
[result_ptr](const vector<scoped_refptr<MediaRTCStats>> reports) {
813-
EncodableList list;
813+
std::vector<EncodableValue> list;
814814
for (int i = 0; i < reports.size(); i++) {
815-
list.push_back(statsToMap(reports[i]));
815+
list.push_back(EncodableValue(statsToMap(reports[i])));
816816
}
817817
EncodableMap params;
818-
params[EncodableValue("stats")] = list;
818+
params[EncodableValue("stats")] = EncodableValue(list);
819819
result_ptr->Success(EncodableValue(params));
820820
},
821821
[result_ptr](const char* error) {
@@ -828,16 +828,15 @@ void FlutterPeerConnection::GetStats(
828828
for (auto sender : senders.std_vector()) {
829829
if (sender->track()->id().c_string() == track_id) {
830830
found = true;
831-
EncodableList list;
832831
pc->GetStats(
833832
sender,
834833
[result_ptr](const vector<scoped_refptr<MediaRTCStats>> reports) {
835-
EncodableList list;
834+
std::vector<EncodableValue> list;
836835
for (int i = 0; i < reports.size(); i++) {
837-
list.push_back(statsToMap(reports[i]));
836+
list.push_back(EncodablveValue(statsToMap(reports[i])));
838837
}
839838
EncodableMap params;
840-
params[EncodableValue("stats")] = list;
839+
params[EncodableValue("stats")] = EncodableValue(list);
841840
result_ptr->Success(EncodableValue(params));
842841
},
843842
[result_ptr](const char* error) {
@@ -852,12 +851,12 @@ void FlutterPeerConnection::GetStats(
852851
} else {
853852
pc->GetStats(
854853
[result_ptr](const vector<scoped_refptr<MediaRTCStats>> reports) {
855-
EncodableList list;
854+
std::vector<EncodableValue> list;
856855
for (int i = 0; i < reports.size(); i++) {
857-
list.push_back(statsToMap(reports[i]));
856+
list.push_back(EncodableValue(statsToMap(reports[i])));
858857
}
859858
EncodableMap params;
860-
params[EncodableValue("stats")] = list;
859+
params[EncodableValue("stats")] = EncodableValue(list);
861860
result_ptr->Success(EncodableValue(params));
862861
},
863862
[result_ptr](const char* error) {

common/cpp/src/flutter_screen_capture.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ void FlutterScreenCapture::GetDesktopSources(
6363

6464
std::cout << " sources: " << sources.size() << std::endl;
6565
result->Success(
66-
EncodableValue(EncodableMap{{EncodableValue("sources"), sources}}));
66+
EncodableValue(EncodableMap{{EncodableValue("sources"), EncodableValue(sources)}}));
6767
}
6868

6969
void FlutterScreenCapture::UpdateDesktopSources(
@@ -74,7 +74,7 @@ void FlutterScreenCapture::UpdateDesktopSources(
7474
return;
7575
}
7676
result->Success(
77-
EncodableValue(EncodableMap{{EncodableValue("result"), true}}));
77+
EncodableValue(EncodableMap{{EncodableValue("result"), EncodableValue(true)}}));
7878
}
7979

8080
void FlutterScreenCapture::OnMediaSourceAdded(

0 commit comments

Comments
 (0)