8000 fix wasm build. · lonelyxmas/flutter-webrtc@4602204 · GitHub
[go: up one dir, main page]
Skip to content

Commit 4602204

Browse files
cloudwebrtccloudwebrtc
committed
fix wasm build.
1 parent fe08a01 commit 4602204

File tree

7 files changed

+24
-37
lines changed

7 files changed

+24
-37
lines changed

‎example/lib/main.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import 'package:flutter_webrtc_example/src/capture_frame_sample.dart';
1010
import 'src/device_enumeration_sample.dart';
1111
import 'src/get_display_media_sample.dart';
1212
import 'src/get_user_media_sample.dart'
13-
if (dart.library.html) 'src/get_user_media_sample_web.dart';
13+
if (dart.library.js_interop) 'src/get_user_media_sample_web.dart';
1414
import 'src/loopback_data_channel_sample.dart';
1515
import 'src/loopback_sample_unified_tracks.dart';
1616
import 'src/route_item.dart';

‎example/lib/src/get_user_media_sample.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ class _GetUserMediaSampleState extends State<GetUserMediaSample> {
105105
print('Recording is not available on iOS');
106106
return;
107107
}
108+
108109
// TODO(rostopira): request write storage permission
109110
final storagePath = await getExternalStorageDirectory();
110111
if (storagePath == null) throw Exception('Can\'t find storagePath');

‎example/lib/src/loopback_sample_unified_tracks.dart

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,9 @@ class _MyAppState extends State<LoopBackSampleUnifiedTracks> {
132132
}
133133

134134
void _selectAudioInput(String deviceId) async {
135-
await Helper.selectAudioInput(deviceId);
135+
if (!WebRTC.platformIsWeb) {
136+
await Helper.selectAudioInput(deviceId);
137+
}
136138
}
137139

138140
void _cleanUp() async {
@@ -539,7 +541,9 @@ class _MyAppState extends State<LoopBackSampleUnifiedTracks> {
539541
void _switchSpeaker() async {
540542
setState(() {
541543
_speakerOn = !_speakerOn;
542-
Helper.setSpeakerphoneOn(_speakerOn);
544+
if (!WebRTC.platformIsWeb) {
545+
Helper.setSpeakerphoneOn(_speakerOn);
546+
}
543547
});
544548
}
545549

‎example/pubspec.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ dependencies:
1919
permission_handler: ^11.3.1
2020
sdp_transform: ^0.3.2
2121

22-
2322
dev_dependencies:
2423
flutter_test:
2524
sdk: flutter

‎example/web/index.html

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<!DOCTYPE html>
22
<html>
3+
34
<head>
45
<!--
56
If you are serving your web app in a path other than the root, change the
@@ -21,39 +22,20 @@
2122
<meta name="description" content="A new Flutter project.">
2223

2324
<!-- iOS meta tags & icons -->
24-
<meta name="apple-mobile-web-app-capable" content="yes">
25+
<meta name="mobile-web-app-capable" content="yes">
2526
<meta name="apple-mobile-web-app-status-bar-style" content="black">
26-
<meta name="apple-mobile-web-app-title" content="flutter_webrtc_example">
27+
<meta name="apple-mobile-web-app-title" content="webwasm">
2728
<link rel="apple-touch-icon" href="icons/Icon-192.png">
2829

2930
<!-- Favicon -->
30-
<link rel="icon" type="image/png" href="favicon.png"/>
31+
<link rel="icon" type="image/png" href="favicon.png" />
3132

32-
<title>flutter_webrtc_example</title>
33+
<title>webwasm</title>
3334
<link rel="manifest" href="manifest.json">
34-
35-
<script>
36-
// The value below is injected by flutter build, do not touch.
37-
var serviceWorkerVersion = null;
38-
</script>
39-
<!-- This script adds the flutter initialization JS code -->
40-
<script src="flutter.js" defer></script>
4135
</head>
36+
4237
<body>
43-
<script>
44-
window.addEventListener('load', function(ev) {
45-
// Download main.dart.js
46-
_flutter.loader.loadEntrypoint({
47-
serviceWorker: {
48-
serviceWorkerVersion: serviceWorkerVersion,
49-
},
50-
onEntrypointLoaded: function(engineInitializer) {
51-
engineInitializer.initializeEngine().then(function(appRunner) {
52-
appRunner.runApp();
53-
});
54-
}
55-
});
56-
});
57-
</script>
38+
<script src="flutter_bootstrap.js" async></script>
5839
</body>
59-
</html>
40+
41+
</html>

‎lib/flutter_webrtc.dart

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@ export 'src/desktop_capturer.dart';
88
export 'src/media_devices.dart';
99
export 'src/media_recorder.dart';
1010
export 'src/native/factory_impl.dart'
11-
if (dart.library.html) 'src/web/factory_impl.dart';
11+
if (dart.library.js_interop) 'src/web/factory_impl.dart';
1212
export 'src/native/rtc_video_renderer_impl.dart'
13-
if (dart.library.html) 'src/web/rtc_video_renderer_impl.dart';
13+
if (dart.library.js_interop) 'src/web/rtc_video_renderer_impl.dart';
1414
export 'src/native/rtc_video_view_impl.dart'
15-
if (dart.library.html) 'src/web/rtc_video_view_impl.dart';
16-
export 'src/native/utils.dart' if (dart.library.html) 'src/web/utils.dart';
15+
if (dart.library.js_interop) 'src/web/rtc_video_view_impl.dart';
16+
export 'src/native/utils.dart'
17+
if (dart.library.js_interop) 'src/web/utils.dart';
1718
export 'src/native/adapter_type.dart';
1819
export 'src/native/camera_utils.dart';
1920
export 'src/native/audio_management.dart';

‎pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ environment:
88

99
dependencies:
1010
collection: ^1.17.0
11-
dart_webrtc: ^1.5.1
11+
dart_webrtc: ^1.5.2+hotfix.1
1212
flutter:
1313
sdk: flutter
1414
path_provider: ^2.0.2
1515
web: ^1.0.0
16-
webrtc_interface: ^1.2.1
16+
webrtc_interface: ^1.2.1+hotfix.1
1717

1818
dev_dependencies:
1919
flutter_test:

0 commit comments

Comments
 (0)
0