From 2cd3198cdd38d350ce461966f07b72eb7ad26017 Mon Sep 17 00:00:00 2001 From: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Tue, 30 Nov 2021 17:29:18 +0700 Subject: [PATCH] organize track & pub to directory --- lib/livekit_client.dart | 12 ++++++------ lib/src/events.dart | 6 +++--- lib/src/participant/local_participant.dart | 8 ++++---- lib/src/participant/participant.dart | 2 +- lib/src/participant/remote_participant.dart | 6 +++--- .../local_track_publication.dart | 4 ++-- .../remote_track_publication.dart | 4 ++-- .../{track => publication}/track_publication.dart | 2 +- lib/src/room.dart | 2 +- lib/src/track/audio_management.dart | 4 ++-- lib/src/track/{local_track.dart => local.dart} | 0 .../{local_audio_track.dart => local/audio.dart} | 10 +++++----- .../{local_video_track.dart => local/video.dart} | 12 ++++++------ lib/src/track/{remote_track.dart => remote.dart} | 0 .../{remote_audio_track.dart => remote/audio.dart} | 13 +++++++------ .../{remote_video_track.dart => remote/video.dart} | 8 ++++---- lib/src/track/{ => web}/_audio_api.dart | 0 lib/src/track/{ => web}/_audio_html.dart | 0 lib/src/widget/video_track_renderer.dart | 4 ++-- 19 files changed, 49 insertions(+), 48 deletions(-) rename lib/src/{track => publication}/local_track_publication.dart (97%) rename lib/src/{track => publication}/remote_track_publication.dart (99%) rename lib/src/{track => publication}/track_publication.dart (98%) rename lib/src/track/{local_track.dart => local.dart} (100%) rename lib/src/track/{local_audio_track.dart => local/audio.dart} (85%) rename lib/src/track/{local_video_track.dart => local/video.dart} (91%) rename lib/src/track/{remote_track.dart => remote.dart} (100%) rename lib/src/track/{remote_audio_track.dart => remote/audio.dart} (75%) rename lib/src/track/{remote_video_track.dart => remote/video.dart} (69%) rename lib/src/track/{ => web}/_audio_api.dart (100%) rename lib/src/track/{ => web}/_audio_html.dart (100%) diff --git a/lib/livekit_client.dart b/lib/livekit_client.dart index caf4684..aaad56f 100644 --- a/lib/livekit_client.dart +++ b/lib/livekit_client.dart @@ -13,13 +13,13 @@ export 'src/participant/remote_participant.dart'; export 'src/proto/livekit_models.pb.dart' show TrackType; export 'src/proto/livekit_rtc.pb.dart' show VideoQuality; export 'src/room.dart'; -export 'src/track/local_audio_track.dart'; -export 'src/track/local_track_publication.dart'; -export 'src/track/local_video_track.dart'; -export 'src/track/local_track.dart'; +export 'src/track/local/audio.dart'; +export 'src/publication/local_track_publication.dart'; +export 'src/track/local/video.dart'; +export 'src/track/local.dart'; export 'src/track/options.dart'; -export 'src/track/remote_track_publication.dart'; +export 'src/publication/remote_track_publication.dart'; export 'src/track/track.dart'; -export 'src/track/track_publication.dart'; +export 'src/publication/track_publication.dart'; export 'src/types.dart'; export 'src/widget/video_track_renderer.dart'; diff --git a/lib/src/events.dart b/lib/src/events.dart index 894a909..0639a7c 100644 --- a/lib/src/events.dart +++ b/lib/src/events.dart @@ -5,10 +5,10 @@ import 'participant/participant.dart'; import 'participant/remote_participant.dart'; import 'proto/livekit_models.pb.dart' as lk_models; import 'proto/livekit_rtc.pb.dart' as lk_rtc; -import 'track/local_track_publication.dart'; -import 'track/remote_track_publication.dart'; +import 'publication/local_track_publication.dart'; +import 'publication/remote_track_publication.dart'; import 'track/track.dart'; -import 'track/track_publication.dart'; +import 'publication/track_publication.dart'; import 'types.dart'; abstract class LiveKitEvent {} diff --git a/lib/src/participant/local_participant.dart b/lib/src/participant/local_participant.dart index f1caca4..5dab951 100644 --- a/lib/src/participant/local_participant.dart +++ b/lib/src/participant/local_participant.dart @@ -10,10 +10,10 @@ import '../managers/event.dart'; import '../options.dart'; import '../proto/livekit_models.pb.dart' as lk_models; import '../rtc_engine.dart'; -import '../track/local_audio_track.dart'; -import '../track/local_track_publication.dart'; -import '../track/local_video_track.dart'; -import '../track/track_publication.dart'; +import '../track/local/audio.dart'; +import '../publication/local_track_publication.dart'; +import '../track/local/video.dart'; +import '../publication/track_publication.dart'; import '../types.dart'; import '../utils.dart'; import 'participant.dart'; diff --git a/lib/src/participant/participant.dart b/lib/src/participant/participant.dart index 928edb4..fb50863 100644 --- a/lib/src/participant/participant.dart +++ b/lib/src/participant/participant.dart @@ -8,7 +8,7 @@ import '../managers/event.dart'; import '../proto/livekit_models.pb.dart' as lk_models; import '../support/disposable.dart'; import '../track/track.dart'; -import '../track/track_publication.dart'; +import '../publication/track_publication.dart'; import '../types.dart'; import 'remote_participant.dart'; diff --git a/lib/src/participant/remote_participant.dart b/lib/src/participant/remote_participant.dart index 5e6bc2d..b245dc1 100644 --- a/lib/src/participant/remote_participant.dart +++ b/lib/src/participant/remote_participant.dart @@ -8,9 +8,9 @@ import '../logger.dart'; import '../managers/event.dart'; import '../proto/livekit_models.pb.dart' as lk_models; import '../rtc_engine.dart'; -import '../track/remote_audio_track.dart'; -import '../track/remote_track_publication.dart'; -import '../track/remote_video_track.dart'; +import '../track/remote/audio.dart'; +import '../publication/remote_track_publication.dart'; +import '../track/remote/video.dart'; import '../track/track.dart'; import '../types.dart'; import 'participant.dart'; diff --git a/lib/src/track/local_track_publication.dart b/lib/src/publication/local_track_publication.dart similarity index 97% rename from lib/src/track/local_track_publication.dart rename to lib/src/publication/local_track_publication.dart index 60d9c5b..8d2879a 100644 --- a/lib/src/track/local_track_publication.dart +++ b/lib/src/publication/local_track_publication.dart @@ -3,8 +3,8 @@ import '../extensions.dart'; import '../internal/events.dart'; import '../participant/local_participant.dart'; import '../proto/livekit_models.pb.dart' as lk_models; -import 'local_track.dart'; -import 'track.dart'; +import '../track/local.dart'; +import '../track/track.dart'; import 'track_publication.dart'; class LocalTrackPublication extends TrackPublication { diff --git a/lib/src/track/remote_track_publication.dart b/lib/src/publication/remote_track_publication.dart similarity index 99% rename from lib/src/track/remote_track_publication.dart rename to lib/src/publication/remote_track_publication.dart index e37a946..de0020b 100644 --- a/lib/src/track/remote_track_publication.dart +++ b/lib/src/publication/remote_track_publication.dart @@ -12,8 +12,8 @@ import '../participant/remote_participant.dart'; import '../proto/livekit_models.pb.dart' as lk_models; import '../proto/livekit_rtc.pb.dart' as lk_rtc; import '../utils.dart'; -import 'remote_track.dart'; -import 'track.dart'; +import '../track/remote.dart'; +import '../track/track.dart'; import 'track_publication.dart'; class RendererVisibility { diff --git a/lib/src/track/track_publication.dart b/lib/src/publication/track_publication.dart similarity index 98% rename from lib/src/track/track_publication.dart rename to lib/src/publication/track_publication.dart index fa5a418..b9575ff 100644 --- a/lib/src/track/track_publication.dart +++ b/lib/src/publication/track_publication.dart @@ -4,7 +4,7 @@ import '../extensions.dart'; import '../proto/livekit_models.pb.dart' as lk_models; import '../support/disposable.dart'; import '../types.dart'; -import 'track.dart'; +import '../track/track.dart'; /// Represents a track that's published to the server. This class contains /// metadata associated with tracks. diff --git a/lib/src/room.dart b/lib/src/room.dart index 2bb2187..79da822 100644 --- a/lib/src/room.dart +++ b/lib/src/room.dart @@ -16,7 +16,7 @@ import 'proto/livekit_models.pb.dart' as lk_models; import 'proto/livekit_rtc.pb.dart' as lk_rtc; import 'rtc_engine.dart'; import 'support/disposable.dart'; -import 'track/local_track_publication.dart'; +import 'publication/local_track_publication.dart'; import 'track/track.dart'; import 'types.dart'; diff --git a/lib/src/track/audio_management.dart b/lib/src/track/audio_management.dart index 4ca5bcc..e87cd2b 100644 --- a/lib/src/track/audio_management.dart +++ b/lib/src/track/audio_management.dart @@ -7,8 +7,8 @@ import 'package:synchronized/synchronized.dart' as sync; import '../logger.dart'; import '../support/native_audio.dart'; -import 'local_audio_track.dart'; -import 'local_track.dart'; +import 'local/audio.dart'; +import 'local.dart'; enum AudioTrackState { none, diff --git a/lib/src/track/local_track.dart b/lib/src/track/local.dart similarity index 100% rename from lib/src/track/local_track.dart rename to lib/src/track/local.dart diff --git a/lib/src/track/local_audio_track.dart b/lib/src/track/local/audio.dart similarity index 85% rename from lib/src/track/local_audio_track.dart rename to lib/src/track/local/audio.dart index 196b3f8..26d2a9c 100644 --- a/lib/src/track/local_audio_track.dart +++ b/lib/src/track/local/audio.dart @@ -2,11 +2,11 @@ import 'dart:async'; import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc; -import '../proto/livekit_models.pb.dart' as lk_models; -import '../types.dart'; -import 'audio_management.dart'; -import 'local_track.dart'; -import 'options.dart'; +import '../../proto/livekit_models.pb.dart' as lk_models; +import '../../types.dart'; +import '../audio_management.dart'; +import '../local.dart'; +import '../options.dart'; class LocalAudioTrack extends LocalTrack with AudioTrack, AudioManagementMixin { // Options used for this track diff --git a/lib/src/track/local_video_track.dart b/lib/src/track/local/video.dart similarity index 91% rename from lib/src/track/local_video_track.dart rename to lib/src/track/local/video.dart index 3e2ba76..5993d9d 100644 --- a/lib/src/track/local_video_track.dart +++ b/lib/src/track/local/video.dart @@ -1,11 +1,11 @@ import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc; -import '../logger.dart'; -import '../proto/livekit_models.pb.dart' as lk_models; -import '../types.dart'; -import 'local_track.dart'; -import 'options.dart'; -import 'track.dart'; +import '../../logger.dart'; +import '../../proto/livekit_models.pb.dart' as lk_models; +import '../../types.dart'; +import '../local.dart'; +import '../options.dart'; +import '../track.dart'; /// A video track from the local device. Use static methods in this class to create /// video tracks. diff --git a/lib/src/track/remote_track.dart b/lib/src/track/remote.dart similarity index 100% rename from lib/src/track/remote_track.dart rename to lib/src/track/remote.dart diff --git a/lib/src/track/remote_audio_track.dart b/lib/src/track/remote/audio.dart similarity index 75% rename from lib/src/track/remote_audio_track.dart rename to lib/src/track/remote/audio.dart index e58a5df..bc04134 100644 --- a/lib/src/track/remote_audio_track.dart +++ b/lib/src/track/remote/audio.dart @@ -1,11 +1,12 @@ import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc; -import '../proto/livekit_models.pb.dart' as lk_models; -import '../types.dart'; -import '_audio_api.dart' if (dart.library.html) '_audio_html.dart' as audio; -import 'audio_management.dart'; -import 'local_track.dart'; -import 'remote_track.dart'; +import '../../proto/livekit_models.pb.dart' as lk_models; +import '../../types.dart'; +import '../web/_audio_api.dart' if (dart.library.html) '../web/_audio_html.dart' + as audio; +import '../audio_management.dart'; +import '../local.dart'; +import '../remote.dart'; class RemoteAudioTrack extends RemoteTrack with AudioTrack, AudioManagementMixin { diff --git a/lib/src/track/remote_video_track.dart b/lib/src/track/remote/video.dart similarity index 69% rename from lib/src/track/remote_video_track.dart rename to lib/src/track/remote/video.dart index 7cc318c..455f942 100644 --- a/lib/src/track/remote_video_track.dart +++ b/lib/src/track/remote/video.dart @@ -1,9 +1,9 @@ import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc; -import 'package:livekit_client/src/track/local_track.dart'; +import 'package:livekit_client/src/track/local.dart'; -import '../proto/livekit_models.pb.dart' as lk_models; -import '../types.dart'; -import 'remote_track.dart'; +import '../../proto/livekit_models.pb.dart' as lk_models; +import '../../types.dart'; +import '../remote.dart'; class RemoteVideoTrack extends RemoteTrack with VideoTrack { // diff --git a/lib/src/track/_audio_api.dart b/lib/src/track/web/_audio_api.dart similarity index 100% rename from lib/src/track/_audio_api.dart rename to lib/src/track/web/_audio_api.dart diff --git a/lib/src/track/_audio_html.dart b/lib/src/track/web/_audio_html.dart similarity index 100% rename from lib/src/track/_audio_html.dart rename to lib/src/track/web/_audio_html.dart diff --git a/lib/src/widget/video_track_renderer.dart b/lib/src/widget/video_track_renderer.dart index 4f967c3..48b1284 100644 --- a/lib/src/widget/video_track_renderer.dart +++ b/lib/src/widget/video_track_renderer.dart @@ -1,7 +1,7 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc; -import 'package:livekit_client/src/track/local_track.dart'; +import 'package:livekit_client/src/track/local.dart'; import 'package:visibility_detector/visibility_detector.dart'; import '../events.dart'; @@ -9,7 +9,7 @@ import '../extensions.dart'; import '../internal/events.dart'; import '../logger.dart'; import '../managers/event.dart'; -import '../track/local_video_track.dart'; +import '../track/local/video.dart'; /// Widget that renders a [VideoTrack]. class VideoTrackRenderer extends StatefulWidget {